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

mipointer: Flatten calls to mieqSwitchScreen 

No DDX was overriding this.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2012-10-16 14:56:15 -04:00
parent e2b14a1d3b
commit ad076dc6e8
6 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/dmx/dmxcursor.c
View File

@ -198,7 +198,6 @@ miPointerScreenFuncRec dmxPointerCursorFuncs = {
dmxCrossScreen, dmxCrossScreen,
dmxWarpCursor, dmxWarpCursor,
NULL, NULL,
NULL,
}; };
/** Create a list of screens that we'll manipulate. */ /** Create a list of screens that we'll manipulate. */

1
hw/kdrive/ephyr/ephyr.c
View File

@ -824,7 +824,6 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs = {
ephyrCrossScreen, ephyrCrossScreen,
ephyrWarpCursor, ephyrWarpCursor,
NULL, NULL,
NULL
}; };
#ifdef XF86DRI #ifdef XF86DRI

1
hw/xfree86/common/xf86Cursor.c
View File

@ -74,7 +74,6 @@ static miPointerScreenFuncRec xf86PointerScreenFuncs = {
xf86WarpCursor, xf86WarpCursor,
/* let miPointerInitialize take care of these */ /* let miPointerInitialize take care of these */
NULL, NULL,
NULL
}; };
static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS]; static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS];

1
hw/xquartz/xpr/xprCursor.c
View File

@ -306,7 +306,6 @@ static miPointerScreenFuncRec quartzScreenFuncsRec = {
QuartzCrossScreen, QuartzCrossScreen,
QuartzWarpCursor, QuartzWarpCursor,
NULL, NULL,
NULL
}; };
/* /*

9
mi/mipointer.c
View File

@ -123,8 +123,6 @@ miPointerInitialize(ScreenPtr pScreen,
*/ */
if (!screenFuncs->EnqueueEvent) if (!screenFuncs->EnqueueEvent)
screenFuncs->EnqueueEvent = mieqEnqueue; screenFuncs->EnqueueEvent = mieqEnqueue;
if (!screenFuncs->NewEventScreen)
screenFuncs->NewEventScreen = mieqSwitchScreen;
pScreenPriv->waitForUpdate = waitForUpdate; pScreenPriv->waitForUpdate = waitForUpdate;
pScreenPriv->showTransparent = FALSE; pScreenPriv->showTransparent = FALSE;
pScreenPriv->CloseScreen = pScreen->CloseScreen; pScreenPriv->CloseScreen = pScreen->CloseScreen;
@ -363,7 +361,7 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
pPointer = MIPOINTER(pDev); pPointer = MIPOINTER(pDev);
if (pPointer->pScreen != pScreen) { if (pPointer->pScreen != pScreen) {
(*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE); mieqSwitchScreen(pDev, pScreen, TRUE);
changedScreen = TRUE; changedScreen = TRUE;
} }
@ -480,7 +478,7 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
pScreen = screenInfo.screens[screen_no]; pScreen = screenInfo.screens[screen_no];
pScreenPriv = GetScreenPrivate(pScreen); pScreenPriv = GetScreenPrivate(pScreen);
(*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, FALSE); mieqSwitchScreen(pDev, pScreen, FALSE);
NewCurrentScreen(pDev, pScreen, x, y); NewCurrentScreen(pDev, pScreen, x, y);
pPointer->limits.x2 = pScreen->width; pPointer->limits.x2 = pScreen->width;
@ -617,8 +615,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
(*pScreenPriv->screenFuncs->CursorOffScreen) (&newScreen, &x, &y); (*pScreenPriv->screenFuncs->CursorOffScreen) (&newScreen, &x, &y);
if (newScreen != pScreen) { if (newScreen != pScreen) {
pScreen = newScreen; pScreen = newScreen;
(*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, mieqSwitchScreen(pDev, pScreen, FALSE);
FALSE);
/* Smash the confine to the new screen */ /* Smash the confine to the new screen */
pPointer->limits.x2 = pScreen->width; pPointer->limits.x2 = pScreen->width;
pPointer->limits.y2 = pScreen->height; pPointer->limits.y2 = pScreen->height;

4
mi/mipointer.h
View File

@ -74,10 +74,6 @@ typedef struct _miPointerScreenFuncRec {
void (*EnqueueEvent) (DeviceIntPtr /* pDev */ , void (*EnqueueEvent) (DeviceIntPtr /* pDev */ ,
InternalEvent * /* event */ InternalEvent * /* event */
); );
void (*NewEventScreen) (DeviceIntPtr /* pDev */ ,
ScreenPtr /* pScr */ ,
Bool /* set_dequeue_screen */
);
} miPointerScreenFuncRec, *miPointerScreenFuncPtr; } miPointerScreenFuncRec, *miPointerScreenFuncPtr;
extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ , extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ ,