← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to dix/events.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/events.c
2943
2943
{
2944
2944
    SpritePtr pSprite;
2945
2945
    ScreenPtr pScreen;
 
2946
    CursorPtr pCursor;
2946
2947
 
2947
2948
    if (!pDev->spriteInfo->sprite)
2948
2949
    {
2986
2987
 
2987
2988
    if (pWin)
2988
2989
    {
2989
 
        pSprite->current = wCursor(pWin);
2990
 
        pSprite->current->refcnt++;
 
2990
        pCursor = wCursor(pWin);
2991
2991
        pSprite->spriteTrace = (WindowPtr *)xcalloc(1, 32*sizeof(WindowPtr));
2992
2992
        if (!pSprite->spriteTrace)
2993
2993
            FatalError("Failed to allocate spriteTrace");
3000
3000
        pSprite->pDequeueScreen = pSprite->pEnqueueScreen;
3001
3001
 
3002
3002
    } else {
3003
 
        pSprite->current = NullCursor;
 
3003
        pCursor = NullCursor;
3004
3004
        pSprite->spriteTrace = NULL;
3005
3005
        pSprite->spriteTraceSize = 0;
3006
3006
        pSprite->spriteTraceGood = 0;
3007
3007
        pSprite->pEnqueueScreen = screenInfo.screens[0];
3008
3008
        pSprite->pDequeueScreen = pSprite->pEnqueueScreen;
3009
3009
    }
 
3010
    if (pCursor)
 
3011
        pCursor->refcnt++;
 
3012
    if (pSprite->current)
 
3013
        FreeCursor(pSprite->current, None);
 
3014
    pSprite->current = pCursor;
3010
3015
 
3011
3016
    if (pScreen)
3012
3017
    {
3059
3064
{
3060
3065
    SpritePtr pSprite = NULL;
3061
3066
    WindowPtr win = NULL;
 
3067
    CursorPtr pCursor;
3062
3068
    if (!pScreen)
3063
3069
        return ;
3064
3070
 
3074
3080
    pSprite->hotLimits.x2 = pScreen->width;
3075
3081
    pSprite->hotLimits.y2 = pScreen->height;
3076
3082
    pSprite->win = win;
3077
 
    pSprite->current = wCursor (win);
3078
 
    pSprite->current->refcnt++;
 
3083
    pCursor = wCursor(win);
 
3084
    if (pCursor)
 
3085
        pCursor->refcnt++;
 
3086
    if (pSprite->current)
 
3087
        FreeCursor(pSprite->current, 0);
 
3088
    pSprite->current = pCursor;
3079
3089
    pSprite->spriteTraceGood = 1;
3080
3090
    pSprite->spriteTrace[0] = win;
3081
3091
    (*pScreen->CursorLimits) (pDev,