diff options
| -rw-r--r-- | hw/dmx/dmxcursor.c | 1 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Cursor.c | 1 | ||||
| -rw-r--r-- | hw/xquartz/xpr/xprCursor.c | 1 | ||||
| -rw-r--r-- | mi/mipointer.c | 9 | ||||
| -rw-r--r-- | mi/mipointer.h | 4 |
6 files changed, 3 insertions, 14 deletions
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index 35aca81b4..5f415360c 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -198,7 +198,6 @@ miPointerScreenFuncRec dmxPointerCursorFuncs = { dmxCrossScreen, dmxWarpCursor, NULL, - NULL, }; /** Create a list of screens that we'll manipulate. */ diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 02d497073..1f32ea15c 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -824,7 +824,6 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs = { ephyrCrossScreen, ephyrWarpCursor, NULL, - NULL }; #ifdef XF86DRI diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 65a9e8264..973bdd303 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -74,7 +74,6 @@ static miPointerScreenFuncRec xf86PointerScreenFuncs = { xf86WarpCursor, /* let miPointerInitialize take care of these */ NULL, - NULL }; static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS]; diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index 0392a4639..6e617c788 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -306,7 +306,6 @@ static miPointerScreenFuncRec quartzScreenFuncsRec = { QuartzCrossScreen, QuartzWarpCursor, NULL, - NULL }; /* diff --git a/mi/mipointer.c b/mi/mipointer.c index b8503f450..0b55c2676 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -123,8 +123,6 @@ miPointerInitialize(ScreenPtr pScreen, */ if (!screenFuncs->EnqueueEvent) screenFuncs->EnqueueEvent = mieqEnqueue; - if (!screenFuncs->NewEventScreen) - screenFuncs->NewEventScreen = mieqSwitchScreen; pScreenPriv->waitForUpdate = waitForUpdate; pScreenPriv->showTransparent = FALSE; pScreenPriv->CloseScreen = pScreen->CloseScreen; @@ -363,7 +361,7 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) pPointer = MIPOINTER(pDev); if (pPointer->pScreen != pScreen) { - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE); + mieqSwitchScreen(pDev, pScreen, TRUE); changedScreen = TRUE; } @@ -480,7 +478,7 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y) pScreen = screenInfo.screens[screen_no]; pScreenPriv = GetScreenPrivate(pScreen); - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, FALSE); + mieqSwitchScreen(pDev, pScreen, FALSE); NewCurrentScreen(pDev, pScreen, x, y); pPointer->limits.x2 = pScreen->width; @@ -617,8 +615,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, (*pScreenPriv->screenFuncs->CursorOffScreen) (&newScreen, &x, &y); if (newScreen != pScreen) { pScreen = newScreen; - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, - FALSE); + mieqSwitchScreen(pDev, pScreen, FALSE); /* Smash the confine to the new screen */ pPointer->limits.x2 = pScreen->width; pPointer->limits.y2 = pScreen->height; diff --git a/mi/mipointer.h b/mi/mipointer.h index f89dff31e..39ba83b2b 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -74,10 +74,6 @@ typedef struct _miPointerScreenFuncRec { void (*EnqueueEvent) (DeviceIntPtr /* pDev */ , InternalEvent * /* event */ ); - void (*NewEventScreen) (DeviceIntPtr /* pDev */ , - ScreenPtr /* pScr */ , - Bool /* set_dequeue_screen */ - ); } miPointerScreenFuncRec, *miPointerScreenFuncPtr; extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ , |