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

mi: rename mipointer's internal event list 

Avoid name shadowing warnings, change the event list to a more specific
name.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
This commit is contained in:
Peter Hutterer 2012-12-07 09:26:13 +10:00
parent 88a2cccc37
commit 78376a9217
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mi/mipointer.c
View File

@ -98,7 +98,7 @@ static void miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
static void miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x, static void miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x,
int y); int y);
static InternalEvent *events; /* for WarpPointer MotionNotifies */ static InternalEvent *mipointermove_events; /* for WarpPointer MotionNotifies */
Bool Bool
miPointerInitialize(ScreenPtr pScreen, miPointerInitialize(ScreenPtr pScreen,
@ -143,7 +143,7 @@ miPointerInitialize(ScreenPtr pScreen,
pScreen->DeviceCursorInitialize = miPointerDeviceInitialize; pScreen->DeviceCursorInitialize = miPointerDeviceInitialize;
pScreen->DeviceCursorCleanup = miPointerDeviceCleanup; pScreen->DeviceCursorCleanup = miPointerDeviceCleanup;
events = NULL; mipointermove_events = NULL;
return TRUE; return TRUE;
} }
@ -160,8 +160,8 @@ miPointerCloseScreen(ScreenPtr pScreen)
pScreen->CloseScreen = pScreenPriv->CloseScreen; pScreen->CloseScreen = pScreenPriv->CloseScreen;
free((pointer) pScreenPriv); free((pointer) pScreenPriv);
FreeEventList(events, GetMaximumEventsNum()); FreeEventList(mipointermove_events, GetMaximumEventsNum());
events = NULL; mipointermove_events = NULL;
return (*pScreen->CloseScreen) (pScreen); return (*pScreen->CloseScreen) (pScreen);
} }
@ -710,17 +710,17 @@ miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
valuators[0] = x; valuators[0] = x;
valuators[1] = y; valuators[1] = y;
if (!events) { if (!mipointermove_events) {
events = InitEventList(GetMaximumEventsNum()); mipointermove_events = InitEventList(GetMaximumEventsNum());
if (!events) { if (!mipointermove_events) {
FatalError("Could not allocate event store.\n"); FatalError("Could not allocate event store.\n");
return; return;
} }
} }
valuator_mask_set_range(&mask, 0, 2, valuators); valuator_mask_set_range(&mask, 0, 2, valuators);
nevents = GetPointerEvents(events, pDev, MotionNotify, 0, nevents = GetPointerEvents(mipointermove_events, pDev, MotionNotify, 0,
POINTER_SCREEN | POINTER_ABSOLUTE | POINTER_SCREEN | POINTER_ABSOLUTE |
POINTER_NORAW, &mask); POINTER_NORAW, &mask);
@ -729,7 +729,7 @@ miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
darwinEvents_lock(); darwinEvents_lock();
#endif #endif
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(pDev, &events[i]); mieqEnqueue(pDev, &mipointermove_events[i]);
#ifdef XQUARTZ #ifdef XQUARTZ
darwinEvents_unlock(); darwinEvents_unlock();
#endif #endif