Merge remote branch 'xf86miscproto/master'

9 files changed, 591 insertions, 0 deletions

diff --git a/xf86miscproto/.gitignore b/xf86miscproto/.gitignore
new file mode 100644
index 0000000..c9bacc5
--- /dev/null
+++ b/xf86miscproto/.gitignore
@@ -0,0 +1,78 @@
+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
+aclocal.m4
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config-ml.in
+config.py
+config.status
+config.status.lineno
+config.sub
+configure
+configure.scan
+depcomp
+.deps/
+INSTALL
+install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
+missing
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for xf86miscproto 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
diff --git a/xf86miscproto/COPYING b/xf86miscproto/COPYING
new file mode 100644
index 0000000..9f1e999
--- /dev/null
+++ b/xf86miscproto/COPYING
@@ -0,0 +1,20 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
diff --git a/xf86miscproto/Makefile.am b/xf86miscproto/Makefile.am
new file mode 100644
index 0000000..5a11549
--- /dev/null
+++ b/xf86miscproto/Makefile.am
@@ -0,0 +1,21 @@
+xf86miscdir = $(includedir)/X11/extensions
+xf86misc_HEADERS = \
+	xf86misc.h \
+	xf86mscstr.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xf86miscproto.pc
+
+EXTRA_DIST = xf86miscproto.pc.in
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/xf86miscproto/README b/xf86miscproto/README
new file mode 100644
index 0000000..20a12ef
--- /dev/null
+++ b/xf86miscproto/README
@@ -0,0 +1,28 @@
+This package includes the protocol definitions of the "XFree86-Misc"
+extension to the X11 protocol.   The "XFree86-Misc" extension is
+supported by the XFree86 X server and versions of the Xorg X server
+prior to Xorg 1.6.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/proto/xf86miscproto
+
+        http://cgit.freedesktop.org/xorg/proto/xf86miscproto
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+
diff --git a/xf86miscproto/autogen.sh b/xf86miscproto/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/xf86miscproto/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/xf86miscproto/configure.ac b/xf86miscproto/configure.ac
new file mode 100644
index 0000000..6f5dd54
--- /dev/null
+++ b/xf86miscproto/configure.ac
@@ -0,0 +1,13 @@
+AC_PREREQ([2.57])
+AC_INIT([XF86MiscProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
+AC_OUTPUT([Makefile
+           xf86miscproto.pc])
diff --git a/xf86miscproto/xf86misc.h b/xf86miscproto/xf86misc.h
new file mode 100644
index 0000000..f5d7a56
--- /dev/null
+++ b/xf86miscproto/xf86misc.h
@@ -0,0 +1,172 @@
+/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
+
+/*
+ * Copyright (c) 1995, 1996  The XFree86 Project, Inc
+ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#ifndef _XF86MISC_H_
+#define _XF86MISC_H_
+
+#include <X11/Xfuncproto.h>
+
+#define X_XF86MiscQueryVersion		0
+#ifdef _XF86MISC_SAVER_COMPAT_
+#define X_XF86MiscGetSaver		1
+#define X_XF86MiscSetSaver		2
+#endif
+#define X_XF86MiscGetMouseSettings	3
+#define X_XF86MiscGetKbdSettings	4
+#define X_XF86MiscSetMouseSettings	5
+#define X_XF86MiscSetKbdSettings	6
+#define X_XF86MiscSetGrabKeysState	7
+#define X_XF86MiscSetClientVersion      8
+#define X_XF86MiscGetFilePaths		9
+#define X_XF86MiscPassMessage		10
+
+#define XF86MiscNumberEvents		0
+
+#define XF86MiscBadMouseProtocol	0
+#define XF86MiscBadMouseBaudRate	1
+#define XF86MiscBadMouseFlags		2
+#define XF86MiscBadMouseCombo		3
+#define XF86MiscBadKbdType		4
+#define XF86MiscModInDevDisabled	5
+#define XF86MiscModInDevClientNotLocal	6
+#define XF86MiscNoModule                7
+#define XF86MiscNumberErrors		(XF86MiscNoModule + 1)
+
+/* Never renumber these */
+#define MTYPE_MICROSOFT		0
+#define MTYPE_MOUSESYS		1
+#define MTYPE_MMSERIES		2
+#define MTYPE_LOGITECH		3
+#define MTYPE_BUSMOUSE		4
+#define MTYPE_LOGIMAN		5
+#define MTYPE_PS_2		6
+#define MTYPE_MMHIT		7
+#define MTYPE_GLIDEPOINT	8
+#define MTYPE_IMSERIAL		9
+#define MTYPE_THINKING		10
+#define MTYPE_IMPS2		11
+#define MTYPE_THINKINGPS2	12
+#define MTYPE_MMANPLUSPS2	13
+#define MTYPE_GLIDEPOINTPS2	14
+#define MTYPE_NETPS2		15
+#define MTYPE_NETSCROLLPS2	16
+#define MTYPE_SYSMOUSE		17
+#define MTYPE_AUTOMOUSE		18
+#define MTYPE_ACECAD		19
+#define MTYPE_EXPPS2            20
+
+#define MTYPE_XQUEUE		127
+#define MTYPE_OSMOUSE		126
+#define MTYPE_UNKNOWN		125
+
+#define KTYPE_UNKNOWN		0
+#define KTYPE_84KEY		1
+#define KTYPE_101KEY		2
+#define KTYPE_OTHER		3
+#define KTYPE_XQUEUE		4
+
+#define MF_CLEAR_DTR		1
+#define MF_CLEAR_RTS		2
+#define MF_REOPEN		128
+
+#ifndef _XF86MISC_SERVER_
+
+/* return values for XF86MiscSetGrabKeysState */
+#define MiscExtGrabStateSuccess	0	/* No errors */
+#define MiscExtGrabStateLocked	1	/* A client already requested that
+					 * grabs cannot be removed/killed */
+#define MiscExtGrabStateAlready	2	/* Request for enabling/disabling
+					 * grab removeal/kill already done */
+
+_XFUNCPROTOBEGIN
+
+typedef struct {
+    char*	device;
+    int		type;
+    int		baudrate;
+    int		samplerate;
+    int		resolution;
+    int		buttons;
+    Bool	emulate3buttons;
+    int		emulate3timeout;
+    Bool	chordmiddle;
+    int		flags;
+} XF86MiscMouseSettings;
+
+typedef struct {
+    int		type;
+    int		rate;
+    int		delay;
+    Bool	servnumlock;
+} XF86MiscKbdSettings;
+
+typedef struct {
+    char*	configfile;
+    char*	modulepath;
+    char*	logfile;
+} XF86MiscFilePaths;
+
+Bool XF86MiscQueryVersion(
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */
+);
+
+Bool XF86MiscQueryExtension(
+    Display*		/* dpy */,
+    int*		/* event_base */,
+    int*		/* error_base */
+);
+
+Bool XF86MiscSetClientVersion(
+    Display *dpy	/* dpy */
+);
+
+Status XF86MiscGetMouseSettings(
+    Display*			/* dpy */,
+    XF86MiscMouseSettings*	/* mouse info */
+);
+
+Status XF86MiscGetKbdSettings(
+    Display*			/* dpy */,
+    XF86MiscKbdSettings*	/* keyboard info */
+);
+
+Status XF86MiscSetMouseSettings(
+    Display*			/* dpy */,
+    XF86MiscMouseSettings*	/* mouse info */
+);
+
+Status XF86MiscSetKbdSettings(
+    Display*			/* dpy */,
+    XF86MiscKbdSettings*	/* keyboard info */
+);
+
+int XF86MiscSetGrabKeysState(
+    Display*			/* dpy */,
+    Bool			/* enabled */
+);
+
+Status XF86MiscGetFilePaths(
+    Display*			/* dpy */,
+    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
+
+#endif
diff --git a/xf86miscproto/xf86miscproto.pc.in b/xf86miscproto/xf86miscproto.pc.in
new file mode 100644
index 0000000..eb72923
--- /dev/null
+++ b/xf86miscproto/xf86miscproto.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: XF86MiscProto
+Description: XF86Misc extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
diff --git a/xf86miscproto/xf86mscstr.h b/xf86miscproto/xf86mscstr.h
new file mode 100644
index 0000000..637d3a5
--- /dev/null
+++ b/xf86miscproto/xf86mscstr.h
@@ -0,0 +1,238 @@
+/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
+
+/*
+ * Copyright (c) 1995, 1996  The XFree86 Project, Inc
+ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#ifndef _XF86MISCSTR_H_
+#define _XF86MISCSTR_H_
+
+#include <X11/extensions/xf86misc.h>
+
+#define XF86MISCNAME		"XFree86-Misc"
+
+#define XF86MISC_MAJOR_VERSION	0	/* current version numbers */
+#define XF86MISC_MINOR_VERSION	9
+
+typedef struct _XF86MiscQueryVersion {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscQueryVersion */
+    CARD16	length B16;
+} xXF86MiscQueryVersionReq;
+#define sz_xXF86MiscQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of XFree86-Misc */
+    CARD16	minorVersion B16;	/* minor version of XFree86-Misc */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86MiscQueryVersionReply;
+#define sz_xXF86MiscQueryVersionReply	32
+
+#ifdef _XF86MISC_SAVER_COMPAT_
+typedef struct _XF86MiscGetSaver {
+    CARD8       reqType;                /* always XF86MiscReqCode */
+    CARD8       xf86miscReqType;     /* always X_XF86MiscGetSaver */
+    CARD16      length B16; 
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86MiscGetSaverReq;
+#define sz_xXF86MiscGetSaverReq	8
+
+typedef struct _XF86MiscSetSaver {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscSetSaver */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	suspendTime B32;
+    CARD32	offTime B32;
+} xXF86MiscSetSaverReq;
+#define sz_xXF86MiscSetSaverReq	16
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	suspendTime B32;
+    CARD32	offTime B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86MiscGetSaverReply;
+#define sz_xXF86MiscGetSaverReply	32
+#endif
+
+typedef struct _XF86MiscGetMouseSettings {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscGetMouseSettings */
+    CARD16	length B16;
+} xXF86MiscGetMouseSettingsReq;
+#define sz_xXF86MiscGetMouseSettingsReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	mousetype B32;
+    CARD32	baudrate B32;
+    CARD32	samplerate B32;
+    CARD32	resolution B32;
+    CARD32	buttons B32;
+    BOOL	emulate3buttons;
+    BOOL	chordmiddle;
+    CARD16	pad2 B16;
+    CARD32	emulate3timeout B32;
+    CARD32	flags B32;
+    CARD32	devnamelen B32;		/* strlen(device)+1 */
+} xXF86MiscGetMouseSettingsReply;
+#define sz_xXF86MiscGetMouseSettingsReply	44
+
+typedef struct _XF86MiscGetKbdSettings {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscGetKbdSettings */
+    CARD16	length B16;
+} xXF86MiscGetKbdSettingsReq;
+#define sz_xXF86MiscGetKbdSettingsReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	kbdtype B32;
+    CARD32	rate B32;
+    CARD32	delay B32;
+    BOOL	servnumlock;
+    BOOL	pad2;
+    CARD16	pad3 B16;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86MiscGetKbdSettingsReply;
+#define sz_xXF86MiscGetKbdSettingsReply	32
+
+typedef struct _XF86MiscSetMouseSettings {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscSetMouseSettings */
+    CARD16	length B16;
+    CARD32	mousetype B32;
+    CARD32	baudrate B32;
+    CARD32	samplerate B32;
+    CARD32	resolution B32;
+    CARD32	buttons B32;
+    BOOL	emulate3buttons;
+    BOOL	chordmiddle;
+    CARD16	devnamelen B16;
+    CARD32	emulate3timeout B32;
+    CARD32	flags B32;
+} xXF86MiscSetMouseSettingsReq;
+#define sz_xXF86MiscSetMouseSettingsReq	36
+
+typedef struct _XF86MiscSetKbdSettings {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscSetKbdSettings */
+    CARD16	length B16;
+    CARD32	kbdtype B32;
+    CARD32	rate B32;
+    CARD32	delay B32;
+    BOOL	servnumlock;
+    BOOL	pad1;
+    CARD16	pad2 B16;
+} xXF86MiscSetKbdSettingsReq;
+#define sz_xXF86MiscSetKbdSettingsReq	20
+
+typedef struct _XF86MiscSetGrabKeysState {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscSetKbdSettings */
+    CARD16	length B16;
+    BOOL	enable;
+    BOOL	pad1;
+    CARD16	pad2 B16;
+} xXF86MiscSetGrabKeysStateReq;
+#define sz_xXF86MiscSetGrabKeysStateReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	status B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86MiscSetGrabKeysStateReply;
+#define sz_xXF86MiscSetGrabKeysStateReply	32
+
+typedef struct _XF86MiscSetClientVersion {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;
+    CARD16	length B16;
+    CARD16	major B16;
+    CARD16	minor B16;
+} xXF86MiscSetClientVersionReq;
+#define sz_xXF86MiscSetClientVersionReq	8
+
+typedef struct _XF86MiscGetFilePaths {
+    CARD8	reqType;		/* always XF86MiscReqCode */
+    CARD8	xf86miscReqType;	/* always X_XF86MiscGetFilePaths */
+    CARD16	length B16;
+} xXF86MiscGetFilePathsReq;
+#define sz_xXF86MiscGetFilePathsReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	configlen B16;
+    CARD16	modulelen B16;
+    CARD16	loglen B16;
+    CARD16	pad2 B16;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} 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_ */