xserver/include cursorstr.h, 1.12, 1.13 input.h, 3.9, 3.10 inputstr.h, 1.8, 1.9 windowstr.h, 1.13, 1.14

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/include
In directory gabe:/tmp/cvs-serv5493/include

Modified Files:
	cursorstr.h input.h inputstr.h windowstr.h 
Log Message:
Add xevie support from Xgl code drop - this doesn't build
but it doesn't build in Xgl either, also other dix changes


Index: cursorstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/cursorstr.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cursorstr.h	2 Nov 2003 19:56:10 -0000	1.12
+++ cursorstr.h	3 Jan 2006 08:32:49 -0000	1.13
@@ -87,4 +87,12 @@
     unsigned short width, height, xhot, yhot;
 } CursorMetricRec;
 
+typedef struct {
+    int x,y;
+    ScreenPtr pScreen;
+} HotSpot;
+
+#ifdef XEVIE
+extern HotSpot xeviehot;
+#endif
 #endif /* CURSORSTRUCT_H */

Index: input.h
===================================================================
RCS file: /cvs/xserver/xserver/include/input.h,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- input.h	11 Sep 2003 05:12:51 -0000	3.9
+++ input.h	3 Jan 2006 08:32:49 -0000	3.10
@@ -92,6 +92,17 @@
     DeviceIntPtr /*device*/,
     int /*count*/);
 
+typedef Bool (*DeviceHandleProc)(
+    DeviceIntPtr /*device*/,
+    void* /*data*/
+    );
+
+typedef void (*DeviceUnwrapProc)(
+    DeviceIntPtr /*device*/,
+    DeviceHandleProc /*proc*/,
+    void* /*data*/
+    );
+
 typedef struct _DeviceRec {
     pointer	devicePrivate;
     ProcessInputProc processInputProc;	/* current */
@@ -145,6 +156,10 @@
     unsigned char id;
 } LedCtrl;
 
+extern int AllocateDevicePrivateIndex(void);
+extern Bool AllocateDevicePrivate(DeviceIntPtr device, int index);
+extern void ResetDevicePrivateIndex(void);
+
 extern KeybdCtrl	defaultKeyboardControl;
 extern PtrCtrl		defaultPointerControl;
 

Index: inputstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/inputstr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- inputstr.h	15 Feb 2004 15:16:08 -0000	1.8
+++ inputstr.h	3 Jan 2006 08:32:49 -0000	1.9
@@ -289,6 +289,9 @@
 #ifdef XKB
     struct _XkbInterest *	xkb_interest;
 #endif
+    DevUnion		*devPrivates;
+    int			nPrivates;
+    DeviceUnwrapProc	unwrapProc;
 } DeviceIntRec;
 
 typedef struct {

Index: windowstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/windowstr.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- windowstr.h	28 Feb 2005 20:45:16 -0000	1.13
+++ windowstr.h	3 Jan 2006 08:32:49 -0000	1.14
@@ -222,4 +222,8 @@
 extern int numSaveUndersViewable;
 extern int deltaSaveUndersViewable;
 
+#ifdef XEVIE
+extern WindowPtr xeviewin;
+#endif
+
 #endif /* WINDOWSTRUCT_H */