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

mi: rename miPointerMoved to miPointerMoveNoEvent. 

Having miPointerMove and miPointerMoved is confusing, especially since both
do the same thing bar the event delivery. Also, miPointerMove calls
miPointerMoved which indicates some confusion in the temporal alignment of
cause and effect.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2010-07-02 15:25:14 +10:00
parent dbd621705a
commit b46ffd25d3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mi/mipointer.c
View File

@ -73,7 +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 void miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
static EventList* events; /* for WarpPointer MotionNotifies */ static EventList* events; /* for WarpPointer MotionNotifies */
@ -308,7 +308,7 @@ 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); miPointerMoveNoEvent(pDev, pScreen, x, y);
/* 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.
@ -456,7 +456,7 @@ miPointerSetWaitForUpdate(ScreenPtr pScreen, Bool wait)
/* Move the pointer on the current screen, and update the sprite. */ /* Move the pointer on the current screen, and update the sprite. */
static void static void
miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y) int x, int y)
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
@ -532,7 +532,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
pPointer->pScreen == pScreen) pPointer->pScreen == pScreen)
return; return;
miPointerMoved(pDev, pScreen, *x, *y); miPointerMoveNoEvent(pDev, pScreen, *x, *y);
} }
void void
@ -554,7 +554,7 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
int i, nevents; int i, nevents;
int valuators[2]; int valuators[2];
miPointerMoved(pDev, pScreen, x, y); miPointerMoveNoEvent(pDev, pScreen, x, y);
/* generate motion notify */ /* generate motion notify */
valuators[0] = x; valuators[0] = x;