mi: remove static GenerateEvent variable.
Push into the respective devices. This should have no functional changes since we never warp more than one device at a time. In the glorious future with true multithreading, still the better thing to do. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
This commit is contained in:
parent
93a7399370
commit
15fe86e69f
|
@ -220,15 +220,15 @@ miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
|
|||
*pTopLeftBox = *pHotBox;
|
||||
}
|
||||
|
||||
static Bool GenerateEvent;
|
||||
|
||||
static Bool
|
||||
miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
|
||||
int x, int y, Bool generateEvent)
|
||||
{
|
||||
SetupScreen (pScreen);
|
||||
miPointerPtr pPointer = MIPOINTER(pDev);
|
||||
|
||||
pPointer->generateEvent = generateEvent;
|
||||
|
||||
GenerateEvent = generateEvent;
|
||||
/* device dependent - must pend signal and call miPointerWarpCursor */
|
||||
(*pScreenPriv->screenFuncs->WarpCursor) (pDev, pScreen, x, y);
|
||||
if (!generateEvent)
|
||||
|
@ -261,6 +261,7 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
|
|||
pPointer->confined = FALSE;
|
||||
pPointer->x = 0;
|
||||
pPointer->y = 0;
|
||||
pPointer->generateEvent = FALSE;
|
||||
|
||||
if (!((*pScreenPriv->spriteFuncs->DeviceCursorInitialize)(pDev, pScreen)))
|
||||
{
|
||||
|
@ -306,7 +307,7 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
|
|||
changedScreen = TRUE;
|
||||
}
|
||||
|
||||
if (GenerateEvent)
|
||||
if (pPointer->generateEvent)
|
||||
miPointerMove (pDev, pScreen, x, y);
|
||||
else
|
||||
miPointerMoveNoEvent(pDev, pScreen, x, y);
|
||||
|
|
|
@ -44,6 +44,7 @@ typedef struct {
|
|||
Bool confined; /* pointer can't change screens */
|
||||
int x, y; /* hot spot location */
|
||||
int devx, devy; /* sprite position */
|
||||
Bool generateEvent; /* generate an event during warping? */
|
||||
} miPointerRec, *miPointerPtr;
|
||||
|
||||
typedef struct {
|
||||
|
|
Loading…
Reference in New Issue
Block a user