diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-10-16 14:56:15 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:28:23 -0400 |
| commit | ad076dc6e82019defa422500710b3b42c6309e39 (patch) | |
| tree | 358056792d4e1c4186808660e7bcd1bdab3aea80 /mi | |
| parent | e2b14a1d3bb27e86ff1d7aaf59af850d06263ef5 (diff) | |
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>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/mipointer.c | 9 | ||||
| -rw-r--r-- | mi/mipointer.h | 4 |
2 files changed, 3 insertions, 10 deletions
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 */ , |