Integration of XEVIE branch to trunk

    https://freedesktop.org/bugzilla/show_bug.cgi?id=947
Modified Files: cursorstr.h input.h inputstr.h windowstr.h

4 files changed, 28 insertions, 2 deletions

diff --git a/include/cursorstr.h b/include/cursorstr.h
index c15eaf134..c877d6cc9 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -91,4 +91,8 @@ typedef struct {
     int                x, y;
     ScreenPtr  pScreen;
 } HotSpot;
+
+#ifdef XEVIE
+extern HotSpot xeviehot;
+#endif
 #endif /* CURSORSTRUCT_H */
diff --git a/include/input.h b/include/input.h
index fa88febda..9bcdd9f58 100644
--- a/include/input.h
+++ b/include/input.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef INPUT_H
 #define INPUT_H
@@ -92,6 +92,17 @@ typedef void (*ProcessInputProc)(
     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 @@ typedef struct {
     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;
 
diff --git a/include/inputstr.h b/include/inputstr.h
index 70627629b..b54e8a1d5 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -285,6 +285,9 @@ typedef struct _DeviceIntRec {
 #ifdef XKB
     struct _XkbInterest *	xkb_interest;
 #endif
+    DevUnion		*devPrivates;
+    int			nPrivates;
+    DeviceUnwrapProc    unwrapProc;
 } DeviceIntRec;
 
 typedef struct {
diff --git a/include/windowstr.h b/include/windowstr.h
index 8e8d2542a..00f9eff7a 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -222,4 +222,8 @@ extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
 extern int numSaveUndersViewable;
 extern int deltaSaveUndersViewable;
 
+#ifdef XEVIE
+extern WindowPtr xeviewin;
+#endif
+
 #endif /* WINDOWSTRUCT_H */