[PATCH 5/6] mipointer: Remove deprecated miPointerCurrentScreen
Adam Jackson
ajax at redhat.com
Thu Oct 18 11:24:22 PDT 2012
The only remaining use was in some debugging code in DMX.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
hw/dmx/input/dmxbackend.c | 6 +-----
mi/mipointer.c | 9 ---------
mi/mipointer.h | 5 -----
3 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index 9463c87..f6e2e70 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -419,10 +419,9 @@ dmxBackendCollectEvents(DevicePtr pDev,
}
break;
case MotionNotify:
- DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d (mi %d)"
+ DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d"
" newscreen=%d: %d %d (e=%d; last=%d,%d)\n",
dmxScreen->index, priv->myScreen,
- miPointerCurrentScreen()->myNum,
priv->newscreen,
X.xmotion.x, X.xmotion.y,
entered, priv->lastX, priv->lastY);
@@ -579,9 +578,6 @@ dmxBackendLateReInit(DevicePtr pDev)
GETPRIVFROMPDEV;
int x, y;
- DMXDBG1("dmxBackendLateReInit miPointerCurrentScreen() = %p\n",
- miPointerCurrentScreen());
-
dmxBackendSameDisplay(NULL, 0); /* Invalidate cache */
dmxBackendInitPrivate(pDev);
dmxBackendComputeCenter(priv);
diff --git a/mi/mipointer.c b/mi/mipointer.c
index f345063..21034b9 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -488,15 +488,6 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
}
/**
- * @return The current screen of the VCP
- */
-ScreenPtr
-miPointerCurrentScreen(void)
-{
- return miPointerGetScreen(inputInfo.pointer);
-}
-
-/**
* @return The current screen of the given device or NULL.
*/
ScreenPtr
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 1500e21..7c11549 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -98,11 +98,6 @@ extern _X_EXPORT void miPointerWarpCursor(DeviceIntPtr /*pDev */ ,
int /*y */
);
-/* Deprecated in favour of miPointerGetScreen. */
-extern _X_EXPORT ScreenPtr
-miPointerCurrentScreen(void
-) _X_DEPRECATED;
-
extern _X_EXPORT ScreenPtr
miPointerGetScreen(DeviceIntPtr pDev);
extern _X_EXPORT void
--
1.7.11.7
More information about the xorg-devel
mailing list