SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mi: only call UpdateSpriteForScreen if the screen actually changed.

Browse Source 
If we call it unconditionally, we flip the dev->spriteInfo->sprite permanently
when using XTestFakeInput (once in CheckMotion as called from the
processInputProc, another time in UpdateSpriteForScreen when we actually warp
the cursor). USFS also updates to the screen's root window unconditionally,
which is not really what we want if we haven't changed screen at all.
This commit is contained in:
Peter Hutterer
2007-11-24 16:16:48 +10:30
parent bf3198c8c5
commit a4edfbef02
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mi/mipointer.c
View File

@@ -359,6 +359,7 @@ miPointerWarpCursor (pDev, pScreen, x, y)
int x, y; int x, y;
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
BOOL changedScreen = FALSE;
if (!pDev->isMaster && !pDev->u.master) if (!pDev->isMaster && !pDev->u.master)
return; return;
@@ -366,7 +367,10 @@ miPointerWarpCursor (pDev, pScreen, x, y)
SetupScreen (pScreen); SetupScreen (pScreen);
if (pPointer->pScreen != pScreen) if (pPointer->pScreen != pScreen)
{
(*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE); (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE);
changedScreen = TRUE;
}
if (GenerateEvent) if (GenerateEvent)
{ {
@@ -387,7 +391,8 @@ miPointerWarpCursor (pDev, pScreen, x, y)
pPointer->y = y; pPointer->y = y;
pPointer->pScreen = pScreen; pPointer->pScreen = pScreen;
} }
UpdateSpriteForScreen (pDev, pScreen) ; if (changedScreen)
UpdateSpriteForScreen (pDev, pScreen) ;
} }
/* /*