frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: De-duplicate some code in mipointer.c 

miPointerMoved already has the same code.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2010-07-02 14:22:03 +10:00
parent 9f0b193acd
commit dbd621705a
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mi/mipointer.c
View File

@ -73,6 +73,7 @@ static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen,
static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen); static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
static void miPointerDeviceCleanup(DeviceIntPtr pDev, static void miPointerDeviceCleanup(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
static void miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
static EventList* events; /* for WarpPointer MotionNotifies */ static EventList* events; /* for WarpPointer MotionNotifies */
@ -305,24 +306,9 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
} }
if (GenerateEvent) if (GenerateEvent)
{
miPointerMove (pDev, pScreen, x, y); miPointerMove (pDev, pScreen, x, y);
}
else else
{ miPointerMoved(pDev, pScreen, x, y);
/* everything from miPointerMove except the event and history */
if (!pScreenPriv->waitForUpdate && pScreen == pPointer->pSpriteScreen)
{
pPointer->devx = x;
pPointer->devy = y;
if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask)
(*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);
}
pPointer->x = x;
pPointer->y = y;
pPointer->pScreen = pScreen;
}
/* Don't call USFS if we use Xinerama, otherwise the root window is /* Don't call USFS if we use Xinerama, otherwise the root window is
* updated to the second screen, and we never receive any events. * updated to the second screen, and we never receive any events.