aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi/mipointer.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
commit4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch)
treec1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/mi/mipointer.h
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/mi/mipointer.h')
-rw-r--r--xorg-server/mi/mipointer.h47
1 files changed, 17 insertions, 30 deletions
diff --git a/xorg-server/mi/mipointer.h b/xorg-server/mi/mipointer.h
index e864fddf4..d1eac987f 100644
--- a/xorg-server/mi/mipointer.h
+++ b/xorg-server/mi/mipointer.h
@@ -32,24 +32,36 @@ in this Software without prior written authorization from The Open Group.
typedef struct _miPointerSpriteFuncRec {
Bool (*RealizeCursor)(
+ DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */,
CursorPtr /* pCurs */
);
Bool (*UnrealizeCursor)(
+ DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */,
CursorPtr /* pCurs */
);
void (*SetCursor)(
+ DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */,
CursorPtr /* pCurs */,
int /* x */,
int /* y */
);
void (*MoveCursor)(
+ DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */,
int /* x */,
int /* y */
);
+ Bool (*DeviceCursorInitialize)(
+ DeviceIntPtr /* pDev */,
+ ScreenPtr /* pScr */
+ );
+ void (*DeviceCursorCleanup)(
+ DeviceIntPtr /* pDev */,
+ ScreenPtr /* pScr */
+ );
} miPointerSpriteFuncRec, *miPointerSpriteFuncPtr;
typedef struct _miPointerScreenFuncRec {
@@ -63,6 +75,7 @@ typedef struct _miPointerScreenFuncRec {
int /* entering */
);
void (*WarpCursor)(
+ DeviceIntPtr /*pDev*/,
ScreenPtr /* pScr */,
int /* x */,
int /* y */
@@ -72,6 +85,7 @@ typedef struct _miPointerScreenFuncRec {
xEventPtr /* event */
);
void (*NewEventScreen)(
+ DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */,
Bool /* fromDIX */
);
@@ -90,15 +104,12 @@ extern Bool miPointerInitialize(
);
extern void miPointerWarpCursor(
+ DeviceIntPtr /*pDev*/,
ScreenPtr /*pScreen*/,
int /*x*/,
int /*y*/
) _X_DEPRECATED;
-extern int miPointerGetMotionBufferSize(
- void
-) _X_DEPRECATED;
-
extern int miPointerGetMotionEvents(
DeviceIntPtr /*pPtr*/,
xTimecoord * /*coords*/,
@@ -107,36 +118,13 @@ extern int miPointerGetMotionEvents(
ScreenPtr /*pScreen*/
);
-/* Deprecated in favour of miPointerUpdateSprite. */
-extern void miPointerUpdate(
- void
-) _X_DEPRECATED;
-
-/* Deprecated in favour of miSetPointerPosition. */
-extern void miPointerDeltaCursor(
- int /*dx*/,
- int /*dy*/,
- unsigned long /*time*/
-) _X_DEPRECATED;
+/* Deprecated in favour of miPointerSetPosition. */
extern void miPointerAbsoluteCursor(
int /*x*/,
int /*y*/,
unsigned long /*time*/
) _X_DEPRECATED;
-/* Deprecated in favour of miGetPointerPosition. */
-extern void miPointerPosition(
- int * /*x*/,
- int * /*y*/
-) _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
@@ -161,8 +149,7 @@ extern void miPointerGetPosition(
extern void miPointerSetPosition(
DeviceIntPtr pDev,
int *x,
- int *y,
- unsigned long time);
+ int *y);
extern void miPointerUpdateSprite(
DeviceIntPtr pDev);