merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

2 files changed, 38 insertions, 3 deletions

diff --git a/xf86misc.h b/xf86misc.h
index 3cdd2d7..ba1db79 100644
--- a/xf86misc.h
+++ b/xf86misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */
 
 /*
  * Copyright (c) 1995, 1996  The XFree86 Project, Inc
@@ -23,6 +23,7 @@
 #define X_XF86MiscSetGrabKeysState	7
 #define X_XF86MiscSetClientVersion      8
 #define X_XF86MiscGetFilePaths		9
+#define X_XF86MiscPassMessage		10
 
 #define XF86MiscNumberEvents		0
 
@@ -156,6 +157,14 @@ Status XF86MiscGetFilePaths(
     XF86MiscFilePaths*		/* file paths/locations */
 );
 
+Status XF86MiscPassMessage(
+    Display*			/* dpy */,
+    int				/* screen */,
+    const char*			/* message name/type */,
+    const char*			/* message contents/value */,
+    char **			/* returned message */
+);
+
 _XFUNCPROTOEND
 
 #endif
diff --git a/xf86mscstr.h b/xf86mscstr.h
index 70904aa..e514740 100644
--- a/xf86mscstr.h
+++ b/xf86mscstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */
 
 /*
  * Copyright (c) 1995, 1996  The XFree86 Project, Inc
@@ -14,7 +14,7 @@
 #define XF86MISCNAME		"XFree86-Misc"
 
 #define XF86MISC_MAJOR_VERSION	0	/* current version numbers */
-#define XF86MISC_MINOR_VERSION	7
+#define XF86MISC_MINOR_VERSION	8
 
 typedef struct _XF86MiscQueryVersion {
     CARD8	reqType;		/* always XF86MiscReqCode */
@@ -209,4 +209,30 @@ typedef struct {
 } xXF86MiscGetFilePathsReply;
 #define sz_xXF86MiscGetFilePathsReply	32
 
+typedef struct _XF86MiscPassMessage {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscPassMessage */
+    CARD16	length B16;
+    CARD16	typelen B16;
+    CARD16	vallen B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86MiscPassMessageReq;
+#define sz_xXF86MiscPassMessageReq	12
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BYTE	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	mesglen B16;
+    CARD16	pad2 B16;
+    CARD32	status B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86MiscPassMessageReply;
+#define sz_xXF86MiscPassMessageReply	32
+
 #endif /* _XF86MISCSTR_H_ */