diff options
| -rw-r--r-- | hw/dmx/dmxcursor.c | 5 | ||||
| -rw-r--r-- | mi/mipointer.c | 20 | ||||
| -rw-r--r-- | mi/mipointer.h | 16 |
3 files changed, 0 insertions, 41 deletions
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index 6218dc39f..32934bbad 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -943,13 +943,8 @@ void dmxCheckCursor(void) pScreen = screenInfo.screens[dmxScreen->index]; if (!dmxOnScreen(x, y, dmxScreen)) { -#if 00 - if (firstScreen && i == miPointerCurrentScreen()->myNum) - miPointerSetNewScreen(firstScreen->index, x, y); -#else if (firstScreen && i == miPointerGetScreen(inputInfo.pointer)->myNum) miPointerSetScreen(inputInfo.pointer, firstScreen->index, x, y); -#endif _dmxSetCursor(pScreen, NULL, x - dmxScreen->rootXOrigin, y - dmxScreen->rootYOrigin); diff --git a/mi/mipointer.c b/mi/mipointer.c index 8293e9b4f..c13188276 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -420,26 +420,6 @@ miPointerUpdateSprite (DeviceIntPtr pDev) } } -/* - * miPointerDeltaCursor. The pointer has moved dx,dy from it's previous - * position. - */ - -void -miPointerDeltaCursor (int dx, int dy, unsigned long time) -{ - int x = MIPOINTER(inputInfo.pointer)->x = dx; - int y = MIPOINTER(inputInfo.pointer)->y = dy; - - miPointerSetPosition(inputInfo.pointer, &x, &y, time); -} - -void -miPointerSetNewScreen(int screen_no, int x, int y) -{ - miPointerSetScreen(inputInfo.pointer, screen_no, x, y); -} - void miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y) { diff --git a/mi/mipointer.h b/mi/mipointer.h index 179e4f371..6119c25f6 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -110,10 +110,6 @@ extern void miPointerWarpCursor( int /*y*/ ) _X_DEPRECATED; -extern int miPointerGetMotionBufferSize( - void -) _X_DEPRECATED; - extern int miPointerGetMotionEvents( DeviceIntPtr /*pPtr*/, xTimecoord * /*coords*/, @@ -123,24 +119,12 @@ extern int miPointerGetMotionEvents( ); /* Deprecated in favour of miPointerSetPosition. */ -extern void miPointerDeltaCursor( - int /*dx*/, - int /*dy*/, - unsigned long /*time*/ -) _X_DEPRECATED; extern void miPointerAbsoluteCursor( int /*x*/, int /*y*/, unsigned long /*time*/ ) _X_DEPRECATED; -/* Deprecated in favour of miPointerSetScreen. */ -extern void miPointerSetNewScreen( - int, /*screen_no*/ - int, /*x*/ - int /*y*/ -) _X_DEPRECATED; - /* Deprecated in favour of miPointerGetScreen. */ extern ScreenPtr miPointerCurrentScreen( void |