diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-10-18 14:24:22 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:29:21 -0400 |
| commit | e4b15125bb06c97f1f34f7074fcdb597e718399c (patch) | |
| tree | a1d10d6d1953ef09ed69b941df8bc8e665465290 | |
| parent | b5d66b9513a0f1e13f5c5bc9e0958f4eac9bf6c3 (diff) | |
mipointer: Remove deprecated miPointerCurrentScreen
The only remaining use was in some debugging code in DMX.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | hw/dmx/input/dmxbackend.c | 6 | ||||
| -rw-r--r-- | mi/mipointer.c | 9 | ||||
| -rw-r--r-- | mi/mipointer.h | 5 |
3 files changed, 1 insertions, 19 deletions
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c index 9463c87d3..807e02328 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)" + DMXDBG8("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 f07c5dbf5..5d591a1dc 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -481,15 +481,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 33261ab3e..bdeed1242 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -91,11 +91,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 |