frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Adam Jackson 2012-10-18 14:24:22 -04:00
parent b5d66b9513
commit e4b15125bb
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/dmx/input/dmxbackend.c
View File

@ -419,10 +419,9 @@ dmxBackendCollectEvents(DevicePtr pDev,
} }
break; break;
case MotionNotify: case MotionNotify:
DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d (mi %d)" DMXDBG8("dmxBackendCollectEvents: MotionNotify %d/%d"
" newscreen=%d: %d %d (e=%d; last=%d,%d)\n", " newscreen=%d: %d %d (e=%d; last=%d,%d)\n",
dmxScreen->index, priv->myScreen, dmxScreen->index, priv->myScreen,
miPointerCurrentScreen()->myNum,
priv->newscreen, priv->newscreen,
X.xmotion.x, X.xmotion.y, X.xmotion.x, X.xmotion.y,
entered, priv->lastX, priv->lastY); entered, priv->lastX, priv->lastY);
@ -579,9 +578,6 @@ dmxBackendLateReInit(DevicePtr pDev)
GETPRIVFROMPDEV; GETPRIVFROMPDEV;
int x, y; int x, y;
DMXDBG1("dmxBackendLateReInit miPointerCurrentScreen() = %p\n",
miPointerCurrentScreen());
dmxBackendSameDisplay(NULL, 0); /* Invalidate cache */ dmxBackendSameDisplay(NULL, 0); /* Invalidate cache */
dmxBackendInitPrivate(pDev); dmxBackendInitPrivate(pDev);
dmxBackendComputeCenter(priv); dmxBackendComputeCenter(priv);

9
mi/mipointer.c
View File

@ -480,15 +480,6 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
pPointer->limits.y2 = pScreen->height; pPointer->limits.y2 = pScreen->height;
} }
/**
* @return The current screen of the VCP
*/
ScreenPtr
miPointerCurrentScreen(void)
{
return miPointerGetScreen(inputInfo.pointer);
}
/** /**
* @return The current screen of the given device or NULL. * @return The current screen of the given device or NULL.
*/ */

5
mi/mipointer.h
View File

@ -91,11 +91,6 @@ extern _X_EXPORT void miPointerWarpCursor(DeviceIntPtr /*pDev */ ,
int /*y */ int /*y */
); );
/* Deprecated in favour of miPointerGetScreen. */
extern _X_EXPORT ScreenPtr
miPointerCurrentScreen(void
) _X_DEPRECATED;
extern _X_EXPORT ScreenPtr extern _X_EXPORT ScreenPtr
miPointerGetScreen(DeviceIntPtr pDev); miPointerGetScreen(DeviceIntPtr pDev);
extern _X_EXPORT void extern _X_EXPORT void