mi: don't mix declarations and code
This commit is contained in:
parent
5aa9483d3e
commit
46f3c1b937
|
@ -284,10 +284,11 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
|
|||
static void
|
||||
miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
|
||||
{
|
||||
SetupScreen(pScreen);
|
||||
|
||||
if (!pDev->isMaster && pDev->u.master)
|
||||
return;
|
||||
|
||||
SetupScreen(pScreen);
|
||||
(*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);
|
||||
xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey));
|
||||
dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL);
|
||||
|
@ -302,8 +303,8 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
|
|||
miPointerPtr pPointer;
|
||||
BOOL changedScreen = FALSE;
|
||||
|
||||
pPointer = MIPOINTER(pDev);
|
||||
SetupScreen (pScreen);
|
||||
pPointer = MIPOINTER(pDev);
|
||||
|
||||
if (pPointer->pScreen != pScreen)
|
||||
{
|
||||
|
|
|
@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
|
|||
CursorPtr pCursor, int x, int y)
|
||||
{
|
||||
miSpriteScreenPtr pScreenPriv;
|
||||
miCursorInfoPtr pPointer;
|
||||
|
||||
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
|
||||
miSpriteScreenKey);
|
||||
miCursorInfoPtr pPointer;
|
||||
|
||||
if (!pDev->isMaster && !pDev->u.master)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user