xserver: Branch 'master'

[Adam Jackson]

 dix/globals.c    |    2 ++
 include/cursor.h |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 30193fbff9d9284fbbd81fe5f7b6c4d102daf1d1
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 7 10:36:12 2008 -0400

    Reinstate cursorScreenDevPriv

diff --git a/dix/globals.c b/dix/globals.c
index abb8146..973dc43 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 f86d94c..f7c16e3 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(