diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-02 14:22:03 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-07 13:27:09 +1000 |
| commit | dbd621705a5211540b353af81c4af83c297b74dc (patch) | |
| tree | a0e2e1609eda05b6d7c9bcb8e7f2c8cd44418e8d | |
| parent | 9f0b193acdc29e491b6245390cf9f53b5222e6d3 (diff) | |
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>
| -rw-r--r-- | mi/mipointer.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/mi/mipointer.c b/mi/mipointer.c index 9936a01f4..7efcebb7c 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -73,6 +73,7 @@ static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen, static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen); static void miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen); +static void miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y); static EventList* events; /* for WarpPointer MotionNotifies */ @@ -305,24 +306,9 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) } if (GenerateEvent) - { miPointerMove (pDev, pScreen, x, y); - } else - { - /* 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; - } + miPointerMoved(pDev, pScreen, x, y); /* Don't call USFS if we use Xinerama, otherwise the root window is * updated to the second screen, and we never receive any events. |