summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-10-07 10:36:12 -0400
committerAdam Jackson <ajax@redhat.com>2008-10-07 10:36:12 -0400
commit30193fbff9d9284fbbd81fe5f7b6c4d102daf1d1 (patch)
tree95ab2fb53eaaf4f8b2b5ab4513f2ec952dc8c32b
parente7cd5d84ed1fb3637dce6e9e6ef58c8611818c4e (diff)
Reinstate cursorScreenDevPriv
-rw-r--r--dix/globals.c2
-rw-r--r--include/cursor.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/dix/globals.c b/dix/globals.c
index abb814679..973dc43c3 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -142,6 +142,8 @@ CursorPtr rootCursor;
Bool party_like_its_1989 = FALSE;
Bool whiteRoot = FALSE;
+int cursorScreenDevPriv[MAXSCREENS];
+
_X_EXPORT TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime;
diff --git a/include/cursor.h b/include/cursor.h
index f86d94ca5..f7c16e3f9 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -64,6 +64,9 @@ struct _DeviceIntRec;
typedef struct _Cursor *CursorPtr;
typedef struct _CursorMetric *CursorMetricPtr;
+extern int cursorScreenDevPriv[MAXSCREENS];
+#define CursorScreenKey(pScreen) (cursorScreenDevPriv + (pScreen)->myNum)
+
extern CursorPtr rootCursor;
extern int FreeCursor(