Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

34 files changed, 4838 insertions, 4838 deletions

diff --git a/X11/extensions/EVI.h b/X11/extensions/EVI.h
index dbab85a09..7f3f733e6 100644
--- a/X11/extensions/EVI.h
+++ b/X11/extensions/EVI.h
@@ -1,36 +1,36 @@
-/************************************************************

-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Silicon Graphics not be

-used in advertising or publicity pertaining to distribution

-of the software without specific prior written permission.

-Silicon Graphics makes no representation about the suitability

-of this software for any purpose. It is provided "as is"

-without any express or implied warranty.

-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL

-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

-THE USE OR PERFORMANCE OF THIS SOFTWARE.

-********************************************************/

-

-#ifndef _EVI_H_

-#define _EVI_H_

-

-#define XEVI_TRANSPARENCY_NONE		0

-#define XEVI_TRANSPARENCY_PIXEL		1

-#define XEVI_TRANSPARENCY_MASK		2

-

-#define EVINAME "Extended-Visual-Information"

-

-#define XEVI_MAJOR_VERSION	1	/* current version numbers */

-#define XEVI_MINOR_VERSION	0

-

-#endif

+/************************************************************
+Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+********************************************************/
+
+#ifndef _EVI_H_
+#define _EVI_H_
+
+#define XEVI_TRANSPARENCY_NONE		0
+#define XEVI_TRANSPARENCY_PIXEL		1
+#define XEVI_TRANSPARENCY_MASK		2
+
+#define EVINAME "Extended-Visual-Information"
+
+#define XEVI_MAJOR_VERSION	1	/* current version numbers */
+#define XEVI_MINOR_VERSION	0
+
+#endif
diff --git a/X11/extensions/EVIproto.h b/X11/extensions/EVIproto.h
index a539e6d64..afa282a53 100644
--- a/X11/extensions/EVIproto.h
+++ b/X11/extensions/EVIproto.h
@@ -1,96 +1,96 @@
-/************************************************************

-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Silicon Graphics not be

-used in advertising or publicity pertaining to distribution

-of the software without specific prior written permission.

-Silicon Graphics makes no representation about the suitability

-of this software for any purpose. It is provided "as is"

-without any express or implied warranty.

-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL

-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

-THE USE OR PERFORMANCE OF THIS SOFTWARE.

-********************************************************/

-

-#ifndef _EVIPROTO_H_

-#define _EVIPROTO_H_

-

-#include <X11/extensions/EVI.h>

-

-#define X_EVIQueryVersion		0

-#define X_EVIGetVisualInfo		1

-

-#define VisualID CARD32

-

-typedef CARD32 VisualID32;

-#define sz_VisualID32 4

-

-typedef struct _xExtendedVisualInfo {

-    VisualID	core_visual_id B32;

-    INT8	screen;

-    INT8	level;

-    CARD8	transparency_type;

-    CARD8	pad0;

-    CARD32	transparency_value B32;

-    CARD8	min_hw_colormaps;

-    CARD8	max_hw_colormaps;

-    CARD16	num_colormap_conflicts B16;

-} xExtendedVisualInfo;

-#define sz_xExtendedVisualInfo 16

-

-typedef struct _XEVIQueryVersion {

-    CARD8	reqType;		/* always XEVIReqCode */

-    CARD8	xeviReqType;		/* always X_EVIQueryVersion */

-    CARD16	length B16;

-} xEVIQueryVersionReq;

-#define sz_xEVIQueryVersionReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8 	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	majorVersion B16;	/* major version of EVI protocol */

-    CARD16	minorVersion B16;	/* minor version of EVI protocol */

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xEVIQueryVersionReply;

-#define sz_xEVIQueryVersionReply	32

-

-typedef struct _XEVIGetVisualInfoReq {

-    CARD8	reqType;	/* always XEVIReqCode */

-    CARD8	xeviReqType;	/* always X_EVIGetVisualInfo */

-    CARD16      length B16;

-    CARD32 	n_visual B32;

-} xEVIGetVisualInfoReq;

-#define sz_xEVIGetVisualInfoReq	8

-

-typedef struct _XEVIGetVisualInfoReply {

-    BYTE	type;  /* X_Reply */

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	n_info B32;

-    CARD32	n_conflicts B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-} xEVIGetVisualInfoReply;

-#define sz_xEVIGetVisualInfoReply	32

-

-#undef VisualID

-

-#endif /* _EVIPROTO_H_ */

+/************************************************************
+Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+********************************************************/
+
+#ifndef _EVIPROTO_H_
+#define _EVIPROTO_H_
+
+#include <X11/extensions/EVI.h>
+
+#define X_EVIQueryVersion		0
+#define X_EVIGetVisualInfo		1
+
+#define VisualID CARD32
+
+typedef CARD32 VisualID32;
+#define sz_VisualID32 4
+
+typedef struct _xExtendedVisualInfo {
+    VisualID	core_visual_id B32;
+    INT8	screen;
+    INT8	level;
+    CARD8	transparency_type;
+    CARD8	pad0;
+    CARD32	transparency_value B32;
+    CARD8	min_hw_colormaps;
+    CARD8	max_hw_colormaps;
+    CARD16	num_colormap_conflicts B16;
+} xExtendedVisualInfo;
+#define sz_xExtendedVisualInfo 16
+
+typedef struct _XEVIQueryVersion {
+    CARD8	reqType;		/* always XEVIReqCode */
+    CARD8	xeviReqType;		/* always X_EVIQueryVersion */
+    CARD16	length B16;
+} xEVIQueryVersionReq;
+#define sz_xEVIQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8 	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of EVI protocol */
+    CARD16	minorVersion B16;	/* minor version of EVI protocol */
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xEVIQueryVersionReply;
+#define sz_xEVIQueryVersionReply	32
+
+typedef struct _XEVIGetVisualInfoReq {
+    CARD8	reqType;	/* always XEVIReqCode */
+    CARD8	xeviReqType;	/* always X_EVIGetVisualInfo */
+    CARD16      length B16;
+    CARD32 	n_visual B32;
+} xEVIGetVisualInfoReq;
+#define sz_xEVIGetVisualInfoReq	8
+
+typedef struct _XEVIGetVisualInfoReply {
+    BYTE	type;  /* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	n_info B32;
+    CARD32	n_conflicts B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xEVIGetVisualInfoReply;
+#define sz_xEVIGetVisualInfoReply	32
+
+#undef VisualID
+
+#endif /* _EVIPROTO_H_ */
diff --git a/X11/extensions/ag.h b/X11/extensions/ag.h
index abfa3cb50..be5883a3e 100644
--- a/X11/extensions/ag.h
+++ b/X11/extensions/ag.h
@@ -1,52 +1,52 @@
-/*

-Copyright 1996, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-*/

-

-#ifndef _AG_H_

-#define _AG_H_

-

-#define XAGNAME "XC-APPGROUP"

-

-#define XAG_MAJOR_VERSION	1	/* current version numbers */

-#define XAG_MINOR_VERSION	0

-

-#define XagWindowTypeX11	0

-#define XagWindowTypeMacintosh	1

-#define XagWindowTypeWin32	2

-#define XagWindowTypeWin16	3

-

-#define XagBadAppGroup			0

-#define XagNumberErrors			(XagBadAppGroup + 1)

-

-#define XagNsingleScreen		7

-#define XagNdefaultRoot			1

-#define XagNrootVisual			2

-#define XagNdefaultColormap		3

-#define XagNblackPixel			4

-#define XagNwhitePixel			5

-#define XagNappGroupLeader		6

-

-#endif /* _AG_H_ */

-

+/*
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+*/
+
+#ifndef _AG_H_
+#define _AG_H_
+
+#define XAGNAME "XC-APPGROUP"
+
+#define XAG_MAJOR_VERSION	1	/* current version numbers */
+#define XAG_MINOR_VERSION	0
+
+#define XagWindowTypeX11	0
+#define XagWindowTypeMacintosh	1
+#define XagWindowTypeWin32	2
+#define XagWindowTypeWin16	3
+
+#define XagBadAppGroup			0
+#define XagNumberErrors			(XagBadAppGroup + 1)
+
+#define XagNsingleScreen		7
+#define XagNdefaultRoot			1
+#define XagNrootVisual			2
+#define XagNdefaultColormap		3
+#define XagNblackPixel			4
+#define XagNwhitePixel			5
+#define XagNappGroupLeader		6
+
+#endif /* _AG_H_ */
+
diff --git a/X11/extensions/agproto.h b/X11/extensions/agproto.h
index c40aee643..108666126 100644
--- a/X11/extensions/agproto.h
+++ b/X11/extensions/agproto.h
@@ -1,178 +1,178 @@
-/*

-Copyright 1996, 1998, 2001  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-*/

-

-#ifndef _AGPROTO_H_ /* { */

-#define _AGPROTO_H_

-

-#include <X11/extensions/ag.h>

-

-#define X_XagQueryVersion		0

-#define X_XagCreate			1

-#define X_XagDestroy			2

-#define X_XagGetAttr			3

-#define X_XagQuery			4

-#define X_XagCreateAssoc		5

-#define X_XagDestroyAssoc		6

-

-#define XAppGroup CARD32

-

-/*

-* Redefine some basic types used by structures defined herein.  This allows

-* both the library and server to view communicated data as 32-bit entities,

-* thus preventing problems on 64-bit architectures where libXext sees this

-* data as 64 bits and the server sees it as 32 bits.

-*/

-

-#define Colormap CARD32

-#define VisualID CARD32

-#define Window CARD32

-

-typedef struct _XagQueryVersion {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagQueryVersion */

-    CARD16	length B16;

-    CARD16	client_major_version B16;

-    CARD16	client_minor_version B16;

-} xXagQueryVersionReq;

-#define sz_xXagQueryVersionReq		8

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    BOOL	pad1;

-    CARD16	sequence_number B16;

-    CARD32	length B32;

-    CARD16	server_major_version B16;

-    CARD16	server_minor_version B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xXagQueryVersionReply;

-#define sz_xXagQueryVersionReply	32

-

-/* Set AppGroup Attributes masks */

-#define XagSingleScreenMask		1 << 0

-#define XagDefaultRootMask		1 << XagNdefaultRoot

-#define XagRootVisualMask		1 << XagNrootVisual

-#define XagDefaultColormapMask		1 << XagNdefaultColormap

-#define XagBlackPixelMask		1 << XagNblackPixel

-#define XagWhitePixelMask		1 << XagNwhitePixel

-#define XagAppGroupLeaderMask		1 << XagNappGroupLeader

-

-typedef struct _XagCreate {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagCreate */

-    CARD16	length B16;

-    XAppGroup	app_group B32;

-    CARD32	attrib_mask B32; /* LISTofVALUE follows */

-} xXagCreateReq;

-#define sz_xXagCreateReq		12

-

-typedef struct _XagDestroy {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagDestroy */

-    CARD16	length B16;

-    XAppGroup	app_group  B32;

-} xXagDestroyReq;

-#define sz_xXagDestroyReq		8

-

-typedef struct _XagGetAttr {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagGetAttr */

-    CARD16	length B16;

-    XAppGroup	app_group B32;

-} xXagGetAttrReq;

-#define sz_xXagGetAttrReq		8

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    BOOL	pad1;

-    CARD16	sequence_number B16;

-    CARD32	length B32;

-    Window	default_root B32;

-    VisualID	root_visual B32;

-    Colormap	default_colormap B32;

-    CARD32	black_pixel B32;

-    CARD32	white_pixel B32;

-    BOOL	single_screen;

-    BOOL	app_group_leader;

-    CARD16	pad2 B16;

-} xXagGetAttrReply;

-#define sz_xXagGetAttrReply		32

-

-typedef struct _XagQuery {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagQuery */

-    CARD16	length B16;

-    CARD32	resource B32;

-} xXagQueryReq;

-#define sz_xXagQueryReq			8

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    BOOL	pad1;

-    CARD16	sequence_number B16;

-    CARD32	length B32;

-    XAppGroup	app_group B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xXagQueryReply;

-#define sz_xXagQueryReply		32

-

-typedef struct _XagCreateAssoc {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagCreateAssoc */

-    CARD16	length B16;

-    Window	window B32;

-    CARD16	window_type B16;

-    CARD16	system_window_len B16; /* LISTofCARD8 follows */

-} xXagCreateAssocReq;

-#define sz_xXagCreateAssocReq		12

-

-typedef struct _XagDestroyAssoc {

-    CARD8	reqType;	/* always XagReqCode */

-    CARD8	xagReqType;	/* always X_XagDestroyAssoc */

-    CARD16	length B16;

-    Window	window B32;

-} xXagDestroyAssocReq;

-#define sz_xXagDestroyAssocReq		8

-

-#undef XAppGroup

-/*

- * Cancel the previous redefinition of the basic types, thus restoring their

- * X.h definitions.

- */

-

-#undef Window

-#undef Colormap

-#undef VisualID

-

-#endif /* } _AGPROTO_H_ */

-

+/*
+Copyright 1996, 1998, 2001  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+*/
+
+#ifndef _AGPROTO_H_ /* { */
+#define _AGPROTO_H_
+
+#include <X11/extensions/ag.h>
+
+#define X_XagQueryVersion		0
+#define X_XagCreate			1
+#define X_XagDestroy			2
+#define X_XagGetAttr			3
+#define X_XagQuery			4
+#define X_XagCreateAssoc		5
+#define X_XagDestroyAssoc		6
+
+#define XAppGroup CARD32
+
+/*
+* Redefine some basic types used by structures defined herein.  This allows
+* both the library and server to view communicated data as 32-bit entities,
+* thus preventing problems on 64-bit architectures where libXext sees this
+* data as 64 bits and the server sees it as 32 bits.
+*/
+
+#define Colormap CARD32
+#define VisualID CARD32
+#define Window CARD32
+
+typedef struct _XagQueryVersion {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagQueryVersion */
+    CARD16	length B16;
+    CARD16	client_major_version B16;
+    CARD16	client_minor_version B16;
+} xXagQueryVersionReq;
+#define sz_xXagQueryVersionReq		8
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequence_number B16;
+    CARD32	length B32;
+    CARD16	server_major_version B16;
+    CARD16	server_minor_version B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXagQueryVersionReply;
+#define sz_xXagQueryVersionReply	32
+
+/* Set AppGroup Attributes masks */
+#define XagSingleScreenMask		1 << 0
+#define XagDefaultRootMask		1 << XagNdefaultRoot
+#define XagRootVisualMask		1 << XagNrootVisual
+#define XagDefaultColormapMask		1 << XagNdefaultColormap
+#define XagBlackPixelMask		1 << XagNblackPixel
+#define XagWhitePixelMask		1 << XagNwhitePixel
+#define XagAppGroupLeaderMask		1 << XagNappGroupLeader
+
+typedef struct _XagCreate {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagCreate */
+    CARD16	length B16;
+    XAppGroup	app_group B32;
+    CARD32	attrib_mask B32; /* LISTofVALUE follows */
+} xXagCreateReq;
+#define sz_xXagCreateReq		12
+
+typedef struct _XagDestroy {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagDestroy */
+    CARD16	length B16;
+    XAppGroup	app_group  B32;
+} xXagDestroyReq;
+#define sz_xXagDestroyReq		8
+
+typedef struct _XagGetAttr {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagGetAttr */
+    CARD16	length B16;
+    XAppGroup	app_group B32;
+} xXagGetAttrReq;
+#define sz_xXagGetAttrReq		8
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequence_number B16;
+    CARD32	length B32;
+    Window	default_root B32;
+    VisualID	root_visual B32;
+    Colormap	default_colormap B32;
+    CARD32	black_pixel B32;
+    CARD32	white_pixel B32;
+    BOOL	single_screen;
+    BOOL	app_group_leader;
+    CARD16	pad2 B16;
+} xXagGetAttrReply;
+#define sz_xXagGetAttrReply		32
+
+typedef struct _XagQuery {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagQuery */
+    CARD16	length B16;
+    CARD32	resource B32;
+} xXagQueryReq;
+#define sz_xXagQueryReq			8
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequence_number B16;
+    CARD32	length B32;
+    XAppGroup	app_group B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXagQueryReply;
+#define sz_xXagQueryReply		32
+
+typedef struct _XagCreateAssoc {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagCreateAssoc */
+    CARD16	length B16;
+    Window	window B32;
+    CARD16	window_type B16;
+    CARD16	system_window_len B16; /* LISTofCARD8 follows */
+} xXagCreateAssocReq;
+#define sz_xXagCreateAssocReq		12
+
+typedef struct _XagDestroyAssoc {
+    CARD8	reqType;	/* always XagReqCode */
+    CARD8	xagReqType;	/* always X_XagDestroyAssoc */
+    CARD16	length B16;
+    Window	window B32;
+} xXagDestroyAssocReq;
+#define sz_xXagDestroyAssocReq		8
+
+#undef XAppGroup
+/*
+ * Cancel the previous redefinition of the basic types, thus restoring their
+ * X.h definitions.
+ */
+
+#undef Window
+#undef Colormap
+#undef VisualID
+
+#endif /* } _AGPROTO_H_ */
+
diff --git a/X11/extensions/cup.h b/X11/extensions/cup.h
index c5def262d..cbbc34bf8 100644
--- a/X11/extensions/cup.h
+++ b/X11/extensions/cup.h
@@ -1,38 +1,38 @@
-/*

-

-Copyright 1987, 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-#ifndef _CUP_H_

-#define _CUP_H_

-

-#define XCUPNAME "TOG-CUP"

-

-#define XCUP_MAJOR_VERSION	1	/* current version numbers */

-#define XCUP_MINOR_VERSION	0

-

-#define XcupNumberErrors			0

-

-#endif /* _CUP_H_ */

-

+/*
+
+Copyright 1987, 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifndef _CUP_H_
+#define _CUP_H_
+
+#define XCUPNAME "TOG-CUP"
+
+#define XCUP_MAJOR_VERSION	1	/* current version numbers */
+#define XCUP_MINOR_VERSION	0
+
+#define XcupNumberErrors			0
+
+#endif /* _CUP_H_ */
+
diff --git a/X11/extensions/cupproto.h b/X11/extensions/cupproto.h
index 3fb854dd1..f61c9f0a7 100644
--- a/X11/extensions/cupproto.h
+++ b/X11/extensions/cupproto.h
@@ -1,105 +1,105 @@
-/*

-

-Copyright 1987, 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-#ifndef _XCUPPROTO_H_ /* { */

-#define _XCUPPROTO_H_

-

-#include <X11/extensions/cup.h>

-

-#define X_XcupQueryVersion			0

-#define X_XcupGetReservedColormapEntries	1

-#define X_XcupStoreColors			2

-

-typedef struct _XcupQueryVersion {

-    CARD8	reqType;	/* always XcupReqCode */

-    CARD8	xcupReqType;	/* always X_XcupQueryVersion */

-    CARD16	length B16;

-    CARD16	client_major_version B16;

-    CARD16	client_minor_version B16;

-} xXcupQueryVersionReq;

-#define sz_xXcupQueryVersionReq		8

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    BOOL	pad1;

-    CARD16	sequence_number B16;

-    CARD32	length B32;

-    CARD16	server_major_version B16;

-    CARD16	server_minor_version B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xXcupQueryVersionReply;

-#define sz_xXcupQueryVersionReply	32

-

-typedef struct _XcupGetReservedColormapEntries {

-    CARD8	reqType;	/* always XcupReqCode */

-    CARD8	xcupReqType;	/* always X_XcupGetReservedColormapEntries */

-    CARD16	length B16;

-    CARD32	screen B32;

-} xXcupGetReservedColormapEntriesReq;

-#define sz_xXcupGetReservedColormapEntriesReq 8

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    BOOL	pad1;

-    CARD16	sequence_number B16;

-    CARD32	length B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-    CARD32	pad7 B32;

-} xXcupGetReservedColormapEntriesReply;

-#define sz_xXcupGetReservedColormapEntriesReply		32

-

-typedef struct _XcupStoreColors {

-    CARD8	reqType;	/* always XcupReqCode */

-    CARD8	xcupReqType;	/* always X_XcupStoreColors */

-    CARD16	length B16;

-    CARD32	cmap B32;

-} xXcupStoreColorsReq;

-#define sz_xXcupStoreColorsReq		8

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    BOOL	pad1;

-    CARD16	sequence_number B16;

-    CARD32	length B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-    CARD32	pad7 B32;

-} xXcupStoreColorsReply;

-#define sz_xXcupStoreColorsReply	32

-

-#endif /* } _XCUPPROTO_H_ */

-

+/*
+
+Copyright 1987, 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifndef _XCUPPROTO_H_ /* { */
+#define _XCUPPROTO_H_
+
+#include <X11/extensions/cup.h>
+
+#define X_XcupQueryVersion			0
+#define X_XcupGetReservedColormapEntries	1
+#define X_XcupStoreColors			2
+
+typedef struct _XcupQueryVersion {
+    CARD8	reqType;	/* always XcupReqCode */
+    CARD8	xcupReqType;	/* always X_XcupQueryVersion */
+    CARD16	length B16;
+    CARD16	client_major_version B16;
+    CARD16	client_minor_version B16;
+} xXcupQueryVersionReq;
+#define sz_xXcupQueryVersionReq		8
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequence_number B16;
+    CARD32	length B32;
+    CARD16	server_major_version B16;
+    CARD16	server_minor_version B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXcupQueryVersionReply;
+#define sz_xXcupQueryVersionReply	32
+
+typedef struct _XcupGetReservedColormapEntries {
+    CARD8	reqType;	/* always XcupReqCode */
+    CARD8	xcupReqType;	/* always X_XcupGetReservedColormapEntries */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXcupGetReservedColormapEntriesReq;
+#define sz_xXcupGetReservedColormapEntriesReq 8
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequence_number B16;
+    CARD32	length B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xXcupGetReservedColormapEntriesReply;
+#define sz_xXcupGetReservedColormapEntriesReply		32
+
+typedef struct _XcupStoreColors {
+    CARD8	reqType;	/* always XcupReqCode */
+    CARD8	xcupReqType;	/* always X_XcupStoreColors */
+    CARD16	length B16;
+    CARD32	cmap B32;
+} xXcupStoreColorsReq;
+#define sz_xXcupStoreColorsReq		8
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequence_number B16;
+    CARD32	length B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xXcupStoreColorsReply;
+#define sz_xXcupStoreColorsReply	32
+
+#endif /* } _XCUPPROTO_H_ */
+
diff --git a/X11/extensions/dbe.h b/X11/extensions/dbe.h
index bc175223d..7968552d3 100644
--- a/X11/extensions/dbe.h
+++ b/X11/extensions/dbe.h
@@ -1,57 +1,57 @@
-/******************************************************************************

- *

- * Copyright (c) 1994, 1995  Hewlett-Packard Company

- *

- * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard

- * Company 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 Hewlett-Packard Company.

- *

- *     Header file for Xlib-related DBE

- *

- *****************************************************************************/

-

-#ifndef DBE_H

-#define DBE_H

-

-/* Values for swap_action field of XdbeSwapInfo structure */

-#define XdbeUndefined    0

-#define XdbeBackground   1

-#define XdbeUntouched    2

-#define XdbeCopied       3

-

-/* Errors */

-#define XdbeBadBuffer    0

-

-#define DBE_PROTOCOL_NAME "DOUBLE-BUFFER"

-

-/* Current version numbers */

-#define DBE_MAJOR_VERSION       1

-#define DBE_MINOR_VERSION       0

-

-/* Used when adding extension; also used in Xdbe macros */

-#define DbeNumberEvents			0

-#define DbeBadBuffer			0

-#define DbeNumberErrors			(DbeBadBuffer + 1)

-

-#endif /* DBE_H */

-

+/******************************************************************************
+ *
+ * Copyright (c) 1994, 1995  Hewlett-Packard Company
+ *
+ * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
+ * Company 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 Hewlett-Packard Company.
+ *
+ *     Header file for Xlib-related DBE
+ *
+ *****************************************************************************/
+
+#ifndef DBE_H
+#define DBE_H
+
+/* Values for swap_action field of XdbeSwapInfo structure */
+#define XdbeUndefined    0
+#define XdbeBackground   1
+#define XdbeUntouched    2
+#define XdbeCopied       3
+
+/* Errors */
+#define XdbeBadBuffer    0
+
+#define DBE_PROTOCOL_NAME "DOUBLE-BUFFER"
+
+/* Current version numbers */
+#define DBE_MAJOR_VERSION       1
+#define DBE_MINOR_VERSION       0
+
+/* Used when adding extension; also used in Xdbe macros */
+#define DbeNumberEvents			0
+#define DbeBadBuffer			0
+#define DbeNumberErrors			(DbeBadBuffer + 1)
+
+#endif /* DBE_H */
+
diff --git a/X11/extensions/dbeproto.h b/X11/extensions/dbeproto.h
index 62d30da85..784926e33 100644
--- a/X11/extensions/dbeproto.h
+++ b/X11/extensions/dbeproto.h
@@ -1,224 +1,224 @@
-/******************************************************************************

- *

- * Copyright (c) 1994, 1995  Hewlett-Packard Company

- *

- * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard

- * Company 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 Hewlett-Packard Company.

- *

- *     Header file for Xlib-related DBE

- *

- *****************************************************************************/

-

-#ifndef DBE_PROTO_H

-#define DBE_PROTO_H

-

-#include <X11/extensions/dbe.h>

-

-/* Request values used in (S)ProcDbeDispatch() */

-#define X_DbeGetVersion                 0

-#define X_DbeAllocateBackBufferName     1

-#define X_DbeDeallocateBackBufferName   2

-#define X_DbeSwapBuffers                3

-#define X_DbeBeginIdiom                 4

-#define X_DbeEndIdiom                   5

-#define X_DbeGetVisualInfo              6

-#define X_DbeGetBackBufferAttributes    7

-

-typedef CARD8  xDbeSwapAction;

-typedef CARD32 xDbeBackBuffer;

-

-/* TYPEDEFS */

-

-/* Protocol data types */

-

-typedef struct

-{

-    CARD32		window B32;	/* window      */

-    xDbeSwapAction	swapAction;	/* swap action */

-    CARD8		pad1;		/* unused      */

-    CARD16		pad2 B16;

-

-} xDbeSwapInfo;

-

-typedef struct

-{

-    CARD32	visualID B32;	/* associated visual      */

-    CARD8	depth;		/* depth of visual        */

-    CARD8	perfLevel;	/* performance level hint */

-    CARD16	pad1 B16;

-

-} xDbeVisInfo;

-#define sz_xDbeVisInfo	8

-

-typedef struct

-{

-    CARD32	n B32;	/* number of visual info items in list  */

-

-} xDbeScreenVisInfo;	/* followed by n xDbeVisInfo items */

-

-typedef struct

-{

-    CARD32	window B32;	/* window */

-

-} xDbeBufferAttributes;

-

-

-/* Requests and replies */

-

-typedef struct

-{

-    CARD8	reqType;	/* major-opcode: always codes->major_opcode */

-    CARD8	dbeReqType;	/* minor-opcode: always X_DbeGetVersion (0) */

-    CARD16	length B16;	/* request length: (2)                      */

-    CARD8	majorVersion;	/* client-major-version                     */

-    CARD8	minorVersion;	/* client-minor-version                     */

-    CARD16	unused B16;	/* unused                                   */

-

-} xDbeGetVersionReq;

-#define sz_xDbeGetVersionReq	8

-

-typedef struct

-{

-    BYTE	type;			/* Reply: X_Reply (1)   */

-    CARD8	unused;			/* unused               */

-    CARD16	sequenceNumber B16;	/* sequence number      */

-    CARD32	length B32;		/* reply length: (0)    */

-    CARD8	majorVersion;		/* server-major-version */

-    CARD8	minorVersion;		/* server-minor-version */

-    CARD16	pad1 B16;		/* unused               */

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-

-} xDbeGetVersionReply;

-#define sz_xDbeGetVersionReply	32

-

-typedef struct

-{

-    CARD8		reqType;	/* major-opcode: codes->major_opcode */

-    CARD8		dbeReqType;	/* X_DbeAllocateBackBufferName (1)   */

-    CARD16		length B16;	/* request length: (4)               */

-    CARD32		window B32;	/* window                            */

-    xDbeBackBuffer	buffer B32;	/* back buffer name                  */

-    xDbeSwapAction	swapAction;	/* swap action hint                  */

-    CARD8		pad1;		/* unused                            */

-    CARD16		pad2 B16;

-

-} xDbeAllocateBackBufferNameReq;

-#define sz_xDbeAllocateBackBufferNameReq	16

-

-typedef struct

-{

-    CARD8		reqType;	/* major-opcode: codes->major_opcode */

-    CARD8		dbeReqType;	/* X_DbeDeallocateBackBufferName (2) */

-    CARD16		length B16;	/* request length: (2)               */

-    xDbeBackBuffer	buffer B32;	/* back buffer name                  */

-

-} xDbeDeallocateBackBufferNameReq;

-#define sz_xDbeDeallocateBackBufferNameReq	8

-

-typedef struct

-{

-    CARD8	reqType;	/* major-opcode: always codes->major_opcode  */

-    CARD8	dbeReqType;	/* minor-opcode: always X_DbeSwapBuffers (3) */

-    CARD16	length B16;	/* request length: (2+2n)                    */

-    CARD32	n B32;		/* n, number of window/swap action pairs     */

-

-} xDbeSwapBuffersReq;		/* followed by n window/swap action pairs    */

-#define sz_xDbeSwapBuffersReq	8

-

-typedef struct

-{

-    CARD8	reqType;	/* major-opcode: always codes->major_opcode */

-    CARD8	dbeReqType;	/* minor-opcode: always X_DbeBeginIdom (4)  */

-    CARD16	length B16;	/* request length: (1)                      */

-

-} xDbeBeginIdiomReq;

-#define sz_xDbeBeginIdiomReq	4

-

-typedef struct

-{

-    CARD8	reqType;	/* major-opcode: always codes->major_opcode */

-    CARD8	dbeReqType;	/* minor-opcode: always X_DbeEndIdom (5)    */

-    CARD16	length B16;	/* request length: (1)                      */

-

-} xDbeEndIdiomReq;

-#define sz_xDbeEndIdiomReq	4

-

-typedef struct

-{

-    CARD8	reqType;	/* always codes->major_opcode     */

-    CARD8	dbeReqType;	/* always X_DbeGetVisualInfo (6)  */

-    CARD16	length B16;	/* request length: (2+n)          */

-    CARD32	n B32;		/* n, number of drawables in list */

-

-} xDbeGetVisualInfoReq;		/* followed by n drawables        */

-#define sz_xDbeGetVisualInfoReq	8

-

-typedef struct

-{

-    BYTE	type;			/* Reply: X_Reply (1)                */

-    CARD8	unused;			/* unused                            */

-    CARD16	sequenceNumber B16;	/* sequence number                   */

-    CARD32	length B32;		/* reply length                      */

-    CARD32	m;			/* m, number of visual infos in list */

-    CARD32	pad1 B32;		/* unused                            */

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-

-} xDbeGetVisualInfoReply;		/* followed by m visual infos        */

-#define sz_xDbeGetVisualInfoReply	32

-

-typedef struct

-{

-    CARD8		reqType;	/* always codes->major_opcode       */

-    CARD8		dbeReqType;	/* X_DbeGetBackBufferAttributes (7) */

-    CARD16		length B16;	/* request length: (2)              */

-    xDbeBackBuffer	buffer B32;	/* back buffer name                 */

-

-} xDbeGetBackBufferAttributesReq;

-#define sz_xDbeGetBackBufferAttributesReq	8

-

-typedef struct

-{

-    BYTE	type;			/* Reply: X_Reply (1) */

-    CARD8	unused;			/* unused             */

-    CARD16	sequenceNumber B16;	/* sequence number    */

-    CARD32	length B32;		/* reply length: (0)  */

-    CARD32	attributes;		/* attributes         */

-    CARD32	pad1 B32;		/* unused             */

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-

-} xDbeGetBackBufferAttributesReply;

-#define sz_xDbeGetBackBufferAttributesReply	32

-

-#endif /* DBE_PROTO_H */

-

+/******************************************************************************
+ *
+ * Copyright (c) 1994, 1995  Hewlett-Packard Company
+ *
+ * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
+ * Company 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 Hewlett-Packard Company.
+ *
+ *     Header file for Xlib-related DBE
+ *
+ *****************************************************************************/
+
+#ifndef DBE_PROTO_H
+#define DBE_PROTO_H
+
+#include <X11/extensions/dbe.h>
+
+/* Request values used in (S)ProcDbeDispatch() */
+#define X_DbeGetVersion                 0
+#define X_DbeAllocateBackBufferName     1
+#define X_DbeDeallocateBackBufferName   2
+#define X_DbeSwapBuffers                3
+#define X_DbeBeginIdiom                 4
+#define X_DbeEndIdiom                   5
+#define X_DbeGetVisualInfo              6
+#define X_DbeGetBackBufferAttributes    7
+
+typedef CARD8  xDbeSwapAction;
+typedef CARD32 xDbeBackBuffer;
+
+/* TYPEDEFS */
+
+/* Protocol data types */
+
+typedef struct
+{
+    CARD32		window B32;	/* window      */
+    xDbeSwapAction	swapAction;	/* swap action */
+    CARD8		pad1;		/* unused      */
+    CARD16		pad2 B16;
+
+} xDbeSwapInfo;
+
+typedef struct
+{
+    CARD32	visualID B32;	/* associated visual      */
+    CARD8	depth;		/* depth of visual        */
+    CARD8	perfLevel;	/* performance level hint */
+    CARD16	pad1 B16;
+
+} xDbeVisInfo;
+#define sz_xDbeVisInfo	8
+
+typedef struct
+{
+    CARD32	n B32;	/* number of visual info items in list  */
+
+} xDbeScreenVisInfo;	/* followed by n xDbeVisInfo items */
+
+typedef struct
+{
+    CARD32	window B32;	/* window */
+
+} xDbeBufferAttributes;
+
+
+/* Requests and replies */
+
+typedef struct
+{
+    CARD8	reqType;	/* major-opcode: always codes->major_opcode */
+    CARD8	dbeReqType;	/* minor-opcode: always X_DbeGetVersion (0) */
+    CARD16	length B16;	/* request length: (2)                      */
+    CARD8	majorVersion;	/* client-major-version                     */
+    CARD8	minorVersion;	/* client-minor-version                     */
+    CARD16	unused B16;	/* unused                                   */
+
+} xDbeGetVersionReq;
+#define sz_xDbeGetVersionReq	8
+
+typedef struct
+{
+    BYTE	type;			/* Reply: X_Reply (1)   */
+    CARD8	unused;			/* unused               */
+    CARD16	sequenceNumber B16;	/* sequence number      */
+    CARD32	length B32;		/* reply length: (0)    */
+    CARD8	majorVersion;		/* server-major-version */
+    CARD8	minorVersion;		/* server-minor-version */
+    CARD16	pad1 B16;		/* unused               */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+
+} xDbeGetVersionReply;
+#define sz_xDbeGetVersionReply	32
+
+typedef struct
+{
+    CARD8		reqType;	/* major-opcode: codes->major_opcode */
+    CARD8		dbeReqType;	/* X_DbeAllocateBackBufferName (1)   */
+    CARD16		length B16;	/* request length: (4)               */
+    CARD32		window B32;	/* window                            */
+    xDbeBackBuffer	buffer B32;	/* back buffer name                  */
+    xDbeSwapAction	swapAction;	/* swap action hint                  */
+    CARD8		pad1;		/* unused                            */
+    CARD16		pad2 B16;
+
+} xDbeAllocateBackBufferNameReq;
+#define sz_xDbeAllocateBackBufferNameReq	16
+
+typedef struct
+{
+    CARD8		reqType;	/* major-opcode: codes->major_opcode */
+    CARD8		dbeReqType;	/* X_DbeDeallocateBackBufferName (2) */
+    CARD16		length B16;	/* request length: (2)               */
+    xDbeBackBuffer	buffer B32;	/* back buffer name                  */
+
+} xDbeDeallocateBackBufferNameReq;
+#define sz_xDbeDeallocateBackBufferNameReq	8
+
+typedef struct
+{
+    CARD8	reqType;	/* major-opcode: always codes->major_opcode  */
+    CARD8	dbeReqType;	/* minor-opcode: always X_DbeSwapBuffers (3) */
+    CARD16	length B16;	/* request length: (2+2n)                    */
+    CARD32	n B32;		/* n, number of window/swap action pairs     */
+
+} xDbeSwapBuffersReq;		/* followed by n window/swap action pairs    */
+#define sz_xDbeSwapBuffersReq	8
+
+typedef struct
+{
+    CARD8	reqType;	/* major-opcode: always codes->major_opcode */
+    CARD8	dbeReqType;	/* minor-opcode: always X_DbeBeginIdom (4)  */
+    CARD16	length B16;	/* request length: (1)                      */
+
+} xDbeBeginIdiomReq;
+#define sz_xDbeBeginIdiomReq	4
+
+typedef struct
+{
+    CARD8	reqType;	/* major-opcode: always codes->major_opcode */
+    CARD8	dbeReqType;	/* minor-opcode: always X_DbeEndIdom (5)    */
+    CARD16	length B16;	/* request length: (1)                      */
+
+} xDbeEndIdiomReq;
+#define sz_xDbeEndIdiomReq	4
+
+typedef struct
+{
+    CARD8	reqType;	/* always codes->major_opcode     */
+    CARD8	dbeReqType;	/* always X_DbeGetVisualInfo (6)  */
+    CARD16	length B16;	/* request length: (2+n)          */
+    CARD32	n B32;		/* n, number of drawables in list */
+
+} xDbeGetVisualInfoReq;		/* followed by n drawables        */
+#define sz_xDbeGetVisualInfoReq	8
+
+typedef struct
+{
+    BYTE	type;			/* Reply: X_Reply (1)                */
+    CARD8	unused;			/* unused                            */
+    CARD16	sequenceNumber B16;	/* sequence number                   */
+    CARD32	length B32;		/* reply length                      */
+    CARD32	m;			/* m, number of visual infos in list */
+    CARD32	pad1 B32;		/* unused                            */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+
+} xDbeGetVisualInfoReply;		/* followed by m visual infos        */
+#define sz_xDbeGetVisualInfoReply	32
+
+typedef struct
+{
+    CARD8		reqType;	/* always codes->major_opcode       */
+    CARD8		dbeReqType;	/* X_DbeGetBackBufferAttributes (7) */
+    CARD16		length B16;	/* request length: (2)              */
+    xDbeBackBuffer	buffer B32;	/* back buffer name                 */
+
+} xDbeGetBackBufferAttributesReq;
+#define sz_xDbeGetBackBufferAttributesReq	8
+
+typedef struct
+{
+    BYTE	type;			/* Reply: X_Reply (1) */
+    CARD8	unused;			/* unused             */
+    CARD16	sequenceNumber B16;	/* sequence number    */
+    CARD32	length B32;		/* reply length: (0)  */
+    CARD32	attributes;		/* attributes         */
+    CARD32	pad1 B32;		/* unused             */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+
+} xDbeGetBackBufferAttributesReply;
+#define sz_xDbeGetBackBufferAttributesReply	32
+
+#endif /* DBE_PROTO_H */
+
diff --git a/X11/extensions/dpmsconst.h b/X11/extensions/dpmsconst.h
index dfa5befcc..75f058677 100644
--- a/X11/extensions/dpmsconst.h
+++ b/X11/extensions/dpmsconst.h
@@ -1,43 +1,43 @@
-/*****************************************************************

-

-Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.

-

-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.

-

-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

-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation

-shall not be used in advertising or otherwise to promote the sale, use or other

-dealings in this Software without prior written authorization from Digital

-Equipment Corporation.

-

-******************************************************************/

-

-#ifndef _DPMSCONST_H

-#define _DPMSCONST_H 1

-

-#define DPMSMajorVersion	1

-#define DPMSMinorVersion	1

-

-#define DPMSExtensionName	"DPMS"

-

-#define DPMSModeOn	0

-#define DPMSModeStandby	1

-#define DPMSModeSuspend	2

-#define DPMSModeOff	3

-

-#endif /* !_DPMSCONST_H */

-

+/*****************************************************************
+
+Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+#ifndef _DPMSCONST_H
+#define _DPMSCONST_H 1
+
+#define DPMSMajorVersion	1
+#define DPMSMinorVersion	1
+
+#define DPMSExtensionName	"DPMS"
+
+#define DPMSModeOn	0
+#define DPMSModeStandby	1
+#define DPMSModeSuspend	2
+#define DPMSModeOff	3
+
+#endif /* !_DPMSCONST_H */
+
diff --git a/X11/extensions/dpmsproto.h b/X11/extensions/dpmsproto.h
index e77ae976c..63fd3fc0e 100644
--- a/X11/extensions/dpmsproto.h
+++ b/X11/extensions/dpmsproto.h
@@ -1,175 +1,175 @@
-/*****************************************************************

-

-Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.

-

-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.

-

-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

-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation

-shall not be used in advertising or otherwise to promote the sale, use or other

-dealings in this Software without prior written authorization from Digital

-Equipment Corporation.

-

-******************************************************************/

-

-#ifndef _DPMSPROTO_H_

-#define _DPMSPROTO_H_

-

-#include <X11/extensions/dpmsconst.h>

-

-#define X_DPMSGetVersion	0

-#define X_DPMSCapable		1

-#define X_DPMSGetTimeouts	2

-#define X_DPMSSetTimeouts	3

-#define X_DPMSEnable		4

-#define X_DPMSDisable		5

-#define X_DPMSForceLevel       	6

-#define X_DPMSInfo       	7

-

-#define DPMSNumberEvents	0

-

-#define DPMSNumberErrors	0

-

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSGetVersion */

-    CARD16	length B16;

-    CARD16	majorVersion B16;

-    CARD16	minorVersion B16;

-} xDPMSGetVersionReq;

-#define sz_xDPMSGetVersionReq 8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	majorVersion B16;

-    CARD16	minorVersion B16;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xDPMSGetVersionReply;

-#define sz_xDPMSGetVersionReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSCapable */

-    CARD16	length B16;

-} xDPMSCapableReq;

-#define sz_xDPMSCapableReq 4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    BOOL	capable;

-    CARD8	pad1;

-    CARD16	pad2 B16;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-    CARD32	pad7 B32;

-} xDPMSCapableReply;

-#define sz_xDPMSCapableReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSGetTimeouts */

-    CARD16	length B16;

-} xDPMSGetTimeoutsReq;

-#define sz_xDPMSGetTimeoutsReq 4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	standby B16;

-    CARD16	suspend B16;

-    CARD16	off B16;

-    CARD16	pad1 B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xDPMSGetTimeoutsReply;

-#define sz_xDPMSGetTimeoutsReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSSetTimeouts */

-    CARD16	length B16;

-    CARD16	standby B16;

-    CARD16	suspend B16;

-    CARD16	off B16;

-    CARD16	pad0 B16;

-} xDPMSSetTimeoutsReq;

-#define sz_xDPMSSetTimeoutsReq 12

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSEnable */

-    CARD16	length B16;

-} xDPMSEnableReq;

-#define sz_xDPMSEnableReq 4

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSDisable */

-    CARD16	length B16;

-} xDPMSDisableReq;

-#define sz_xDPMSDisableReq 4

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSForceLevel */

-    CARD16	length B16;

-    CARD16	level B16;	/* power level requested */

-    CARD16	pad0 B16;

-} xDPMSForceLevelReq;

-#define sz_xDPMSForceLevelReq 8

-

-typedef struct {

-    CARD8	reqType;	/* always DPMSCode */

-    CARD8	dpmsReqType;	/* always X_DPMSInfo */

-    CARD16	length B16;

-} xDPMSInfoReq;

-#define sz_xDPMSInfoReq 4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	power_level B16;

-    BOOL	state;

-    CARD8	pad1;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xDPMSInfoReply;

-#define sz_xDPMSInfoReply 32

-

-#endif /* _DPMSPROTO_H_ */

+/*****************************************************************
+
+Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+#ifndef _DPMSPROTO_H_
+#define _DPMSPROTO_H_
+
+#include <X11/extensions/dpmsconst.h>
+
+#define X_DPMSGetVersion	0
+#define X_DPMSCapable		1
+#define X_DPMSGetTimeouts	2
+#define X_DPMSSetTimeouts	3
+#define X_DPMSEnable		4
+#define X_DPMSDisable		5
+#define X_DPMSForceLevel       	6
+#define X_DPMSInfo       	7
+
+#define DPMSNumberEvents	0
+
+#define DPMSNumberErrors	0
+
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSGetVersion */
+    CARD16	length B16;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+} xDPMSGetVersionReq;
+#define sz_xDPMSGetVersionReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xDPMSGetVersionReply;
+#define sz_xDPMSGetVersionReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSCapable */
+    CARD16	length B16;
+} xDPMSCapableReq;
+#define sz_xDPMSCapableReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    BOOL	capable;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xDPMSCapableReply;
+#define sz_xDPMSCapableReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSGetTimeouts */
+    CARD16	length B16;
+} xDPMSGetTimeoutsReq;
+#define sz_xDPMSGetTimeoutsReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	standby B16;
+    CARD16	suspend B16;
+    CARD16	off B16;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xDPMSGetTimeoutsReply;
+#define sz_xDPMSGetTimeoutsReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSSetTimeouts */
+    CARD16	length B16;
+    CARD16	standby B16;
+    CARD16	suspend B16;
+    CARD16	off B16;
+    CARD16	pad0 B16;
+} xDPMSSetTimeoutsReq;
+#define sz_xDPMSSetTimeoutsReq 12
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSEnable */
+    CARD16	length B16;
+} xDPMSEnableReq;
+#define sz_xDPMSEnableReq 4
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSDisable */
+    CARD16	length B16;
+} xDPMSDisableReq;
+#define sz_xDPMSDisableReq 4
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSForceLevel */
+    CARD16	length B16;
+    CARD16	level B16;	/* power level requested */
+    CARD16	pad0 B16;
+} xDPMSForceLevelReq;
+#define sz_xDPMSForceLevelReq 8
+
+typedef struct {
+    CARD8	reqType;	/* always DPMSCode */
+    CARD8	dpmsReqType;	/* always X_DPMSInfo */
+    CARD16	length B16;
+} xDPMSInfoReq;
+#define sz_xDPMSInfoReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	power_level B16;
+    BOOL	state;
+    CARD8	pad1;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xDPMSInfoReply;
+#define sz_xDPMSInfoReply 32
+
+#endif /* _DPMSPROTO_H_ */
diff --git a/X11/extensions/ge.h b/X11/extensions/ge.h
index fe458fa6c..aca1d8a24 100644
--- a/X11/extensions/ge.h
+++ b/X11/extensions/ge.h
@@ -1,60 +1,60 @@
-/*

- * Copyright © 2007-2008 Peter Hutterer

- *

- * 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 (including the next

- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

- *

- * Authors: Peter Hutterer, University of South Australia, NICTA

- *

- */

-

-#ifndef _GE_H_

-#define _GE_H_

-

-#define GE_NAME         "Generic Event Extension"

-#define GE_MAJOR        1

-#define GE_MINOR        0

-

-/*********************************************************

- *

- * Requests

- *

- */

-

-#define X_GEQueryVersion        0

-

-#define GENumberRequests       (X_GEQueryVersion + 1)

-

-/*********************************************************

- *

- * Events

- *

- */

-

-#define GENumberEvents        0

-

-/*********************************************************

- *

- * Errors

- *

- */

-

-#define GENumberErrors        0

-

-#endif /* _GE_H_ */

+/*
+ * Copyright © 2007-2008 Peter Hutterer
+ *
+ * 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 (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors: Peter Hutterer, University of South Australia, NICTA
+ *
+ */
+
+#ifndef _GE_H_
+#define _GE_H_
+
+#define GE_NAME         "Generic Event Extension"
+#define GE_MAJOR        1
+#define GE_MINOR        0
+
+/*********************************************************
+ *
+ * Requests
+ *
+ */
+
+#define X_GEQueryVersion        0
+
+#define GENumberRequests       (X_GEQueryVersion + 1)
+
+/*********************************************************
+ *
+ * Events
+ *
+ */
+
+#define GENumberEvents        0
+
+/*********************************************************
+ *
+ * Errors
+ *
+ */
+
+#define GENumberErrors        0
+
+#endif /* _GE_H_ */
diff --git a/X11/extensions/geproto.h b/X11/extensions/geproto.h
index 7302275e4..c8860dd87 100644
--- a/X11/extensions/geproto.h
+++ b/X11/extensions/geproto.h
@@ -1,85 +1,85 @@
-/*

- * Copyright © 2007-2008 Peter Hutterer

- *

- * 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 (including the next

- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

- *

- * Authors: Peter Hutterer, University of South Australia, NICTA

- *

- */

-

-#ifndef _GEPROTO_H_

-#define _GEPROTO_H_

-

-#include<X11/Xproto.h>

-#include<X11/X.h>

-#include<X11/extensions/ge.h>

-

-

-/*********************************************************

- *

- * Protocol request constants

- *

- */

-

-#define X_GEGetExtensionVersion 1

-

-/*********************************************************

- *

- * XGE protocol requests/replies

- *

- */

-

-/* generic request */

-typedef struct {

-    CARD8   reqType;

-    CARD8   ReqType;

-    CARD16  length B16;

-} xGEReq;

-

-

-/* QueryVersion */

-typedef struct {

-    CARD8	reqType;       /* input extension major code   */

-    CARD8	ReqType;       /* always X_GEQueryVersion */

-    CARD16	length B16;

-    CARD16      majorVersion B16;

-    CARD16      minorVersion B16;

-} xGEQueryVersionReq;

-

-#define sz_xGEQueryVersionReq    8

-

-typedef struct {

-    CARD8	repType;	/* X_Reply			*/

-    CARD8	RepType;	/* always X_GEQueryVersion */

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	majorVersion B16;

-    CARD16	minorVersion B16;

-    CARD32	pad00 B32;

-    CARD32	pad01 B32;

-    CARD32	pad02 B32;

-    CARD32	pad03 B32;

-    CARD32	pad04 B32;

-} xGEQueryVersionReply;

-

-#define sz_xGEQueryVersionReply    32

-

-#endif /* _GEPROTO_H_ */

-

+/*
+ * Copyright © 2007-2008 Peter Hutterer
+ *
+ * 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 (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors: Peter Hutterer, University of South Australia, NICTA
+ *
+ */
+
+#ifndef _GEPROTO_H_
+#define _GEPROTO_H_
+
+#include<X11/Xproto.h>
+#include<X11/X.h>
+#include<X11/extensions/ge.h>
+
+
+/*********************************************************
+ *
+ * Protocol request constants
+ *
+ */
+
+#define X_GEGetExtensionVersion 1
+
+/*********************************************************
+ *
+ * XGE protocol requests/replies
+ *
+ */
+
+/* generic request */
+typedef struct {
+    CARD8   reqType;
+    CARD8   ReqType;
+    CARD16  length B16;
+} xGEReq;
+
+
+/* QueryVersion */
+typedef struct {
+    CARD8	reqType;       /* input extension major code   */
+    CARD8	ReqType;       /* always X_GEQueryVersion */
+    CARD16	length B16;
+    CARD16      majorVersion B16;
+    CARD16      minorVersion B16;
+} xGEQueryVersionReq;
+
+#define sz_xGEQueryVersionReq    8
+
+typedef struct {
+    CARD8	repType;	/* X_Reply			*/
+    CARD8	RepType;	/* always X_GEQueryVersion */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad00 B32;
+    CARD32	pad01 B32;
+    CARD32	pad02 B32;
+    CARD32	pad03 B32;
+    CARD32	pad04 B32;
+} xGEQueryVersionReply;
+
+#define sz_xGEQueryVersionReply    32
+
+#endif /* _GEPROTO_H_ */
+
diff --git a/X11/extensions/lbx.h b/X11/extensions/lbx.h
index db19c91a8..ecd24ff1f 100644
--- a/X11/extensions/lbx.h
+++ b/X11/extensions/lbx.h
@@ -1,73 +1,73 @@
-/*

- * Copyright 1992 Network Computing Devices

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of NCD. not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  NCD. makes no representations about the

- * suitability of this software for any purpose.  It is provided "as is"

- * without express or implied warranty.

- *

- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.

- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

- *

- */

-

-#ifndef _LBX_H_

-#define _LBX_H_

-

-#define LBXNAME "LBX"

-

-#define LBX_MAJOR_VERSION	1

-#define LBX_MINOR_VERSION	0

-

-#define LbxNumberReqs			44

-#define LbxEvent			0

-#define LbxQuickMotionDeltaEvent	1

-#define LbxNumberEvents			2

-

-/* This is always the master client */

-#define LbxMasterClientIndex		0

-

-/* LbxEvent lbxType sub-fields */

-#define LbxSwitchEvent			0

-#define LbxCloseEvent			1

-#define LbxDeltaEvent			2

-#define LbxInvalidateTagEvent		3

-#define LbxSendTagDataEvent		4

-#define LbxListenToOne			5

-#define LbxListenToAll			6

-#define LbxMotionDeltaEvent		7

-#define LbxReleaseCmapEvent		8

-#define LbxFreeCellsEvent		9

-

-/*

- * Lbx image compression methods

- *

- * No compression is always assigned the value of 0.

- *

- * The rest of the compression method opcodes are assigned dynamically

- * at option negotiation time.

- */

-

-#define LbxImageCompressNone		0

-

-

-#define BadLbxClient			0

-#define LbxNumberErrors			(BadLbxClient + 1)

-

-/* tagged data types */

-#define	LbxTagTypeModmap		1

-#define	LbxTagTypeKeymap		2

-#define	LbxTagTypeProperty		3

-#define	LbxTagTypeFont			4

-#define	LbxTagTypeConnInfo		5

-

-#endif

+/*
+ * Copyright 1992 Network Computing Devices
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of NCD. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  NCD. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef _LBX_H_
+#define _LBX_H_
+
+#define LBXNAME "LBX"
+
+#define LBX_MAJOR_VERSION	1
+#define LBX_MINOR_VERSION	0
+
+#define LbxNumberReqs			44
+#define LbxEvent			0
+#define LbxQuickMotionDeltaEvent	1
+#define LbxNumberEvents			2
+
+/* This is always the master client */
+#define LbxMasterClientIndex		0
+
+/* LbxEvent lbxType sub-fields */
+#define LbxSwitchEvent			0
+#define LbxCloseEvent			1
+#define LbxDeltaEvent			2
+#define LbxInvalidateTagEvent		3
+#define LbxSendTagDataEvent		4
+#define LbxListenToOne			5
+#define LbxListenToAll			6
+#define LbxMotionDeltaEvent		7
+#define LbxReleaseCmapEvent		8
+#define LbxFreeCellsEvent		9
+
+/*
+ * Lbx image compression methods
+ *
+ * No compression is always assigned the value of 0.
+ *
+ * The rest of the compression method opcodes are assigned dynamically
+ * at option negotiation time.
+ */
+
+#define LbxImageCompressNone		0
+
+
+#define BadLbxClient			0
+#define LbxNumberErrors			(BadLbxClient + 1)
+
+/* tagged data types */
+#define	LbxTagTypeModmap		1
+#define	LbxTagTypeKeymap		2
+#define	LbxTagTypeProperty		3
+#define	LbxTagTypeFont			4
+#define	LbxTagTypeConnInfo		5
+
+#endif
diff --git a/X11/extensions/lbxproto.h b/X11/extensions/lbxproto.h
index fdd8b4b64..a1ae62ba4 100644
--- a/X11/extensions/lbxproto.h
+++ b/X11/extensions/lbxproto.h
@@ -1,975 +1,975 @@
-/*

- * Copyright 1992 Network Computing Devices

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of NCD. not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  NCD. makes no representations about the

- * suitability of this software for any purpose.  It is provided "as is"

- * without express or implied warranty.

- *

- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.

- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

- *

- */

-

-#ifndef _LBXPROTO_H_

-#define _LBXPROTO_H_

-

-#include <X11/extensions/lbx.h>

-/*

- * NOTE:  any changes or additions to the opcodes needs to be reflected

- * in the lbxCacheable array in Xserver/lbx/lbxmain.c

- */

-

-#define X_LbxQueryVersion		0

-#define X_LbxStartProxy			1

-#define X_LbxStopProxy			2

-#define X_LbxSwitch			3

-#define X_LbxNewClient			4

-#define X_LbxCloseClient		5

-#define X_LbxModifySequence		6

-#define X_LbxAllowMotion		7

-#define X_LbxIncrementPixel		8

-#define X_LbxDelta			9

-#define	X_LbxGetModifierMapping		10

-#define	X_LbxInvalidateTag		12

-#define X_LbxPolyPoint			13

-#define X_LbxPolyLine			14

-#define X_LbxPolySegment		15

-#define X_LbxPolyRectangle		16

-#define X_LbxPolyArc			17

-#define X_LbxFillPoly			18

-#define X_LbxPolyFillRectangle		19

-#define X_LbxPolyFillArc		20

-#define	X_LbxGetKeyboardMapping		21

-#define	X_LbxQueryFont			22

-#define	X_LbxChangeProperty		23

-#define	X_LbxGetProperty		24

-#define	X_LbxTagData			25

-

-#define X_LbxCopyArea			26

-#define X_LbxCopyPlane			27

-#define X_LbxPolyText8			28

-#define X_LbxPolyText16			29

-#define X_LbxImageText8			30

-#define X_LbxImageText16		31

-

-#define X_LbxQueryExtension		32

-#define X_LbxPutImage			33

-#define X_LbxGetImage			34

-

-#define X_LbxBeginLargeRequest		35

-#define X_LbxLargeRequestData		36

-#define X_LbxEndLargeRequest		37

-

-#define X_LbxInternAtoms		38

-#define X_LbxGetWinAttrAndGeom		39

-

-#define X_LbxGrabCmap			40

-#define X_LbxReleaseCmap		41

-#define X_LbxAllocColor			42

-

-#define X_LbxSync			43

-

-/*

- * Redefine some basic types used by structures defined herein.  This removes

- * any possibility on 64-bit architectures of one entity viewing communicated

- * data as 32-bit quantities and another entity viewing the same data as 64-bit

- * quantities.

- */

-#define XID CARD32

-#define Atom CARD32

-#define Colormap CARD32

-#define Drawable CARD32

-#define VisualID CARD32

-#define Window CARD32

-

-typedef struct {

-    BOOL	success;		/* TRUE */

-    BOOL	changeType;

-    CARD16	majorVersion B16,

-		minorVersion B16;

-    CARD16	length B16;		/* 1/4 additional bytes in setup info */

-    CARD32	tag B32;

-} xLbxConnSetupPrefix;

-

-typedef struct _LbxQueryVersion {

-    CARD8	reqType;		/* always LbxReqCode */

-    CARD8	lbxReqType;		/* always X_LbxQueryVersion */

-    CARD16	length B16;

-} xLbxQueryVersionReq;

-#define sz_xLbxQueryVersionReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	majorVersion B16;	/* major version of LBX protocol */

-    CARD16	minorVersion B16;	/* minor version of LBX protocol */

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxQueryVersionReply;

-#define sz_xLbxQueryVersionReply	32

-

-typedef struct _LbxStartProxy {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxStartProxy */

-    CARD16	length B16;

-} xLbxStartProxyReq;

-#define sz_xLbxStartProxyReq	    4

-

-typedef struct _LbxStopProxy {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxStopProxy */

-    CARD16	length B16;

-} xLbxStopProxyReq;

-#define sz_xLbxStopProxyReq	    4

-

-typedef struct _LbxSwitch {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxSwitch */

-    CARD16	length B16;

-    CARD32	client B32;	/* new client */

-} xLbxSwitchReq;

-#define sz_xLbxSwitchReq	8

-

-typedef struct _LbxNewClient {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxNewClient */

-    CARD16	length B16;

-    CARD32	client B32;	/* new client */

-} xLbxNewClientReq;

-#define sz_xLbxNewClientReq	8

-

-typedef struct _LbxCloseClient {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxCloseClient */

-    CARD16	length B16;

-    CARD32	client B32;	/* new client */

-} xLbxCloseClientReq;

-#define sz_xLbxCloseClientReq	8

-

-typedef struct _LbxModifySequence {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxModifySequence */

-    CARD16	length B16;

-    CARD32	adjust B32;

-} xLbxModifySequenceReq;

-#define sz_xLbxModifySequenceReq    8

-

-typedef struct _LbxAllowMotion {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxAllowMotion */

-    CARD16	length B16;

-    CARD32	num B32;

-} xLbxAllowMotionReq;

-#define sz_xLbxAllowMotionReq    8

-

-typedef struct {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxGrabCmap */

-    CARD16	length B16;

-    Colormap	cmap B32;

-} xLbxGrabCmapReq;

-#define sz_xLbxGrabCmapReq	8

-

-#define LBX_SMART_GRAB		0x80

-#define LBX_AUTO_RELEASE	0x40

-#define LBX_3CHANNELS		0x20

-#define LBX_2BYTE_PIXELS	0x10

-#define LBX_RGB_BITS_MASK	0x0f

-

-#define LBX_LIST_END		0

-#define LBX_PIXEL_PRIVATE	1

-#define LBX_PIXEL_SHARED	2

-#define LBX_PIXEL_RANGE_PRIVATE	3

-#define LBX_PIXEL_RANGE_SHARED	4

-#define LBX_NEXT_CHANNEL	5

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	flags;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	pad0 B16;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B16;

-} xLbxGrabCmapReply;

-#define sz_xLbxGrabCmapReply	32

-#define sz_xLbxGrabCmapReplyHdr	8

-

-

-typedef struct {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxReleaseCmap */

-    CARD16	length B16;

-    Colormap	cmap B32;

-} xLbxReleaseCmapReq;

-#define sz_xLbxReleaseCmapReq	8

-

-typedef struct {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxAllocColor */

-    CARD16	length B16;

-    Colormap	cmap B32;

-    CARD32	pixel B32;

-    CARD16	red B16, green B16, blue B16;

-    CARD16	pad B16;

-} xLbxAllocColorReq;

-#define sz_xLbxAllocColorReq	20

-

-typedef struct _LbxIncrementPixel {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxIncrementPixel */

-    CARD16	length B16;

-    CARD32	cmap B32;

-    CARD32	pixel B32;

-} xLbxIncrementPixelReq;

-#define sz_xLbxIncrementPixelReq    12

-

-typedef struct _LbxDelta {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxDelta */

-    CARD16	length B16;

-    CARD8	diffs;		/* number of diffs */

-    CARD8	cindex;		/* cache index */

-				/* list of diffs follows */

-} xLbxDeltaReq;

-#define sz_xLbxDeltaReq    6

-

-typedef struct _LbxGetModifierMapping {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxGetModifierMapping */

-    CARD16	length B16;

-} xLbxGetModifierMappingReq;

-#define	sz_xLbxGetModifierMappingReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	keyspermod;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	tag B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxGetModifierMappingReply;

-#define sz_xLbxGetModifierMappingReply	32

-

-typedef struct _LbxGetKeyboardMapping {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxGetKeyboardMapping */

-    CARD16	length B16;

-    KeyCode	firstKeyCode;

-    CARD8	count;

-    CARD16	pad1 B16;

-} xLbxGetKeyboardMappingReq;

-#define	sz_xLbxGetKeyboardMappingReq	8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	keysperkeycode;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	tag B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxGetKeyboardMappingReply;

-#define sz_xLbxGetKeyboardMappingReply	32

-

-typedef struct _LbxQueryFont {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxQueryFont */

-    CARD16	length B16;

-    CARD32	fid B32;

-} xLbxQueryFontReq;

-#define	sz_xLbxQueryFontReq	8

-

-typedef struct _LbxInternAtoms {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxInternAtoms */

-    CARD16	length B16;

-    CARD16	num B16;

-} xLbxInternAtomsReq;

-#define sz_xLbxInternAtomsReq	6

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	atomsStart B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxInternAtomsReply;

-#define sz_xLbxInternAtomsReply		32

-#define sz_xLbxInternAtomsReplyHdr	8

-

-

-typedef struct _LbxGetWinAttrAndGeom {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxGetWinAttrAndGeom */

-    CARD16	length B16;

-    CARD32	id B32;		/* window id */

-} xLbxGetWinAttrAndGeomReq;

-#define sz_xLbxGetWinAttrAndGeomReq 8

-

-typedef struct {

-    BYTE type;  /* X_Reply */

-    CARD8 backingStore;

-    CARD16 sequenceNumber B16;

-    CARD32 length B32;	/* NOT 0; this is an extra-large reply */

-    VisualID visualID B32;

-#if defined(__cplusplus) || defined(c_plusplus)

-    CARD16 c_class B16;

-#else

-    CARD16 class B16;

-#endif

-    CARD8 bitGravity;

-    CARD8 winGravity;

-    CARD32 backingBitPlanes B32;

-    CARD32 backingPixel B32;

-    BOOL saveUnder;

-    BOOL mapInstalled;

-    CARD8 mapState;

-    BOOL override;

-    Colormap colormap B32;

-    CARD32 allEventMasks B32;

-    CARD32 yourEventMask B32;

-    CARD16 doNotPropagateMask B16;

-    CARD16 pad1 B16;

-    Window root B32;

-    INT16 x B16, y B16;

-    CARD16 width B16, height B16;

-    CARD16 borderWidth B16;

-    CARD8 depth;

-    CARD8 pad2;

-} xLbxGetWinAttrAndGeomReply;

-#define sz_xLbxGetWinAttrAndGeomReply 60

-

-

-typedef struct {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxSync */

-    CARD16	length B16;

-} xLbxSyncReq;

-#define sz_xLbxSyncReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad0;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xLbxSyncReply;

-#define sz_xLbxSyncReply 32

-

-

-/* an LBX squished charinfo packs the data in a CARD32 as follows */

-#define	LBX_WIDTH_SHIFT		26

-#define	LBX_LEFT_SHIFT		20

-#define	LBX_RIGHT_SHIFT		13

-#define	LBX_ASCENT_SHIFT	7

-#define	LBX_DESCENT_SHIFT	0

-

-#define	LBX_WIDTH_BITS		6

-#define	LBX_LEFT_BITS		6

-#define	LBX_RIGHT_BITS		7

-#define	LBX_ASCENT_BITS		6

-#define	LBX_DESCENT_BITS	7

-

-#define	LBX_WIDTH_MASK		0xfc000000

-#define	LBX_LEFT_MASK		0x03f00000

-#define	LBX_RIGHT_MASK		0x000fe000

-#define	LBX_ASCENT_MASK		0x00001f80

-#define	LBX_DESCENT_MASK	0x0000007f

-

-#define	LBX_MASK_BITS(val, n)	((unsigned int) ((val) & ((1 << (n)) - 1)))

-

-typedef struct {

-    CARD32	metrics B32;

-} xLbxCharInfo;

-

-/* note that this is identical to xQueryFontReply except for missing

- * first 2 words

- */

-typedef struct {

-    xCharInfo minBounds;

-/* XXX do we need to leave this gunk? */

-#ifndef WORD64

-    CARD32 walign1 B32;

-#endif

-    xCharInfo maxBounds;

-#ifndef WORD64

-    CARD32 walign2 B32;

-#endif

-    CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;

-    CARD16 defaultChar B16;

-    CARD16 nFontProps B16;  /* followed by this many xFontProp structures */

-    CARD8 drawDirection;

-    CARD8 minByte1, maxByte1;

-    BOOL allCharsExist;

-    INT16 fontAscent B16, fontDescent B16;

-    CARD32 nCharInfos B32; /* followed by this many xLbxCharInfo structures */

-} xLbxFontInfo;

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	compression;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	tag B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    /* X_QueryFont sticks much of the data in the base reply packet,

-     * but we hope that it won't be needed, (and it won't fit in 32 bytes

-     * with the tag anyways)

-     *

-     * if any additional data is needed, its sent in a xLbxFontInfo

-     */

-} xLbxQueryFontReply;

-#define sz_xLbxQueryFontReply	32

-

-typedef struct _LbxChangeProperty {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxChangeProperty */

-    CARD16	length B16;

-    Window	window B32;

-    Atom	property B32;

-    Atom	type B32;

-    CARD8	format;

-    CARD8	mode;

-    BYTE	pad[2];

-    CARD32	nUnits B32;

-} xLbxChangePropertyReq;

-#define	sz_xLbxChangePropertyReq	24

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	pad;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	tag B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxChangePropertyReply;

-#define sz_xLbxChangePropertyReply	32

-

-typedef struct _LbxGetProperty {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxGetProperty */

-    CARD16	length B16;

-    Window	window B32;

-    Atom	property B32;

-    Atom	type B32;

-    CARD8	delete;

-    BYTE	pad[3];

-    CARD32	longOffset B32;

-    CARD32	longLength B32;

-} xLbxGetPropertyReq;

-#define	sz_xLbxGetPropertyReq	28

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	format;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    Atom	propertyType B32;

-    CARD32	bytesAfter B32;

-    CARD32	nItems B32;

-    CARD32	tag B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-} xLbxGetPropertyReply;

-#define sz_xLbxGetPropertyReply	32

-

-typedef struct _LbxTagData {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxTagData */

-    CARD16	length B16;

-    XID		tag B32;

-    CARD32	real_length B32;

-    /* data */

-} xLbxTagDataReq;

-#define	sz_xLbxTagDataReq	12

-

-typedef struct _LbxInvalidateTag {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxInvalidateTag */

-    CARD16	length B16;

-    CARD32	tag B32;

-} xLbxInvalidateTagReq;

-#define	sz_xLbxInvalidateTagReq	8

-

-typedef struct _LbxPutImage {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxPutImage */

-    CARD16	length B16;

-    CARD8	compressionMethod;

-    CARD8	cacheEnts;

-    CARD8	bitPacked;

-    /* rest is variable */

-} xLbxPutImageReq;

-#define sz_xLbxPutImageReq	7

-

-typedef struct {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxGetImage */

-    CARD16	length B16;

-    Drawable	drawable B32;

-    INT16	x B16, y B16;

-    CARD16	width B16, height B16;

-    CARD32	planeMask B32;

-    CARD8	format;

-    CARD8	pad1;

-    CARD16	pad2 B16;

-} xLbxGetImageReq;

-

-#define sz_xLbxGetImageReq 24

-

-typedef struct {

-    BYTE type;			/* X_Reply */

-    CARD8 depth;

-    CARD16 sequenceNumber B16;

-    CARD32 lbxLength B32;

-    CARD32 xLength B32;

-    VisualID visual B32;

-    CARD8 compressionMethod;

-    CARD8 pad1;

-    CARD16 pad2 B16;

-    CARD32 pad3 B32;

-    CARD32 pad4 B32;

-    CARD32 pad5 B32;

-} xLbxGetImageReply;

-

-#define sz_xLbxGetImageReply 32

-

-/* Following used for LbxPolyPoint, LbxPolyLine, LbxPolySegment,

-   LbxPolyRectangle, LbxPolyArc, LbxPolyFillRectangle and LbxPolyFillArc */

-

-#define GFX_CACHE_SIZE  15

-

-#define GFXdCacheEnt(e)	    ((e) & 0xf)

-#define GFXgCacheEnt(e)	    (((e) >> 4) & 0xf)

-#define GFXCacheEnts(d,g)   (((d) & 0xf) | (((g) & 0xf) << 4))

-

-#define GFXCacheNone   0xf

-

-typedef struct _LbxPolyPoint {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;

-    CARD16	length B16;

-    CARD8	cacheEnts;

-    CARD8	padBytes;

-} xLbxPolyPointReq;

-

-#define sz_xLbxPolyPointReq	6

-

-typedef xLbxPolyPointReq xLbxPolyLineReq;

-typedef xLbxPolyPointReq xLbxPolySegmentReq;

-typedef xLbxPolyPointReq xLbxPolyRectangleReq;

-typedef xLbxPolyPointReq xLbxPolyArcReq;

-typedef xLbxPolyPointReq xLbxPolyFillRectangleReq;

-typedef xLbxPolyPointReq xLbxPolyFillArcReq;

-

-#define sz_xLbxPolyLineReq		sz_xLbxPolyPointReq

-#define sz_xLbxPolySegmentReq		sz_xLbxPolyPointReq

-#define sz_xLbxPolyRectangleReq		sz_xLbxPolyPointReq

-#define sz_xLbxPolyArcReq		sz_xLbxPolyPointReq

-#define sz_xLbxPolyFillRectangleReq	sz_xLbxPolyPointReq

-#define sz_xLbxPolyFillArc		sz_xLbxPolyPointReq

-

-typedef struct _LbxFillPoly {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;

-    CARD16	length B16;

-    CARD8	cacheEnts;

-    BYTE	shape;

-    CARD8	padBytes;

-} xLbxFillPolyReq;

-#define sz_xLbxFillPolyReq	7

-

-typedef struct _LbxCopyArea {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;

-    CARD16	length B16;

-    CARD8	srcCache;	/* source drawable */

-    CARD8	cacheEnts;	/* dest drawable and gc */

-    /* followed by encoded src x, src y, dst x, dst y, width, height */

-} xLbxCopyAreaReq;

-

-#define sz_xLbxCopyAreaReq  6

-

-typedef struct _LbxCopyPlane {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;

-    CARD16	length B16;

-    CARD32	bitPlane B32;

-    CARD8	srcCache;	/* source drawable */

-    CARD8	cacheEnts;	/* dest drawable and gc */

-    /* followed by encoded src x, src y, dst x, dst y, width, height */

-} xLbxCopyPlaneReq;

-

-#define sz_xLbxCopyPlaneReq  10

-

-typedef struct _LbxPolyText {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;

-    CARD16	length B16;

-    CARD8	cacheEnts;

-    /* followed by encoded src x, src y coordinates and text elts */

-} xLbxPolyTextReq;

-

-#define sz_xLbxPolyTextReq  5

-

-typedef xLbxPolyTextReq xLbxPolyText8Req;

-typedef xLbxPolyTextReq xLbxPolyText16Req;

-

-#define sz_xLbxPolyTextReq	5

-#define sz_xLbxPolyText8Req	5

-#define sz_xLbxPolyText16Req	5

-

-typedef struct _LbxImageText {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;

-    CARD16	length B16;

-    CARD8	cacheEnts;

-    CARD8	nChars;

-    /* followed by encoded src x, src y coordinates and string */

-} xLbxImageTextReq;

-

-typedef xLbxImageTextReq xLbxImageText8Req;

-typedef xLbxImageTextReq xLbxImageText16Req;

-

-#define sz_xLbxImageTextReq	6

-#define sz_xLbxImageText8Req	6

-#define sz_xLbxImageText16Req	6

-

-typedef struct {

-    CARD8       offset;

-    CARD8       diff;

-} xLbxDiffItem;

-#define sz_xLbxDiffItem    2

-

-typedef struct {

-    BYTE	type;		/* X_Reply */

-    CARD8	nOpts;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	optDataStart B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxStartReply;

-#define sz_xLbxStartReply	32

-#define sz_xLbxStartReplyHdr	8

-

-typedef struct _LbxQueryExtension {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxQueryExtension */

-    CARD16	length B16;

-    CARD32	nbytes B32;

-} xLbxQueryExtensionReq;

-#define	sz_xLbxQueryExtensionReq	8

-

-typedef struct _LbxQueryExtensionReply {

-    BYTE	type;			/* X_Reply */

-    CARD8	numReqs;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    BOOL	present;

-    CARD8	major_opcode;

-    CARD8	first_event;

-    CARD8	first_error;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-

-    /* reply & event generating requests */

-} xLbxQueryExtensionReply;

-#define sz_xLbxQueryExtensionReply	32

-

-

-typedef struct _LbxBeginLargeRequest {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxBeginLargeRequest */

-    CARD16	length B16;

-    CARD32	largeReqLength B32;

-} xLbxBeginLargeRequestReq;

-#define	sz_BeginLargeRequestReq 8

-

-typedef struct _LbxLargeRequestData {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxLargeRequestData */

-    CARD16	length B16;

-    /* followed by LISTofCARD8 data */

-} xLbxLargeRequestDataReq;

-#define	sz_LargeRequestDataReq 4

-

-typedef struct _LbxEndLargeRequest {

-    CARD8	reqType;	/* always LbxReqCode */

-    CARD8	lbxReqType;	/* always X_LbxEndLargeRequest */

-    CARD16	length B16;

-} xLbxEndLargeRequestReq;

-#define	sz_EndLargeRequestReq 4

-

-

-

-typedef struct _LbxSwitchEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxSwitchEvent */

-    CARD16	pad B16;

-    CARD32	client B32;

-} xLbxSwitchEvent;

-#define sz_xLbxSwitchEvent	8

-

-typedef struct _LbxCloseEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxCloseEvent */

-    CARD16	sequenceNumber B16;

-    CARD32	client B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xLbxCloseEvent;

-#define sz_xLbxCloseEvent	32

-

-typedef struct _LbxInvalidateTagEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxInvalidateTagEvent */

-    CARD16	sequenceNumber B16;

-    CARD32	tag B32;

-    CARD32	tagType B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xLbxInvalidateTagEvent;

-#define sz_xLbxInvalidateTagEvent 32

-

-typedef struct _LbxSendTagDataEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxSendTagDataEvent */

-    CARD16	sequenceNumber B16;

-    CARD32	tag B32;

-    CARD32	tagType B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xLbxSendTagDataEvent;

-#define sz_xLbxSendTagDataEvent 32

-

-typedef struct _LbxListenToOneEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxListenToOneEvent */

-    CARD16	sequenceNumber B16;

-    CARD32	client B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xLbxListenToOneEvent;

-#define sz_xLbxListenToOneEvent 32

-

-typedef struct _LbxListenToAllEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxListenToAllEvent */

-    CARD16	sequenceNumber B16;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-    CARD32	pad7 B32;

-} xLbxListenToAllEvent;

-#define sz_xLbxListenToOneEvent 32

-

-typedef struct _LbxReleaseCmapEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxReleaseCmapEvent */

-    CARD16	sequenceNumber B16;

-    Colormap	colormap B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xLbxReleaseCmapEvent;

-#define sz_xLbxReleaseCmapEvent	32

-

-

-typedef struct _LbxFreeCellsEvent {

-    BYTE	type;		/* always eventBase + LbxEvent */

-    BYTE	lbxType;	/* LbxFreeCellsEvent */

-    CARD16	sequenceNumber B16;

-    Colormap	colormap B32;

-    CARD32	pixelStart B32;

-    CARD32	pixelEnd B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xLbxFreeCellsEvent;

-#define sz_xLbxFreeCellsEvent	32

-

-

-/*

- * squished X event sizes.  If these change, be sure to update lbxquish.c

- * and unsquish.c appropriately

- *

- * lbxsz_* is the padded squished length

- * lbxupsz_* is the unpadded squished length

- */

-

-#define	  lbxsz_KeyButtonEvent		32

-#define	lbxupsz_KeyButtonEvent		31

-

-#define	  lbxsz_EnterLeaveEvent		32

-#define	lbxupsz_EnterLeaveEvent		32

-

-#define	  lbxsz_FocusEvent		12

-#define	lbxupsz_FocusEvent		9

-

-#define	  lbxsz_KeymapEvent		32

-#define	lbxupsz_KeymapEvent		32

-

-#define	  lbxsz_ExposeEvent		20

-#define	lbxupsz_ExposeEvent		18

-

-#define	  lbxsz_GfxExposeEvent		24

-#define	lbxupsz_GfxExposeEvent		21

-

-#define	  lbxsz_NoExposeEvent		12

-#define	lbxupsz_NoExposeEvent		11

-

-#define	  lbxsz_VisibilityEvent		12

-#define	lbxupsz_VisibilityEvent		9

-

-#define	  lbxsz_CreateNotifyEvent	24

-#define	lbxupsz_CreateNotifyEvent	23

-

-#define	  lbxsz_DestroyNotifyEvent	12

-#define	lbxupsz_DestroyNotifyEvent	12

-

-#define	  lbxsz_UnmapNotifyEvent	16

-#define	lbxupsz_UnmapNotifyEvent	13

-

-#define	  lbxsz_MapNotifyEvent		16

-#define	lbxupsz_MapNotifyEvent		13

-

-#define	  lbxsz_MapRequestEvent		12

-#define	lbxupsz_MapRequestEvent		12

-

-#define	  lbxsz_ReparentEvent		24

-#define	lbxupsz_ReparentEvent		21

-

-#define	  lbxsz_ConfigureNotifyEvent	28

-#define	lbxupsz_ConfigureNotifyEvent	27

-

-#define	  lbxsz_ConfigureRequestEvent	28

-#define	lbxupsz_ConfigureRequestEvent	28

-

-#define	  lbxsz_GravityEvent		16

-#define	lbxupsz_GravityEvent		16

-

-#define	  lbxsz_ResizeRequestEvent	12

-#define	lbxupsz_ResizeRequestEvent	12

-

-#define	  lbxsz_CirculateEvent		20

-#define	lbxupsz_CirculateEvent		17

-

-#define	  lbxsz_PropertyEvent		20

-#define	lbxupsz_PropertyEvent		17

-

-#define	  lbxsz_SelectionClearEvent	16

-#define	lbxupsz_SelectionClearEvent	16

-

-#define	  lbxsz_SelectionRequestEvent	28

-#define	lbxupsz_SelectionRequestEvent	28

-

-#define	  lbxsz_SelectionNotifyEvent	24

-#define	lbxupsz_SelectionNotifyEvent	24

-

-#define	  lbxsz_ColormapEvent		16

-#define	lbxupsz_ColormapEvent		14

-

-#define	  lbxsz_MappingNotifyEvent	8

-#define	lbxupsz_MappingNotifyEvent	7

-

-#define	  lbxsz_ClientMessageEvent	32

-#define	lbxupsz_ClientMessageEvent	32

-

-#define	lbxsz_UnknownEvent		32

-

-#ifdef DEBUG

-

-#define DBG_SWITCH	0x00000001

-#define DBG_CLOSE	0x00000002

-#define DBG_IO		0x00000004

-#define DBG_READ_REQ	0x00000008

-#define DBG_LEN		0x00000010

-#define DBG_BLOCK	0x00000020

-#define DBG_CLIENT	0x00000040

-#define DBG_DELTA	0x00000080

-#endif

-/*

- * Cancel the previous redefinition of the basic types, thus restoring their

- * X.h definitions.

- */

-

-#undef XID

-#undef Atom

-#undef Colormap

-#undef Drawable

-#undef VisualID

-#undef Window

-

-#endif	/* _LBXPROTO_H_ */

+/*
+ * Copyright 1992 Network Computing Devices
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of NCD. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  NCD. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef _LBXPROTO_H_
+#define _LBXPROTO_H_
+
+#include <X11/extensions/lbx.h>
+/*
+ * NOTE:  any changes or additions to the opcodes needs to be reflected
+ * in the lbxCacheable array in Xserver/lbx/lbxmain.c
+ */
+
+#define X_LbxQueryVersion		0
+#define X_LbxStartProxy			1
+#define X_LbxStopProxy			2
+#define X_LbxSwitch			3
+#define X_LbxNewClient			4
+#define X_LbxCloseClient		5
+#define X_LbxModifySequence		6
+#define X_LbxAllowMotion		7
+#define X_LbxIncrementPixel		8
+#define X_LbxDelta			9
+#define	X_LbxGetModifierMapping		10
+#define	X_LbxInvalidateTag		12
+#define X_LbxPolyPoint			13
+#define X_LbxPolyLine			14
+#define X_LbxPolySegment		15
+#define X_LbxPolyRectangle		16
+#define X_LbxPolyArc			17
+#define X_LbxFillPoly			18
+#define X_LbxPolyFillRectangle		19
+#define X_LbxPolyFillArc		20
+#define	X_LbxGetKeyboardMapping		21
+#define	X_LbxQueryFont			22
+#define	X_LbxChangeProperty		23
+#define	X_LbxGetProperty		24
+#define	X_LbxTagData			25
+
+#define X_LbxCopyArea			26
+#define X_LbxCopyPlane			27
+#define X_LbxPolyText8			28
+#define X_LbxPolyText16			29
+#define X_LbxImageText8			30
+#define X_LbxImageText16		31
+
+#define X_LbxQueryExtension		32
+#define X_LbxPutImage			33
+#define X_LbxGetImage			34
+
+#define X_LbxBeginLargeRequest		35
+#define X_LbxLargeRequestData		36
+#define X_LbxEndLargeRequest		37
+
+#define X_LbxInternAtoms		38
+#define X_LbxGetWinAttrAndGeom		39
+
+#define X_LbxGrabCmap			40
+#define X_LbxReleaseCmap		41
+#define X_LbxAllocColor			42
+
+#define X_LbxSync			43
+
+/*
+ * Redefine some basic types used by structures defined herein.  This removes
+ * any possibility on 64-bit architectures of one entity viewing communicated
+ * data as 32-bit quantities and another entity viewing the same data as 64-bit
+ * quantities.
+ */
+#define XID CARD32
+#define Atom CARD32
+#define Colormap CARD32
+#define Drawable CARD32
+#define VisualID CARD32
+#define Window CARD32
+
+typedef struct {
+    BOOL	success;		/* TRUE */
+    BOOL	changeType;
+    CARD16	majorVersion B16,
+		minorVersion B16;
+    CARD16	length B16;		/* 1/4 additional bytes in setup info */
+    CARD32	tag B32;
+} xLbxConnSetupPrefix;
+
+typedef struct _LbxQueryVersion {
+    CARD8	reqType;		/* always LbxReqCode */
+    CARD8	lbxReqType;		/* always X_LbxQueryVersion */
+    CARD16	length B16;
+} xLbxQueryVersionReq;
+#define sz_xLbxQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of LBX protocol */
+    CARD16	minorVersion B16;	/* minor version of LBX protocol */
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxQueryVersionReply;
+#define sz_xLbxQueryVersionReply	32
+
+typedef struct _LbxStartProxy {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxStartProxy */
+    CARD16	length B16;
+} xLbxStartProxyReq;
+#define sz_xLbxStartProxyReq	    4
+
+typedef struct _LbxStopProxy {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxStopProxy */
+    CARD16	length B16;
+} xLbxStopProxyReq;
+#define sz_xLbxStopProxyReq	    4
+
+typedef struct _LbxSwitch {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxSwitch */
+    CARD16	length B16;
+    CARD32	client B32;	/* new client */
+} xLbxSwitchReq;
+#define sz_xLbxSwitchReq	8
+
+typedef struct _LbxNewClient {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxNewClient */
+    CARD16	length B16;
+    CARD32	client B32;	/* new client */
+} xLbxNewClientReq;
+#define sz_xLbxNewClientReq	8
+
+typedef struct _LbxCloseClient {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxCloseClient */
+    CARD16	length B16;
+    CARD32	client B32;	/* new client */
+} xLbxCloseClientReq;
+#define sz_xLbxCloseClientReq	8
+
+typedef struct _LbxModifySequence {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxModifySequence */
+    CARD16	length B16;
+    CARD32	adjust B32;
+} xLbxModifySequenceReq;
+#define sz_xLbxModifySequenceReq    8
+
+typedef struct _LbxAllowMotion {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxAllowMotion */
+    CARD16	length B16;
+    CARD32	num B32;
+} xLbxAllowMotionReq;
+#define sz_xLbxAllowMotionReq    8
+
+typedef struct {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxGrabCmap */
+    CARD16	length B16;
+    Colormap	cmap B32;
+} xLbxGrabCmapReq;
+#define sz_xLbxGrabCmapReq	8
+
+#define LBX_SMART_GRAB		0x80
+#define LBX_AUTO_RELEASE	0x40
+#define LBX_3CHANNELS		0x20
+#define LBX_2BYTE_PIXELS	0x10
+#define LBX_RGB_BITS_MASK	0x0f
+
+#define LBX_LIST_END		0
+#define LBX_PIXEL_PRIVATE	1
+#define LBX_PIXEL_SHARED	2
+#define LBX_PIXEL_RANGE_PRIVATE	3
+#define LBX_PIXEL_RANGE_SHARED	4
+#define LBX_NEXT_CHANNEL	5
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	flags;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad0 B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B16;
+} xLbxGrabCmapReply;
+#define sz_xLbxGrabCmapReply	32
+#define sz_xLbxGrabCmapReplyHdr	8
+
+
+typedef struct {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxReleaseCmap */
+    CARD16	length B16;
+    Colormap	cmap B32;
+} xLbxReleaseCmapReq;
+#define sz_xLbxReleaseCmapReq	8
+
+typedef struct {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxAllocColor */
+    CARD16	length B16;
+    Colormap	cmap B32;
+    CARD32	pixel B32;
+    CARD16	red B16, green B16, blue B16;
+    CARD16	pad B16;
+} xLbxAllocColorReq;
+#define sz_xLbxAllocColorReq	20
+
+typedef struct _LbxIncrementPixel {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxIncrementPixel */
+    CARD16	length B16;
+    CARD32	cmap B32;
+    CARD32	pixel B32;
+} xLbxIncrementPixelReq;
+#define sz_xLbxIncrementPixelReq    12
+
+typedef struct _LbxDelta {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxDelta */
+    CARD16	length B16;
+    CARD8	diffs;		/* number of diffs */
+    CARD8	cindex;		/* cache index */
+				/* list of diffs follows */
+} xLbxDeltaReq;
+#define sz_xLbxDeltaReq    6
+
+typedef struct _LbxGetModifierMapping {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxGetModifierMapping */
+    CARD16	length B16;
+} xLbxGetModifierMappingReq;
+#define	sz_xLbxGetModifierMappingReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	keyspermod;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	tag B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxGetModifierMappingReply;
+#define sz_xLbxGetModifierMappingReply	32
+
+typedef struct _LbxGetKeyboardMapping {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxGetKeyboardMapping */
+    CARD16	length B16;
+    KeyCode	firstKeyCode;
+    CARD8	count;
+    CARD16	pad1 B16;
+} xLbxGetKeyboardMappingReq;
+#define	sz_xLbxGetKeyboardMappingReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	keysperkeycode;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	tag B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxGetKeyboardMappingReply;
+#define sz_xLbxGetKeyboardMappingReply	32
+
+typedef struct _LbxQueryFont {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxQueryFont */
+    CARD16	length B16;
+    CARD32	fid B32;
+} xLbxQueryFontReq;
+#define	sz_xLbxQueryFontReq	8
+
+typedef struct _LbxInternAtoms {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxInternAtoms */
+    CARD16	length B16;
+    CARD16	num B16;
+} xLbxInternAtomsReq;
+#define sz_xLbxInternAtomsReq	6
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	atomsStart B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxInternAtomsReply;
+#define sz_xLbxInternAtomsReply		32
+#define sz_xLbxInternAtomsReplyHdr	8
+
+
+typedef struct _LbxGetWinAttrAndGeom {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxGetWinAttrAndGeom */
+    CARD16	length B16;
+    CARD32	id B32;		/* window id */
+} xLbxGetWinAttrAndGeomReq;
+#define sz_xLbxGetWinAttrAndGeomReq 8
+
+typedef struct {
+    BYTE type;  /* X_Reply */
+    CARD8 backingStore;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;	/* NOT 0; this is an extra-large reply */
+    VisualID visualID B32;
+#if defined(__cplusplus) || defined(c_plusplus)
+    CARD16 c_class B16;
+#else
+    CARD16 class B16;
+#endif
+    CARD8 bitGravity;
+    CARD8 winGravity;
+    CARD32 backingBitPlanes B32;
+    CARD32 backingPixel B32;
+    BOOL saveUnder;
+    BOOL mapInstalled;
+    CARD8 mapState;
+    BOOL override;
+    Colormap colormap B32;
+    CARD32 allEventMasks B32;
+    CARD32 yourEventMask B32;
+    CARD16 doNotPropagateMask B16;
+    CARD16 pad1 B16;
+    Window root B32;
+    INT16 x B16, y B16;
+    CARD16 width B16, height B16;
+    CARD16 borderWidth B16;
+    CARD8 depth;
+    CARD8 pad2;
+} xLbxGetWinAttrAndGeomReply;
+#define sz_xLbxGetWinAttrAndGeomReply 60
+
+
+typedef struct {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxSync */
+    CARD16	length B16;
+} xLbxSyncReq;
+#define sz_xLbxSyncReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xLbxSyncReply;
+#define sz_xLbxSyncReply 32
+
+
+/* an LBX squished charinfo packs the data in a CARD32 as follows */
+#define	LBX_WIDTH_SHIFT		26
+#define	LBX_LEFT_SHIFT		20
+#define	LBX_RIGHT_SHIFT		13
+#define	LBX_ASCENT_SHIFT	7
+#define	LBX_DESCENT_SHIFT	0
+
+#define	LBX_WIDTH_BITS		6
+#define	LBX_LEFT_BITS		6
+#define	LBX_RIGHT_BITS		7
+#define	LBX_ASCENT_BITS		6
+#define	LBX_DESCENT_BITS	7
+
+#define	LBX_WIDTH_MASK		0xfc000000
+#define	LBX_LEFT_MASK		0x03f00000
+#define	LBX_RIGHT_MASK		0x000fe000
+#define	LBX_ASCENT_MASK		0x00001f80
+#define	LBX_DESCENT_MASK	0x0000007f
+
+#define	LBX_MASK_BITS(val, n)	((unsigned int) ((val) & ((1 << (n)) - 1)))
+
+typedef struct {
+    CARD32	metrics B32;
+} xLbxCharInfo;
+
+/* note that this is identical to xQueryFontReply except for missing
+ * first 2 words
+ */
+typedef struct {
+    xCharInfo minBounds;
+/* XXX do we need to leave this gunk? */
+#ifndef WORD64
+    CARD32 walign1 B32;
+#endif
+    xCharInfo maxBounds;
+#ifndef WORD64
+    CARD32 walign2 B32;
+#endif
+    CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
+    CARD16 defaultChar B16;
+    CARD16 nFontProps B16;  /* followed by this many xFontProp structures */
+    CARD8 drawDirection;
+    CARD8 minByte1, maxByte1;
+    BOOL allCharsExist;
+    INT16 fontAscent B16, fontDescent B16;
+    CARD32 nCharInfos B32; /* followed by this many xLbxCharInfo structures */
+} xLbxFontInfo;
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	compression;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	tag B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    /* X_QueryFont sticks much of the data in the base reply packet,
+     * but we hope that it won't be needed, (and it won't fit in 32 bytes
+     * with the tag anyways)
+     *
+     * if any additional data is needed, its sent in a xLbxFontInfo
+     */
+} xLbxQueryFontReply;
+#define sz_xLbxQueryFontReply	32
+
+typedef struct _LbxChangeProperty {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxChangeProperty */
+    CARD16	length B16;
+    Window	window B32;
+    Atom	property B32;
+    Atom	type B32;
+    CARD8	format;
+    CARD8	mode;
+    BYTE	pad[2];
+    CARD32	nUnits B32;
+} xLbxChangePropertyReq;
+#define	sz_xLbxChangePropertyReq	24
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	tag B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxChangePropertyReply;
+#define sz_xLbxChangePropertyReply	32
+
+typedef struct _LbxGetProperty {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxGetProperty */
+    CARD16	length B16;
+    Window	window B32;
+    Atom	property B32;
+    Atom	type B32;
+    CARD8	delete;
+    BYTE	pad[3];
+    CARD32	longOffset B32;
+    CARD32	longLength B32;
+} xLbxGetPropertyReq;
+#define	sz_xLbxGetPropertyReq	28
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	format;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    Atom	propertyType B32;
+    CARD32	bytesAfter B32;
+    CARD32	nItems B32;
+    CARD32	tag B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+} xLbxGetPropertyReply;
+#define sz_xLbxGetPropertyReply	32
+
+typedef struct _LbxTagData {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxTagData */
+    CARD16	length B16;
+    XID		tag B32;
+    CARD32	real_length B32;
+    /* data */
+} xLbxTagDataReq;
+#define	sz_xLbxTagDataReq	12
+
+typedef struct _LbxInvalidateTag {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxInvalidateTag */
+    CARD16	length B16;
+    CARD32	tag B32;
+} xLbxInvalidateTagReq;
+#define	sz_xLbxInvalidateTagReq	8
+
+typedef struct _LbxPutImage {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxPutImage */
+    CARD16	length B16;
+    CARD8	compressionMethod;
+    CARD8	cacheEnts;
+    CARD8	bitPacked;
+    /* rest is variable */
+} xLbxPutImageReq;
+#define sz_xLbxPutImageReq	7
+
+typedef struct {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxGetImage */
+    CARD16	length B16;
+    Drawable	drawable B32;
+    INT16	x B16, y B16;
+    CARD16	width B16, height B16;
+    CARD32	planeMask B32;
+    CARD8	format;
+    CARD8	pad1;
+    CARD16	pad2 B16;
+} xLbxGetImageReq;
+
+#define sz_xLbxGetImageReq 24
+
+typedef struct {
+    BYTE type;			/* X_Reply */
+    CARD8 depth;
+    CARD16 sequenceNumber B16;
+    CARD32 lbxLength B32;
+    CARD32 xLength B32;
+    VisualID visual B32;
+    CARD8 compressionMethod;
+    CARD8 pad1;
+    CARD16 pad2 B16;
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+} xLbxGetImageReply;
+
+#define sz_xLbxGetImageReply 32
+
+/* Following used for LbxPolyPoint, LbxPolyLine, LbxPolySegment,
+   LbxPolyRectangle, LbxPolyArc, LbxPolyFillRectangle and LbxPolyFillArc */
+
+#define GFX_CACHE_SIZE  15
+
+#define GFXdCacheEnt(e)	    ((e) & 0xf)
+#define GFXgCacheEnt(e)	    (((e) >> 4) & 0xf)
+#define GFXCacheEnts(d,g)   (((d) & 0xf) | (((g) & 0xf) << 4))
+
+#define GFXCacheNone   0xf
+
+typedef struct _LbxPolyPoint {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;
+    CARD16	length B16;
+    CARD8	cacheEnts;
+    CARD8	padBytes;
+} xLbxPolyPointReq;
+
+#define sz_xLbxPolyPointReq	6
+
+typedef xLbxPolyPointReq xLbxPolyLineReq;
+typedef xLbxPolyPointReq xLbxPolySegmentReq;
+typedef xLbxPolyPointReq xLbxPolyRectangleReq;
+typedef xLbxPolyPointReq xLbxPolyArcReq;
+typedef xLbxPolyPointReq xLbxPolyFillRectangleReq;
+typedef xLbxPolyPointReq xLbxPolyFillArcReq;
+
+#define sz_xLbxPolyLineReq		sz_xLbxPolyPointReq
+#define sz_xLbxPolySegmentReq		sz_xLbxPolyPointReq
+#define sz_xLbxPolyRectangleReq		sz_xLbxPolyPointReq
+#define sz_xLbxPolyArcReq		sz_xLbxPolyPointReq
+#define sz_xLbxPolyFillRectangleReq	sz_xLbxPolyPointReq
+#define sz_xLbxPolyFillArc		sz_xLbxPolyPointReq
+
+typedef struct _LbxFillPoly {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;
+    CARD16	length B16;
+    CARD8	cacheEnts;
+    BYTE	shape;
+    CARD8	padBytes;
+} xLbxFillPolyReq;
+#define sz_xLbxFillPolyReq	7
+
+typedef struct _LbxCopyArea {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;
+    CARD16	length B16;
+    CARD8	srcCache;	/* source drawable */
+    CARD8	cacheEnts;	/* dest drawable and gc */
+    /* followed by encoded src x, src y, dst x, dst y, width, height */
+} xLbxCopyAreaReq;
+
+#define sz_xLbxCopyAreaReq  6
+
+typedef struct _LbxCopyPlane {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;
+    CARD16	length B16;
+    CARD32	bitPlane B32;
+    CARD8	srcCache;	/* source drawable */
+    CARD8	cacheEnts;	/* dest drawable and gc */
+    /* followed by encoded src x, src y, dst x, dst y, width, height */
+} xLbxCopyPlaneReq;
+
+#define sz_xLbxCopyPlaneReq  10
+
+typedef struct _LbxPolyText {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;
+    CARD16	length B16;
+    CARD8	cacheEnts;
+    /* followed by encoded src x, src y coordinates and text elts */
+} xLbxPolyTextReq;
+
+#define sz_xLbxPolyTextReq  5
+
+typedef xLbxPolyTextReq xLbxPolyText8Req;
+typedef xLbxPolyTextReq xLbxPolyText16Req;
+
+#define sz_xLbxPolyTextReq	5
+#define sz_xLbxPolyText8Req	5
+#define sz_xLbxPolyText16Req	5
+
+typedef struct _LbxImageText {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;
+    CARD16	length B16;
+    CARD8	cacheEnts;
+    CARD8	nChars;
+    /* followed by encoded src x, src y coordinates and string */
+} xLbxImageTextReq;
+
+typedef xLbxImageTextReq xLbxImageText8Req;
+typedef xLbxImageTextReq xLbxImageText16Req;
+
+#define sz_xLbxImageTextReq	6
+#define sz_xLbxImageText8Req	6
+#define sz_xLbxImageText16Req	6
+
+typedef struct {
+    CARD8       offset;
+    CARD8       diff;
+} xLbxDiffItem;
+#define sz_xLbxDiffItem    2
+
+typedef struct {
+    BYTE	type;		/* X_Reply */
+    CARD8	nOpts;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	optDataStart B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxStartReply;
+#define sz_xLbxStartReply	32
+#define sz_xLbxStartReplyHdr	8
+
+typedef struct _LbxQueryExtension {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxQueryExtension */
+    CARD16	length B16;
+    CARD32	nbytes B32;
+} xLbxQueryExtensionReq;
+#define	sz_xLbxQueryExtensionReq	8
+
+typedef struct _LbxQueryExtensionReply {
+    BYTE	type;			/* X_Reply */
+    CARD8	numReqs;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    BOOL	present;
+    CARD8	major_opcode;
+    CARD8	first_event;
+    CARD8	first_error;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+
+    /* reply & event generating requests */
+} xLbxQueryExtensionReply;
+#define sz_xLbxQueryExtensionReply	32
+
+
+typedef struct _LbxBeginLargeRequest {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxBeginLargeRequest */
+    CARD16	length B16;
+    CARD32	largeReqLength B32;
+} xLbxBeginLargeRequestReq;
+#define	sz_BeginLargeRequestReq 8
+
+typedef struct _LbxLargeRequestData {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxLargeRequestData */
+    CARD16	length B16;
+    /* followed by LISTofCARD8 data */
+} xLbxLargeRequestDataReq;
+#define	sz_LargeRequestDataReq 4
+
+typedef struct _LbxEndLargeRequest {
+    CARD8	reqType;	/* always LbxReqCode */
+    CARD8	lbxReqType;	/* always X_LbxEndLargeRequest */
+    CARD16	length B16;
+} xLbxEndLargeRequestReq;
+#define	sz_EndLargeRequestReq 4
+
+
+
+typedef struct _LbxSwitchEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxSwitchEvent */
+    CARD16	pad B16;
+    CARD32	client B32;
+} xLbxSwitchEvent;
+#define sz_xLbxSwitchEvent	8
+
+typedef struct _LbxCloseEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxCloseEvent */
+    CARD16	sequenceNumber B16;
+    CARD32	client B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xLbxCloseEvent;
+#define sz_xLbxCloseEvent	32
+
+typedef struct _LbxInvalidateTagEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxInvalidateTagEvent */
+    CARD16	sequenceNumber B16;
+    CARD32	tag B32;
+    CARD32	tagType B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xLbxInvalidateTagEvent;
+#define sz_xLbxInvalidateTagEvent 32
+
+typedef struct _LbxSendTagDataEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxSendTagDataEvent */
+    CARD16	sequenceNumber B16;
+    CARD32	tag B32;
+    CARD32	tagType B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xLbxSendTagDataEvent;
+#define sz_xLbxSendTagDataEvent 32
+
+typedef struct _LbxListenToOneEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxListenToOneEvent */
+    CARD16	sequenceNumber B16;
+    CARD32	client B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xLbxListenToOneEvent;
+#define sz_xLbxListenToOneEvent 32
+
+typedef struct _LbxListenToAllEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxListenToAllEvent */
+    CARD16	sequenceNumber B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xLbxListenToAllEvent;
+#define sz_xLbxListenToOneEvent 32
+
+typedef struct _LbxReleaseCmapEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxReleaseCmapEvent */
+    CARD16	sequenceNumber B16;
+    Colormap	colormap B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xLbxReleaseCmapEvent;
+#define sz_xLbxReleaseCmapEvent	32
+
+
+typedef struct _LbxFreeCellsEvent {
+    BYTE	type;		/* always eventBase + LbxEvent */
+    BYTE	lbxType;	/* LbxFreeCellsEvent */
+    CARD16	sequenceNumber B16;
+    Colormap	colormap B32;
+    CARD32	pixelStart B32;
+    CARD32	pixelEnd B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xLbxFreeCellsEvent;
+#define sz_xLbxFreeCellsEvent	32
+
+
+/*
+ * squished X event sizes.  If these change, be sure to update lbxquish.c
+ * and unsquish.c appropriately
+ *
+ * lbxsz_* is the padded squished length
+ * lbxupsz_* is the unpadded squished length
+ */
+
+#define	  lbxsz_KeyButtonEvent		32
+#define	lbxupsz_KeyButtonEvent		31
+
+#define	  lbxsz_EnterLeaveEvent		32
+#define	lbxupsz_EnterLeaveEvent		32
+
+#define	  lbxsz_FocusEvent		12
+#define	lbxupsz_FocusEvent		9
+
+#define	  lbxsz_KeymapEvent		32
+#define	lbxupsz_KeymapEvent		32
+
+#define	  lbxsz_ExposeEvent		20
+#define	lbxupsz_ExposeEvent		18
+
+#define	  lbxsz_GfxExposeEvent		24
+#define	lbxupsz_GfxExposeEvent		21
+
+#define	  lbxsz_NoExposeEvent		12
+#define	lbxupsz_NoExposeEvent		11
+
+#define	  lbxsz_VisibilityEvent		12
+#define	lbxupsz_VisibilityEvent		9
+
+#define	  lbxsz_CreateNotifyEvent	24
+#define	lbxupsz_CreateNotifyEvent	23
+
+#define	  lbxsz_DestroyNotifyEvent	12
+#define	lbxupsz_DestroyNotifyEvent	12
+
+#define	  lbxsz_UnmapNotifyEvent	16
+#define	lbxupsz_UnmapNotifyEvent	13
+
+#define	  lbxsz_MapNotifyEvent		16
+#define	lbxupsz_MapNotifyEvent		13
+
+#define	  lbxsz_MapRequestEvent		12
+#define	lbxupsz_MapRequestEvent		12
+
+#define	  lbxsz_ReparentEvent		24
+#define	lbxupsz_ReparentEvent		21
+
+#define	  lbxsz_ConfigureNotifyEvent	28
+#define	lbxupsz_ConfigureNotifyEvent	27
+
+#define	  lbxsz_ConfigureRequestEvent	28
+#define	lbxupsz_ConfigureRequestEvent	28
+
+#define	  lbxsz_GravityEvent		16
+#define	lbxupsz_GravityEvent		16
+
+#define	  lbxsz_ResizeRequestEvent	12
+#define	lbxupsz_ResizeRequestEvent	12
+
+#define	  lbxsz_CirculateEvent		20
+#define	lbxupsz_CirculateEvent		17
+
+#define	  lbxsz_PropertyEvent		20
+#define	lbxupsz_PropertyEvent		17
+
+#define	  lbxsz_SelectionClearEvent	16
+#define	lbxupsz_SelectionClearEvent	16
+
+#define	  lbxsz_SelectionRequestEvent	28
+#define	lbxupsz_SelectionRequestEvent	28
+
+#define	  lbxsz_SelectionNotifyEvent	24
+#define	lbxupsz_SelectionNotifyEvent	24
+
+#define	  lbxsz_ColormapEvent		16
+#define	lbxupsz_ColormapEvent		14
+
+#define	  lbxsz_MappingNotifyEvent	8
+#define	lbxupsz_MappingNotifyEvent	7
+
+#define	  lbxsz_ClientMessageEvent	32
+#define	lbxupsz_ClientMessageEvent	32
+
+#define	lbxsz_UnknownEvent		32
+
+#ifdef DEBUG
+
+#define DBG_SWITCH	0x00000001
+#define DBG_CLOSE	0x00000002
+#define DBG_IO		0x00000004
+#define DBG_READ_REQ	0x00000008
+#define DBG_LEN		0x00000010
+#define DBG_BLOCK	0x00000020
+#define DBG_CLIENT	0x00000040
+#define DBG_DELTA	0x00000080
+#endif
+/*
+ * Cancel the previous redefinition of the basic types, thus restoring their
+ * X.h definitions.
+ */
+
+#undef XID
+#undef Atom
+#undef Colormap
+#undef Drawable
+#undef VisualID
+#undef Window
+
+#endif	/* _LBXPROTO_H_ */
diff --git a/X11/extensions/mitmiscconst.h b/X11/extensions/mitmiscconst.h
index 2e382747a..adc5f9420 100644
--- a/X11/extensions/mitmiscconst.h
+++ b/X11/extensions/mitmiscconst.h
@@ -1,38 +1,38 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */

-

-

-#ifndef _MITMISCCONST_H_

-#define _MITMISCCONST_H_

-

-#define MITMiscNumberEvents		0

-#define MITMiscNumberErrors		0

-

-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"

-

-#endif

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
+
+
+#ifndef _MITMISCCONST_H_
+#define _MITMISCCONST_H_
+
+#define MITMiscNumberEvents		0
+#define MITMiscNumberErrors		0
+
+#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+
+#endif
diff --git a/X11/extensions/mitmiscproto.h b/X11/extensions/mitmiscproto.h
index 1f2ab6a40..18c202a84 100644
--- a/X11/extensions/mitmiscproto.h
+++ b/X11/extensions/mitmiscproto.h
@@ -1,68 +1,68 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */

-

-#ifndef _MITMISCPROTO_H_

-#define _MITMISCPROTO_H_

-

-#include <X11/extensions/mitmiscconst.h>

-

-#define X_MITSetBugMode			0

-#define X_MITGetBugMode			1

-

-typedef struct _SetBugMode {

-    CARD8	reqType;	/* always MITReqCode */

-    CARD8	mitReqType;	/* always X_MITSetBugMode */

-    CARD16	length B16;

-    BOOL	onOff;

-    BYTE	pad0;

-    CARD16	pad1;

-} xMITSetBugModeReq;

-#define sz_xMITSetBugModeReq	8

-

-typedef struct _GetBugMode {

-    CARD8	reqType;	/* always MITReqCode */

-    CARD8	mitReqType;	/* always X_MITGetBugMode */

-    CARD16	length B16;

-} xMITGetBugModeReq;

-#define sz_xMITGetBugModeReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    BOOL	onOff;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xMITGetBugModeReply;

-#define sz_xMITGetBugModeReply	32

-

-#endif /* _MITMISCPROTO_H_ */

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
+
+#ifndef _MITMISCPROTO_H_
+#define _MITMISCPROTO_H_
+
+#include <X11/extensions/mitmiscconst.h>
+
+#define X_MITSetBugMode			0
+#define X_MITGetBugMode			1
+
+typedef struct _SetBugMode {
+    CARD8	reqType;	/* always MITReqCode */
+    CARD8	mitReqType;	/* always X_MITSetBugMode */
+    CARD16	length B16;
+    BOOL	onOff;
+    BYTE	pad0;
+    CARD16	pad1;
+} xMITSetBugModeReq;
+#define sz_xMITSetBugModeReq	8
+
+typedef struct _GetBugMode {
+    CARD8	reqType;	/* always MITReqCode */
+    CARD8	mitReqType;	/* always X_MITGetBugMode */
+    CARD16	length B16;
+} xMITGetBugModeReq;
+#define sz_xMITGetBugModeReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	onOff;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xMITGetBugModeReply;
+#define sz_xMITGetBugModeReply	32
+
+#endif /* _MITMISCPROTO_H_ */
diff --git a/X11/extensions/multibufconst.h b/X11/extensions/multibufconst.h
index 328504640..2d1238c31 100644
--- a/X11/extensions/multibufconst.h
+++ b/X11/extensions/multibufconst.h
@@ -1,83 +1,83 @@
-/*

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

- */

-

-#ifndef _MULTIBUFCONST_H_

-#define _MULTIBUFCONST_H_

-

-#define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering"

-

-#define MULTIBUFFER_MAJOR_VERSION	1	/* current version numbers */

-#define MULTIBUFFER_MINOR_VERSION	1	/* has ClearImageBufferArea */

-

-/*

- * update_action field

- */

-#define MultibufferUpdateActionUndefined	0

-#define MultibufferUpdateActionBackground	1

-#define MultibufferUpdateActionUntouched	2

-#define MultibufferUpdateActionCopied		3

-

-/*

- * update_hint field

- */

-#define MultibufferUpdateHintFrequent		0

-#define MultibufferUpdateHintIntermittent	1

-#define MultibufferUpdateHintStatic		2

-

-/*

- * valuemask fields

- */

-#define MultibufferWindowUpdateHint	(1L << 0)

-#define MultibufferBufferEventMask	(1L << 0)

-

-/*

- * mono vs. stereo and left vs. right

- */

-#define MultibufferModeMono		0

-#define MultibufferModeStereo		1

-#define MultibufferSideMono		0

-#define MultibufferSideLeft	  	1

-#define MultibufferSideRight		2

-

-/*

- * clobber state

- */

-#define MultibufferUnclobbered		0

-#define MultibufferPartiallyClobbered	1

-#define MultibufferFullyClobbered	2

-

-/*

- * event stuff

- */

-#define MultibufferClobberNotifyMask	0x02000000

-#define MultibufferUpdateNotifyMask	0x04000000

-

-#define MultibufferClobberNotify	0

-#define MultibufferUpdateNotify		1

-#define MultibufferNumberEvents		(MultibufferUpdateNotify + 1)

-

-#define MultibufferBadBuffer		0

-#define MultibufferNumberErrors		(MultibufferBadBuffer + 1)

-

-#endif /* _MULTIBUFCONST_H_ */

+/*
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+ */
+
+#ifndef _MULTIBUFCONST_H_
+#define _MULTIBUFCONST_H_
+
+#define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering"
+
+#define MULTIBUFFER_MAJOR_VERSION	1	/* current version numbers */
+#define MULTIBUFFER_MINOR_VERSION	1	/* has ClearImageBufferArea */
+
+/*
+ * update_action field
+ */
+#define MultibufferUpdateActionUndefined	0
+#define MultibufferUpdateActionBackground	1
+#define MultibufferUpdateActionUntouched	2
+#define MultibufferUpdateActionCopied		3
+
+/*
+ * update_hint field
+ */
+#define MultibufferUpdateHintFrequent		0
+#define MultibufferUpdateHintIntermittent	1
+#define MultibufferUpdateHintStatic		2
+
+/*
+ * valuemask fields
+ */
+#define MultibufferWindowUpdateHint	(1L << 0)
+#define MultibufferBufferEventMask	(1L << 0)
+
+/*
+ * mono vs. stereo and left vs. right
+ */
+#define MultibufferModeMono		0
+#define MultibufferModeStereo		1
+#define MultibufferSideMono		0
+#define MultibufferSideLeft	  	1
+#define MultibufferSideRight		2
+
+/*
+ * clobber state
+ */
+#define MultibufferUnclobbered		0
+#define MultibufferPartiallyClobbered	1
+#define MultibufferFullyClobbered	2
+
+/*
+ * event stuff
+ */
+#define MultibufferClobberNotifyMask	0x02000000
+#define MultibufferUpdateNotifyMask	0x04000000
+
+#define MultibufferClobberNotify	0
+#define MultibufferUpdateNotify		1
+#define MultibufferNumberEvents		(MultibufferUpdateNotify + 1)
+
+#define MultibufferBadBuffer		0
+#define MultibufferNumberErrors		(MultibufferBadBuffer + 1)
+
+#endif /* _MULTIBUFCONST_H_ */
diff --git a/X11/extensions/multibufproto.h b/X11/extensions/multibufproto.h
index a42ef72a3..e2184d3a8 100644
--- a/X11/extensions/multibufproto.h
+++ b/X11/extensions/multibufproto.h
@@ -1,295 +1,295 @@
-/*

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

- */

-

-#ifndef _MULTIBUFPROTO_H_

-#define _MULTIBUFPROTO_H_

-

-#include <X11/extensions/multibufconst.h>

-

-/*

- * Protocol requests constants and alignment values

- */

-

-#define Window CARD32

-#define Drawable CARD32

-#define VisualID CARD32

-#define Multibuffer CARD32

-

-#define X_MbufGetBufferVersion		0

-#define X_MbufCreateImageBuffers	1

-#define X_MbufDestroyImageBuffers	2

-#define X_MbufDisplayImageBuffers	3

-#define X_MbufSetMBufferAttributes	4

-#define X_MbufGetMBufferAttributes	5

-#define X_MbufSetBufferAttributes	6

-#define X_MbufGetBufferAttributes	7

-#define X_MbufGetBufferInfo		8

-#define X_MbufCreateStereoWindow	9

-#define X_MbufClearImageBufferArea	10

-

-

-typedef struct xMbufBufferInfo {

-	CARD32	visualID B32;		/* associated visual */

-	CARD16	maxBuffers B16;		/* maximum supported buffers */

-	CARD8	depth;			/* depth of visual (redundant) */

-	CARD8	unused;

-} xMbufBufferInfo;

-#define sz_xMbufBufferInfo 8

-

-typedef struct {

-    BYTE    type;

-    BYTE    unused;

-    CARD16  sequenceNumber B16;

-    CARD32  buffer B32;			/* affected buffer */

-    BYTE    state;			/* current status */

-    CARD8   unused1;

-    CARD16  unused2 B16;

-    CARD32  unused3 B32;

-    CARD32  unused4 B32;

-    CARD32  unused5 B32;

-    CARD32  unused6 B32;

-    CARD32  unused7 B32;

-} xMbufClobberNotifyEvent;

-

-typedef struct {

-    BYTE    type;

-    BYTE    unused;

-    CARD16  sequenceNumber B16;

-    CARD32  buffer B32;			/* affected buffer */

-    CARD32  timeStamp B32;		/* update time */

-    CARD32  unused1 B32;

-    CARD32  unused2 B32;

-    CARD32  unused3 B32;

-    CARD32  unused4 B32;

-    CARD32  unused5 B32;

-    CARD32  unused6 B32;

-} xMbufUpdateNotifyEvent;

-

-typedef struct {

-    CARD8	reqType;		/* always codes->major_opcode */

-    CARD8	mbufReqType;		/* always X_MbufGetBufferVersion */

-    CARD16	length B16;

-} xMbufGetBufferVersionReq;

-#define sz_xMbufGetBufferVersionReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	unused;			/* not used */

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD8	majorVersion;	/* major version of Multi-Buffering protocol */

-    CARD8	minorVersion;	/* minor version of Multi-Buffering protocol */

-    CARD16	pad1 B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xMbufGetBufferVersionReply;

-#define sz_xMbufGetBufferVersionReply	32

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufCreateImageBuffers */

-    CARD16	length B16;

-    CARD32	window B32;	/* associated window */

-    CARD8	updateAction;	/* action at update */

-    CARD8	updateHint;	/* hint as to frequency of updates */

-    CARD16	unused;

-} xMbufCreateImageBuffersReq;	/* followed by buffer ids */

-#define sz_xMbufCreateImageBuffersReq	12

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	unused;			/* not used */

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	numberBuffer B16;	/* number successfully allocated */

-    CARD16	unused1 B16;

-    CARD32	unused2 B32;

-    CARD32	unused3 B32;

-    CARD32	unused4 B32;

-    CARD32	unused5 B32;

-    CARD32	unused6 B32;

-} xMbufCreateImageBuffersReply;

-#define sz_xMbufCreateImageBuffersReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufDestroyImageBuffers */

-    CARD16	length B16;

-    CARD32	window B32;	/* associated window */

-} xMbufDestroyImageBuffersReq;

-#define sz_xMbufDestroyImageBuffersReq	8

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufDisplayImageBuffers */

-    CARD16	length B16;

-    CARD16	minDelay B16;	/* minimum time between last update and now */

-    CARD16	maxDelay B16;	/* maximum time between last update and now */

-} xMbufDisplayImageBuffersReq;	/* followed by list of buffers */

-#define sz_xMbufDisplayImageBuffersReq	8

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufSetMBufferAttributes */

-    CARD16	length B16;

-    CARD32	window B32;	/* associated window */

-    CARD32	valueMask B32;	/* modified entries */

-} xMbufSetMBufferAttributesReq;	/* followed by values */

-#define sz_xMbufSetMBufferAttributesReq 12

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufGetMBufferAttributes */

-    CARD16	length B16;

-    CARD32	window B32;	/* associated window */

-} xMbufGetMBufferAttributesReq;

-#define sz_xMbufGetMBufferAttributesReq 8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	unused;			/* not used */

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	displayedBuffer B16;	/* currently visible buffer */

-    CARD8	updateAction;

-    CARD8	updateHint;

-    CARD8	windowMode;

-    CARD8	unused0;

-    CARD16	unused1 B16;

-    CARD32	unused2 B32;

-    CARD32	unused3 B32;

-    CARD32	unused4 B32;

-    CARD32	unused5 B32;

-} xMbufGetMBufferAttributesReply;

-#define sz_xMbufGetMBufferAttributesReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufSetBufferAttributes */

-    CARD16	length B16;

-    CARD32	buffer B32;

-    CARD32	valueMask B32;

-} xMbufSetBufferAttributesReq;	/* followed by values */

-#define sz_xMbufSetBufferAttributesReq 12

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufGetBufferAttributes */

-    CARD16	length B16;

-    CARD32	buffer B32;

-} xMbufGetBufferAttributesReq;

-#define sz_xMbufGetBufferAttributesReq 8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	unused;			/* not used */

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	window B32;

-    CARD32	eventMask B32;

-    CARD16	bufferIndex B16;

-    CARD8	side;

-    CARD8	unused0;

-    CARD32	unused1 B32;

-    CARD32	unused2 B32;

-    CARD32	unused3 B32;

-} xMbufGetBufferAttributesReply;

-#define sz_xMbufGetBufferAttributesReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufGetBufferInfo */

-    CARD16	length B16;

-    Drawable	drawable B32;

-} xMbufGetBufferInfoReq;

-#define sz_xMbufGetBufferInfoReq 8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	unused;			/* not used */

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	normalInfo B16;

-    CARD16	stereoInfo B16;

-    CARD32	unused1 B32;

-    CARD32	unused2 B32;

-    CARD32	unused3 B32;

-    CARD32	unused4 B32;

-    CARD32	unused5 B32;

-} xMbufGetBufferInfoReply;			/* followed by buffer infos */

-#define sz_xMbufGetBufferInfoReply 32

-

-

-typedef struct {

-    CARD8	reqType;	/* always codes->major_opcode */

-    CARD8	mbufReqType;	/* always X_MbufCreateStereoWindow */

-    CARD16	length B16;

-    CARD8	unused0;

-    CARD8	unused1;

-    CARD8	unused2;

-    CARD8	depth;

-    Window	wid B32;

-    Window	parent B32;

-    Multibuffer	left B32;	/* associated buffers */

-    Multibuffer	right B32;

-    INT16	x B16;

-    INT16	y B16;

-    CARD16	width B16;

-    CARD16	height B16;

-    CARD16	borderWidth B16;

-#if defined(__cplusplus) || defined(c_plusplus)

-    CARD16	c_class B16;

-#else

-    CARD16	class B16;

-#endif

-    VisualID	visual B32;

-    CARD32	mask B32;

-} xMbufCreateStereoWindowReq;		/* followed by value list */

-#define sz_xMbufCreateStereoWindowReq 44

-

-typedef struct {

-    CARD8     reqType;        /* always codes->major_opcode */

-    CARD8     mbufReqType;    /* always X_MbufClearImageBufferArea */

-    CARD16    length B16;

-    Multibuffer       buffer B32;

-    INT16     x B16;

-    INT16     y B16;

-    CARD16    width B16;

-    CARD16    height B16;

-    CARD8     unused0;

-    CARD8     unused1;

-    CARD8     unused2;

-    BOOL      exposures;

-} xMbufClearImageBufferAreaReq;

-#define sz_xMbufClearImageBufferAreaReq 20

-

-#undef Window

-#undef Drawable

-#undef VisualID

-#undef Multibuffer

-

-#endif /* _MULTIBUFPROTO_H_ */

+/*
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+ */
+
+#ifndef _MULTIBUFPROTO_H_
+#define _MULTIBUFPROTO_H_
+
+#include <X11/extensions/multibufconst.h>
+
+/*
+ * Protocol requests constants and alignment values
+ */
+
+#define Window CARD32
+#define Drawable CARD32
+#define VisualID CARD32
+#define Multibuffer CARD32
+
+#define X_MbufGetBufferVersion		0
+#define X_MbufCreateImageBuffers	1
+#define X_MbufDestroyImageBuffers	2
+#define X_MbufDisplayImageBuffers	3
+#define X_MbufSetMBufferAttributes	4
+#define X_MbufGetMBufferAttributes	5
+#define X_MbufSetBufferAttributes	6
+#define X_MbufGetBufferAttributes	7
+#define X_MbufGetBufferInfo		8
+#define X_MbufCreateStereoWindow	9
+#define X_MbufClearImageBufferArea	10
+
+
+typedef struct xMbufBufferInfo {
+	CARD32	visualID B32;		/* associated visual */
+	CARD16	maxBuffers B16;		/* maximum supported buffers */
+	CARD8	depth;			/* depth of visual (redundant) */
+	CARD8	unused;
+} xMbufBufferInfo;
+#define sz_xMbufBufferInfo 8
+
+typedef struct {
+    BYTE    type;
+    BYTE    unused;
+    CARD16  sequenceNumber B16;
+    CARD32  buffer B32;			/* affected buffer */
+    BYTE    state;			/* current status */
+    CARD8   unused1;
+    CARD16  unused2 B16;
+    CARD32  unused3 B32;
+    CARD32  unused4 B32;
+    CARD32  unused5 B32;
+    CARD32  unused6 B32;
+    CARD32  unused7 B32;
+} xMbufClobberNotifyEvent;
+
+typedef struct {
+    BYTE    type;
+    BYTE    unused;
+    CARD16  sequenceNumber B16;
+    CARD32  buffer B32;			/* affected buffer */
+    CARD32  timeStamp B32;		/* update time */
+    CARD32  unused1 B32;
+    CARD32  unused2 B32;
+    CARD32  unused3 B32;
+    CARD32  unused4 B32;
+    CARD32  unused5 B32;
+    CARD32  unused6 B32;
+} xMbufUpdateNotifyEvent;
+
+typedef struct {
+    CARD8	reqType;		/* always codes->major_opcode */
+    CARD8	mbufReqType;		/* always X_MbufGetBufferVersion */
+    CARD16	length B16;
+} xMbufGetBufferVersionReq;
+#define sz_xMbufGetBufferVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;			/* not used */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	majorVersion;	/* major version of Multi-Buffering protocol */
+    CARD8	minorVersion;	/* minor version of Multi-Buffering protocol */
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xMbufGetBufferVersionReply;
+#define sz_xMbufGetBufferVersionReply	32
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufCreateImageBuffers */
+    CARD16	length B16;
+    CARD32	window B32;	/* associated window */
+    CARD8	updateAction;	/* action at update */
+    CARD8	updateHint;	/* hint as to frequency of updates */
+    CARD16	unused;
+} xMbufCreateImageBuffersReq;	/* followed by buffer ids */
+#define sz_xMbufCreateImageBuffersReq	12
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;			/* not used */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	numberBuffer B16;	/* number successfully allocated */
+    CARD16	unused1 B16;
+    CARD32	unused2 B32;
+    CARD32	unused3 B32;
+    CARD32	unused4 B32;
+    CARD32	unused5 B32;
+    CARD32	unused6 B32;
+} xMbufCreateImageBuffersReply;
+#define sz_xMbufCreateImageBuffersReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufDestroyImageBuffers */
+    CARD16	length B16;
+    CARD32	window B32;	/* associated window */
+} xMbufDestroyImageBuffersReq;
+#define sz_xMbufDestroyImageBuffersReq	8
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufDisplayImageBuffers */
+    CARD16	length B16;
+    CARD16	minDelay B16;	/* minimum time between last update and now */
+    CARD16	maxDelay B16;	/* maximum time between last update and now */
+} xMbufDisplayImageBuffersReq;	/* followed by list of buffers */
+#define sz_xMbufDisplayImageBuffersReq	8
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufSetMBufferAttributes */
+    CARD16	length B16;
+    CARD32	window B32;	/* associated window */
+    CARD32	valueMask B32;	/* modified entries */
+} xMbufSetMBufferAttributesReq;	/* followed by values */
+#define sz_xMbufSetMBufferAttributesReq 12
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufGetMBufferAttributes */
+    CARD16	length B16;
+    CARD32	window B32;	/* associated window */
+} xMbufGetMBufferAttributesReq;
+#define sz_xMbufGetMBufferAttributesReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;			/* not used */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	displayedBuffer B16;	/* currently visible buffer */
+    CARD8	updateAction;
+    CARD8	updateHint;
+    CARD8	windowMode;
+    CARD8	unused0;
+    CARD16	unused1 B16;
+    CARD32	unused2 B32;
+    CARD32	unused3 B32;
+    CARD32	unused4 B32;
+    CARD32	unused5 B32;
+} xMbufGetMBufferAttributesReply;
+#define sz_xMbufGetMBufferAttributesReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufSetBufferAttributes */
+    CARD16	length B16;
+    CARD32	buffer B32;
+    CARD32	valueMask B32;
+} xMbufSetBufferAttributesReq;	/* followed by values */
+#define sz_xMbufSetBufferAttributesReq 12
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufGetBufferAttributes */
+    CARD16	length B16;
+    CARD32	buffer B32;
+} xMbufGetBufferAttributesReq;
+#define sz_xMbufGetBufferAttributesReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;			/* not used */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	window B32;
+    CARD32	eventMask B32;
+    CARD16	bufferIndex B16;
+    CARD8	side;
+    CARD8	unused0;
+    CARD32	unused1 B32;
+    CARD32	unused2 B32;
+    CARD32	unused3 B32;
+} xMbufGetBufferAttributesReply;
+#define sz_xMbufGetBufferAttributesReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufGetBufferInfo */
+    CARD16	length B16;
+    Drawable	drawable B32;
+} xMbufGetBufferInfoReq;
+#define sz_xMbufGetBufferInfoReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	unused;			/* not used */
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	normalInfo B16;
+    CARD16	stereoInfo B16;
+    CARD32	unused1 B32;
+    CARD32	unused2 B32;
+    CARD32	unused3 B32;
+    CARD32	unused4 B32;
+    CARD32	unused5 B32;
+} xMbufGetBufferInfoReply;			/* followed by buffer infos */
+#define sz_xMbufGetBufferInfoReply 32
+
+
+typedef struct {
+    CARD8	reqType;	/* always codes->major_opcode */
+    CARD8	mbufReqType;	/* always X_MbufCreateStereoWindow */
+    CARD16	length B16;
+    CARD8	unused0;
+    CARD8	unused1;
+    CARD8	unused2;
+    CARD8	depth;
+    Window	wid B32;
+    Window	parent B32;
+    Multibuffer	left B32;	/* associated buffers */
+    Multibuffer	right B32;
+    INT16	x B16;
+    INT16	y B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD16	borderWidth B16;
+#if defined(__cplusplus) || defined(c_plusplus)
+    CARD16	c_class B16;
+#else
+    CARD16	class B16;
+#endif
+    VisualID	visual B32;
+    CARD32	mask B32;
+} xMbufCreateStereoWindowReq;		/* followed by value list */
+#define sz_xMbufCreateStereoWindowReq 44
+
+typedef struct {
+    CARD8     reqType;        /* always codes->major_opcode */
+    CARD8     mbufReqType;    /* always X_MbufClearImageBufferArea */
+    CARD16    length B16;
+    Multibuffer       buffer B32;
+    INT16     x B16;
+    INT16     y B16;
+    CARD16    width B16;
+    CARD16    height B16;
+    CARD8     unused0;
+    CARD8     unused1;
+    CARD8     unused2;
+    BOOL      exposures;
+} xMbufClearImageBufferAreaReq;
+#define sz_xMbufClearImageBufferAreaReq 20
+
+#undef Window
+#undef Drawable
+#undef VisualID
+#undef Multibuffer
+
+#endif /* _MULTIBUFPROTO_H_ */
diff --git a/X11/extensions/secur.h b/X11/extensions/secur.h
index 3721672da..ca27b29e6 100644
--- a/X11/extensions/secur.h
+++ b/X11/extensions/secur.h
@@ -1,61 +1,61 @@
-/*

-Copyright 1996, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-*/

-

-#ifndef _SECUR_H

-#define _SECUR_H

-

-#define SECURITY_EXTENSION_NAME		"SECURITY"

-#define SECURITY_MAJOR_VERSION		1

-#define SECURITY_MINOR_VERSION		0

-

-#define XSecurityNumberEvents		1

-#define XSecurityNumberErrors		2

-#define XSecurityBadAuthorization	0

-#define XSecurityBadAuthorizationProtocol 1

-

-/* trust levels */

-#define XSecurityClientTrusted		0

-#define XSecurityClientUntrusted	1

-

-/* authorization attribute masks */

-#define XSecurityTimeout		(1<<0)

-#define XSecurityTrustLevel		(1<<1)

-#define XSecurityGroup  		(1<<2)

-#define XSecurityEventMask		(1<<3)

-#define XSecurityAllAuthorizationAttributes \

- (XSecurityTimeout | XSecurityTrustLevel | XSecurityGroup | XSecurityEventMask)

-

-/* event masks */

-#define XSecurityAuthorizationRevokedMask (1<<0)

-#define XSecurityAllEventMasks XSecurityAuthorizationRevokedMask

-

-/* event offsets */

-#define XSecurityAuthorizationRevoked 0

-

-#define XSecurityAuthorizationName	"XC-QUERY-SECURITY-1"

-#define XSecurityAuthorizationNameLen	19

-

-#endif /* _SECUR_H */

+/*
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+*/
+
+#ifndef _SECUR_H
+#define _SECUR_H
+
+#define SECURITY_EXTENSION_NAME		"SECURITY"
+#define SECURITY_MAJOR_VERSION		1
+#define SECURITY_MINOR_VERSION		0
+
+#define XSecurityNumberEvents		1
+#define XSecurityNumberErrors		2
+#define XSecurityBadAuthorization	0
+#define XSecurityBadAuthorizationProtocol 1
+
+/* trust levels */
+#define XSecurityClientTrusted		0
+#define XSecurityClientUntrusted	1
+
+/* authorization attribute masks */
+#define XSecurityTimeout		(1<<0)
+#define XSecurityTrustLevel		(1<<1)
+#define XSecurityGroup  		(1<<2)
+#define XSecurityEventMask		(1<<3)
+#define XSecurityAllAuthorizationAttributes \
+ (XSecurityTimeout | XSecurityTrustLevel | XSecurityGroup | XSecurityEventMask)
+
+/* event masks */
+#define XSecurityAuthorizationRevokedMask (1<<0)
+#define XSecurityAllEventMasks XSecurityAuthorizationRevokedMask
+
+/* event offsets */
+#define XSecurityAuthorizationRevoked 0
+
+#define XSecurityAuthorizationName	"XC-QUERY-SECURITY-1"
+#define XSecurityAuthorizationNameLen	19
+
+#endif /* _SECUR_H */
diff --git a/X11/extensions/securproto.h b/X11/extensions/securproto.h
index 56cd475cc..409a4c5d0 100644
--- a/X11/extensions/securproto.h
+++ b/X11/extensions/securproto.h
@@ -1,110 +1,110 @@
-/*

-Copyright 1996, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-*/

-

-#ifndef _SECURPROTO_H

-#define _SECURPROTO_H

-

-#include <X11/extensions/secur.h>

-

-#define X_SecurityQueryVersion		0

-#define X_SecurityGenerateAuthorization 1

-#define X_SecurityRevokeAuthorization   2

-

-typedef struct {

-    CARD8       reqType;

-    CARD8       securityReqType;

-    CARD16      length B16;

-    CARD16      majorVersion B16;

-    CARD16      minorVersion B16;

-} xSecurityQueryVersionReq;

-#define sz_xSecurityQueryVersionReq 	8

-

-typedef struct {

-    CARD8   type;

-    CARD8   pad0;

-    CARD16  sequenceNumber B16;

-    CARD32  length	 B32;

-    CARD16  majorVersion B16;

-    CARD16  minorVersion B16;

-    CARD32  pad1	 B32;

-    CARD32  pad2	 B32;

-    CARD32  pad3	 B32;

-    CARD32  pad4	 B32;

-    CARD32  pad5	 B32;

- } xSecurityQueryVersionReply;

-#define sz_xSecurityQueryVersionReply  	32

-

-typedef struct {

-    CARD8       reqType;

-    CARD8       securityReqType;

-    CARD16      length B16;

-    CARD16	nbytesAuthProto B16;

-    CARD16	nbytesAuthData B16;

-    CARD32	valueMask B32;

-    /* auth protocol name padded to 4 bytes */

-    /* auth protocol data padded to 4 bytes */

-    /* list of CARD32 values, if any */

-} xSecurityGenerateAuthorizationReq;

-#define sz_xSecurityGenerateAuthorizationReq 12

-

-typedef struct {

-    CARD8   type;

-    CARD8   pad0;

-    CARD16  sequenceNumber B16;

-    CARD32  length	 B32;

-    CARD32  authId	 B32;

-    CARD16  dataLength   B16;

-    CARD16  pad1	 B16;

-    CARD32  pad2	 B32;

-    CARD32  pad3	 B32;

-    CARD32  pad4	 B32;

-    CARD32  pad5	 B32;

- } xSecurityGenerateAuthorizationReply;

-#define sz_xSecurityGenerateAuthorizationReply  	32

-

-typedef struct {

-    CARD8       reqType;

-    CARD8       securityReqType;

-    CARD16      length B16;

-    CARD32	authId B32;

-} xSecurityRevokeAuthorizationReq;

-#define sz_xSecurityRevokeAuthorizationReq 8

-

-typedef struct _xSecurityAuthorizationRevokedEvent {

-    BYTE	type;

-    BYTE	detail;

-    CARD16	sequenceNumber B16;

-    CARD32	authId B32;

-    CARD32	pad0	 B32;

-    CARD32	pad1	 B32;

-    CARD32	pad2	 B32;

-    CARD32	pad3	 B32;

-    CARD32	pad4	 B32;

-    CARD32	pad5	 B32;

-} xSecurityAuthorizationRevokedEvent;

-#define sz_xSecurityAuthorizationRevokedEvent 32

-

-#endif /* _SECURPROTO_H */

+/*
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+*/
+
+#ifndef _SECURPROTO_H
+#define _SECURPROTO_H
+
+#include <X11/extensions/secur.h>
+
+#define X_SecurityQueryVersion		0
+#define X_SecurityGenerateAuthorization 1
+#define X_SecurityRevokeAuthorization   2
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       securityReqType;
+    CARD16      length B16;
+    CARD16      majorVersion B16;
+    CARD16      minorVersion B16;
+} xSecurityQueryVersionReq;
+#define sz_xSecurityQueryVersionReq 	8
+
+typedef struct {
+    CARD8   type;
+    CARD8   pad0;
+    CARD16  sequenceNumber B16;
+    CARD32  length	 B32;
+    CARD16  majorVersion B16;
+    CARD16  minorVersion B16;
+    CARD32  pad1	 B32;
+    CARD32  pad2	 B32;
+    CARD32  pad3	 B32;
+    CARD32  pad4	 B32;
+    CARD32  pad5	 B32;
+ } xSecurityQueryVersionReply;
+#define sz_xSecurityQueryVersionReply  	32
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       securityReqType;
+    CARD16      length B16;
+    CARD16	nbytesAuthProto B16;
+    CARD16	nbytesAuthData B16;
+    CARD32	valueMask B32;
+    /* auth protocol name padded to 4 bytes */
+    /* auth protocol data padded to 4 bytes */
+    /* list of CARD32 values, if any */
+} xSecurityGenerateAuthorizationReq;
+#define sz_xSecurityGenerateAuthorizationReq 12
+
+typedef struct {
+    CARD8   type;
+    CARD8   pad0;
+    CARD16  sequenceNumber B16;
+    CARD32  length	 B32;
+    CARD32  authId	 B32;
+    CARD16  dataLength   B16;
+    CARD16  pad1	 B16;
+    CARD32  pad2	 B32;
+    CARD32  pad3	 B32;
+    CARD32  pad4	 B32;
+    CARD32  pad5	 B32;
+ } xSecurityGenerateAuthorizationReply;
+#define sz_xSecurityGenerateAuthorizationReply  	32
+
+typedef struct {
+    CARD8       reqType;
+    CARD8       securityReqType;
+    CARD16      length B16;
+    CARD32	authId B32;
+} xSecurityRevokeAuthorizationReq;
+#define sz_xSecurityRevokeAuthorizationReq 8
+
+typedef struct _xSecurityAuthorizationRevokedEvent {
+    BYTE	type;
+    BYTE	detail;
+    CARD16	sequenceNumber B16;
+    CARD32	authId B32;
+    CARD32	pad0	 B32;
+    CARD32	pad1	 B32;
+    CARD32	pad2	 B32;
+    CARD32	pad3	 B32;
+    CARD32	pad4	 B32;
+    CARD32	pad5	 B32;
+} xSecurityAuthorizationRevokedEvent;
+#define sz_xSecurityAuthorizationRevokedEvent 32
+
+#endif /* _SECURPROTO_H */
diff --git a/X11/extensions/shapeconst.h b/X11/extensions/shapeconst.h
index 75b541951..9088956f1 100644
--- a/X11/extensions/shapeconst.h
+++ b/X11/extensions/shapeconst.h
@@ -1,55 +1,55 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-#ifndef _SHAPECONST_H_

-#define _SHAPECONST_H_

-

-/*

- * Protocol requests constants and alignment values

- * These would really be in SHAPE's X.h and Xproto.h equivalents

- */

-

-#define SHAPENAME "SHAPE"

-

-#define SHAPE_MAJOR_VERSION	1	/* current version numbers */

-#define SHAPE_MINOR_VERSION	1

-

-#define ShapeSet			0

-#define ShapeUnion			1

-#define ShapeIntersect			2

-#define ShapeSubtract			3

-#define ShapeInvert			4

-

-#define ShapeBounding			0

-#define ShapeClip			1

-#define ShapeInput			2

-

-#define ShapeNotifyMask			(1L << 0)

-#define ShapeNotify			0

-

-#define ShapeNumberEvents		(ShapeNotify + 1)

-

-#endif /* _SHAPECONST_H_ */

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+#ifndef _SHAPECONST_H_
+#define _SHAPECONST_H_
+
+/*
+ * Protocol requests constants and alignment values
+ * These would really be in SHAPE's X.h and Xproto.h equivalents
+ */
+
+#define SHAPENAME "SHAPE"
+
+#define SHAPE_MAJOR_VERSION	1	/* current version numbers */
+#define SHAPE_MINOR_VERSION	1
+
+#define ShapeSet			0
+#define ShapeUnion			1
+#define ShapeIntersect			2
+#define ShapeSubtract			3
+#define ShapeInvert			4
+
+#define ShapeBounding			0
+#define ShapeClip			1
+#define ShapeInput			2
+
+#define ShapeNotifyMask			(1L << 0)
+#define ShapeNotify			0
+
+#define ShapeNumberEvents		(ShapeNotify + 1)
+
+#endif /* _SHAPECONST_H_ */
diff --git a/X11/extensions/shapeproto.h b/X11/extensions/shapeproto.h
index aba393b0f..49bd1a1a4 100644
--- a/X11/extensions/shapeproto.h
+++ b/X11/extensions/shapeproto.h
@@ -1,237 +1,237 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-#ifndef _SHAPEPROTO_H_

-#define _SHAPEPROTO_H_

-

-#include <X11/extensions/shapeconst.h>

-

-/*

- * Protocol requests constants and alignment values

- * These would really be in SHAPE's X.h and Xproto.h equivalents

- */

-

-#define Window CARD32

-#define Time CARD32

-

-#define X_ShapeQueryVersion		0

-#define X_ShapeRectangles		1

-#define X_ShapeMask			2

-#define X_ShapeCombine			3

-#define X_ShapeOffset			4

-#define X_ShapeQueryExtents		5

-#define X_ShapeSelectInput		6

-#define X_ShapeInputSelected		7

-#define X_ShapeGetRectangles		8

-

-typedef struct _ShapeQueryVersion {

-	CARD8	reqType;		/* always ShapeReqCode */

-	CARD8	shapeReqType;		/* always X_ShapeQueryVersion */

-	CARD16	length B16;

-} xShapeQueryVersionReq;

-#define sz_xShapeQueryVersionReq	4

-

-typedef struct {

-	BYTE	type;			/* X_Reply */

-	CARD8	unused;			/* not used */

-	CARD16	sequenceNumber B16;

-	CARD32	length B32;

-	CARD16	majorVersion B16;	/* major version of SHAPE protocol */

-	CARD16	minorVersion B16;	/* minor version of SHAPE protocol */

-	CARD32	pad0 B32;

-	CARD32	pad1 B32;

-	CARD32	pad2 B32;

-	CARD32	pad3 B32;

-	CARD32	pad4 B32;

-} xShapeQueryVersionReply;

-#define sz_xShapeQueryVersionReply	32

-

-typedef struct _ShapeRectangles {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeRectangles */

-	CARD16	length B16;

-	CARD8	op;		/* Set, ... */

-	CARD8	destKind;	/* ShapeBounding or ShapeClip */

-	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */

-	CARD8	pad0;		/* not used */

-	Window	dest B32;

-	INT16	xOff B16;

-	INT16	yOff B16;

-} xShapeRectanglesReq;		/* followed by xRects */

-#define sz_xShapeRectanglesReq	16

-

-typedef struct _ShapeMask {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeMask */

-	CARD16	length B16;

-

-	CARD8	op;		/* Set, ... */

-	CARD8	destKind;	/* ShapeBounding or ShapeClip */

-	CARD16	junk B16;	/* not used */

-

-	Window	dest B32;

-	INT16	xOff B16;

-	INT16	yOff B16;

-	CARD32	src B32;	/* 1 bit pixmap */

-} xShapeMaskReq;

-#define sz_xShapeMaskReq	20

-

-typedef struct _ShapeCombine {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeCombine */

-	CARD16	length B16;

-	CARD8	op;		/* Set, ... */

-	CARD8	destKind;	/* ShapeBounding or ShapeClip */

-	CARD8	srcKind;	/* ShapeBounding or ShapeClip */

-	CARD8	junk;		/* not used */

-	Window	dest B32;

-	INT16	xOff B16;

-	INT16	yOff B16;

-	Window	src B32;

-} xShapeCombineReq;

-#define sz_xShapeCombineReq	20

-

-typedef struct _ShapeOffset {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeOffset */

-	CARD16	length B16;

-	CARD8	destKind;	/* ShapeBounding or ShapeClip */

-	CARD8	junk1;		/* not used */

-	CARD16	junk2 B16;	/* not used */

-	Window	dest B32;

-	INT16	xOff B16;

-	INT16	yOff B16;

-} xShapeOffsetReq;

-#define sz_xShapeOffsetReq	16

-

-typedef struct _ShapeQueryExtents {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeQueryExtents */

-	CARD16	length B16;

-	Window	window B32;

-} xShapeQueryExtentsReq;

-#define sz_xShapeQueryExtentsReq	8

-

-typedef struct {

-	BYTE	type;			/* X_Reply */

-	CARD8	unused;			/* not used */

-	CARD16	sequenceNumber B16;

-	CARD32	length B32;		/* 0 */

-	CARD8	boundingShaped;		/* window has bounding shape */

-	CARD8	clipShaped;		/* window has clip shape */

-	CARD16	unused1 B16;

-	INT16	xBoundingShape B16;	/* extents of bounding shape */

-	INT16	yBoundingShape B16;

-	CARD16	widthBoundingShape B16;

-	CARD16	heightBoundingShape B16;

-	INT16	xClipShape B16;		/* extents of clip shape */

-	INT16	yClipShape B16;

-	CARD16	widthClipShape B16;

-	CARD16	heightClipShape B16;

-	CARD32	pad1 B32;

-} xShapeQueryExtentsReply;

-#define sz_xShapeQueryExtentsReply	32

-

-typedef struct _ShapeSelectInput {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeSelectInput */

-	CARD16	length B16;

-	Window	window B32;

-	BYTE	enable;		/* xTrue -> send events */

-	BYTE	pad1;

-	CARD16	pad2 B16;

-} xShapeSelectInputReq;

-#define sz_xShapeSelectInputReq	12

-

-typedef struct _ShapeNotify {

-	BYTE	type;		/* always eventBase + ShapeNotify */

-	BYTE	kind;		/* either ShapeBounding or ShapeClip */

-	CARD16	sequenceNumber B16;

-	Window	window B32;

-	INT16	x B16;

-	INT16	y B16;		/* extents of new shape */

-	CARD16	width B16;

-	CARD16	height B16;

-	Time	time B32;	/* time of change */

-	BYTE	shaped;		/* set when a shape actual exists */

-	BYTE	pad0;

-	CARD16	pad1 B16;

-	CARD32	pad2 B32;

-	CARD32	pad3 B32;

-} xShapeNotifyEvent;

-#define sz_xShapeNotifyEvent	32

-

-typedef struct _ShapeInputSelected {

-	CARD8	reqType;	/* always ShapeReqCode */

-	CARD8	shapeReqType;	/* always X_ShapeInputSelected */

-	CARD16	length B16;

-	Window	window B32;

-} xShapeInputSelectedReq;

-#define sz_xShapeInputSelectedReq 8

-

-typedef struct {

-	BYTE	type;			/* X_Reply */

-	CARD8	enabled;		/* current status */

-	CARD16	sequenceNumber B16;

-	CARD32	length B32;		/* 0 */

-	CARD32	pad1 B32;		/* unused */

-	CARD32	pad2 B32;

-	CARD32	pad3 B32;

-	CARD32	pad4 B32;

-	CARD32	pad5 B32;

-	CARD32	pad6 B32;

-} xShapeInputSelectedReply;

-#define sz_xShapeInputSelectedReply	32

-

-typedef struct _ShapeGetRectangles {

-    CARD8   reqType;		/* always ShapeReqCode */

-    CARD8   shapeReqType;	/* always X_ShapeGetRectangles */

-    CARD16  length B16;

-    Window  window B32;

-    CARD8   kind;		/* ShapeBounding or ShapeClip */

-    CARD8   junk1;

-    CARD16  junk2 B16;

-} xShapeGetRectanglesReq;

-#define sz_xShapeGetRectanglesReq	12

-

-typedef struct {

-	BYTE	type;			/* X_Reply */

-	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */

-	CARD16	sequenceNumber B16;

-	CARD32	length B32;		/* not zero */

-	CARD32	nrects B32;		/* number of rectangles */

-	CARD32 pad1 B32;

-	CARD32 pad2 B32;

-	CARD32 pad3 B32;

-	CARD32 pad4 B32;

-	CARD32 pad5 B32;

-} xShapeGetRectanglesReply;		/* followed by xRectangles */

-#define sz_xShapeGetRectanglesReply 32

-

-#undef Window

-#undef Time

-

-#endif /* _SHAPEPROTO_H_ */

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+#ifndef _SHAPEPROTO_H_
+#define _SHAPEPROTO_H_
+
+#include <X11/extensions/shapeconst.h>
+
+/*
+ * Protocol requests constants and alignment values
+ * These would really be in SHAPE's X.h and Xproto.h equivalents
+ */
+
+#define Window CARD32
+#define Time CARD32
+
+#define X_ShapeQueryVersion		0
+#define X_ShapeRectangles		1
+#define X_ShapeMask			2
+#define X_ShapeCombine			3
+#define X_ShapeOffset			4
+#define X_ShapeQueryExtents		5
+#define X_ShapeSelectInput		6
+#define X_ShapeInputSelected		7
+#define X_ShapeGetRectangles		8
+
+typedef struct _ShapeQueryVersion {
+	CARD8	reqType;		/* always ShapeReqCode */
+	CARD8	shapeReqType;		/* always X_ShapeQueryVersion */
+	CARD16	length B16;
+} xShapeQueryVersionReq;
+#define sz_xShapeQueryVersionReq	4
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD16	majorVersion B16;	/* major version of SHAPE protocol */
+	CARD16	minorVersion B16;	/* minor version of SHAPE protocol */
+	CARD32	pad0 B32;
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+} xShapeQueryVersionReply;
+#define sz_xShapeQueryVersionReply	32
+
+typedef struct _ShapeRectangles {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeRectangles */
+	CARD16	length B16;
+	CARD8	op;		/* Set, ... */
+	CARD8	destKind;	/* ShapeBounding or ShapeClip */
+	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */
+	CARD8	pad0;		/* not used */
+	Window	dest B32;
+	INT16	xOff B16;
+	INT16	yOff B16;
+} xShapeRectanglesReq;		/* followed by xRects */
+#define sz_xShapeRectanglesReq	16
+
+typedef struct _ShapeMask {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeMask */
+	CARD16	length B16;
+
+	CARD8	op;		/* Set, ... */
+	CARD8	destKind;	/* ShapeBounding or ShapeClip */
+	CARD16	junk B16;	/* not used */
+
+	Window	dest B32;
+	INT16	xOff B16;
+	INT16	yOff B16;
+	CARD32	src B32;	/* 1 bit pixmap */
+} xShapeMaskReq;
+#define sz_xShapeMaskReq	20
+
+typedef struct _ShapeCombine {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeCombine */
+	CARD16	length B16;
+	CARD8	op;		/* Set, ... */
+	CARD8	destKind;	/* ShapeBounding or ShapeClip */
+	CARD8	srcKind;	/* ShapeBounding or ShapeClip */
+	CARD8	junk;		/* not used */
+	Window	dest B32;
+	INT16	xOff B16;
+	INT16	yOff B16;
+	Window	src B32;
+} xShapeCombineReq;
+#define sz_xShapeCombineReq	20
+
+typedef struct _ShapeOffset {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeOffset */
+	CARD16	length B16;
+	CARD8	destKind;	/* ShapeBounding or ShapeClip */
+	CARD8	junk1;		/* not used */
+	CARD16	junk2 B16;	/* not used */
+	Window	dest B32;
+	INT16	xOff B16;
+	INT16	yOff B16;
+} xShapeOffsetReq;
+#define sz_xShapeOffsetReq	16
+
+typedef struct _ShapeQueryExtents {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeQueryExtents */
+	CARD16	length B16;
+	Window	window B32;
+} xShapeQueryExtentsReq;
+#define sz_xShapeQueryExtentsReq	8
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;		/* 0 */
+	CARD8	boundingShaped;		/* window has bounding shape */
+	CARD8	clipShaped;		/* window has clip shape */
+	CARD16	unused1 B16;
+	INT16	xBoundingShape B16;	/* extents of bounding shape */
+	INT16	yBoundingShape B16;
+	CARD16	widthBoundingShape B16;
+	CARD16	heightBoundingShape B16;
+	INT16	xClipShape B16;		/* extents of clip shape */
+	INT16	yClipShape B16;
+	CARD16	widthClipShape B16;
+	CARD16	heightClipShape B16;
+	CARD32	pad1 B32;
+} xShapeQueryExtentsReply;
+#define sz_xShapeQueryExtentsReply	32
+
+typedef struct _ShapeSelectInput {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeSelectInput */
+	CARD16	length B16;
+	Window	window B32;
+	BYTE	enable;		/* xTrue -> send events */
+	BYTE	pad1;
+	CARD16	pad2 B16;
+} xShapeSelectInputReq;
+#define sz_xShapeSelectInputReq	12
+
+typedef struct _ShapeNotify {
+	BYTE	type;		/* always eventBase + ShapeNotify */
+	BYTE	kind;		/* either ShapeBounding or ShapeClip */
+	CARD16	sequenceNumber B16;
+	Window	window B32;
+	INT16	x B16;
+	INT16	y B16;		/* extents of new shape */
+	CARD16	width B16;
+	CARD16	height B16;
+	Time	time B32;	/* time of change */
+	BYTE	shaped;		/* set when a shape actual exists */
+	BYTE	pad0;
+	CARD16	pad1 B16;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+} xShapeNotifyEvent;
+#define sz_xShapeNotifyEvent	32
+
+typedef struct _ShapeInputSelected {
+	CARD8	reqType;	/* always ShapeReqCode */
+	CARD8	shapeReqType;	/* always X_ShapeInputSelected */
+	CARD16	length B16;
+	Window	window B32;
+} xShapeInputSelectedReq;
+#define sz_xShapeInputSelectedReq 8
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	enabled;		/* current status */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;		/* 0 */
+	CARD32	pad1 B32;		/* unused */
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+	CARD32	pad6 B32;
+} xShapeInputSelectedReply;
+#define sz_xShapeInputSelectedReply	32
+
+typedef struct _ShapeGetRectangles {
+    CARD8   reqType;		/* always ShapeReqCode */
+    CARD8   shapeReqType;	/* always X_ShapeGetRectangles */
+    CARD16  length B16;
+    Window  window B32;
+    CARD8   kind;		/* ShapeBounding or ShapeClip */
+    CARD8   junk1;
+    CARD16  junk2 B16;
+} xShapeGetRectanglesReq;
+#define sz_xShapeGetRectanglesReq	12
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	ordering;	/* UnSorted, YSorted, YXSorted, YXBanded */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;		/* not zero */
+	CARD32	nrects B32;		/* number of rectangles */
+	CARD32 pad1 B32;
+	CARD32 pad2 B32;
+	CARD32 pad3 B32;
+	CARD32 pad4 B32;
+	CARD32 pad5 B32;
+} xShapeGetRectanglesReply;		/* followed by xRectangles */
+#define sz_xShapeGetRectanglesReply 32
+
+#undef Window
+#undef Time
+
+#endif /* _SHAPEPROTO_H_ */
diff --git a/X11/extensions/shapestr.h b/X11/extensions/shapestr.h
index a5d8f6a2c..20fde1dbe 100644
--- a/X11/extensions/shapestr.h
+++ b/X11/extensions/shapestr.h
@@ -1,8 +1,8 @@
-#ifndef _SHAPESTR_H_

-#define _SHAPESTR_H_

-

-#warning "shapestr.h is obsolete and may be removed in the future."

-#warning "include <X11/extensions/shapeproto.h> for the protocol defines."

-#include <X11/extensions/shapeproto.h>

-

-#endif /* _SHAPESTR_H_ */

+#ifndef _SHAPESTR_H_
+#define _SHAPESTR_H_
+
+#warning "shapestr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/shapeproto.h> for the protocol defines."
+#include <X11/extensions/shapeproto.h>
+
+#endif /* _SHAPESTR_H_ */
diff --git a/X11/extensions/shm.h b/X11/extensions/shm.h
index cb6fac71f..e076402a8 100644
--- a/X11/extensions/shm.h
+++ b/X11/extensions/shm.h
@@ -1,44 +1,44 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */

-

-#ifndef _SHM_H_

-#define _SHM_H_

-

-#define SHMNAME "MIT-SHM"

-

-#define SHM_MAJOR_VERSION	1	/* current version numbers */

-#define SHM_MINOR_VERSION	1

-

-#define ShmCompletion			0

-#define ShmNumberEvents			(ShmCompletion + 1)

-

-#define BadShmSeg			0

-#define ShmNumberErrors			(BadShmSeg + 1)

-

-

-#endif /* _SHM_H_ */

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _SHM_H_
+#define _SHM_H_
+
+#define SHMNAME "MIT-SHM"
+
+#define SHM_MAJOR_VERSION	1	/* current version numbers */
+#define SHM_MINOR_VERSION	1
+
+#define ShmCompletion			0
+#define ShmNumberEvents			(ShmCompletion + 1)
+
+#define BadShmSeg			0
+#define ShmNumberErrors			(BadShmSeg + 1)
+
+
+#endif /* _SHM_H_ */
diff --git a/X11/extensions/shmproto.h b/X11/extensions/shmproto.h
index 808bcc45a..e5de377b9 100644
--- a/X11/extensions/shmproto.h
+++ b/X11/extensions/shmproto.h
@@ -1,187 +1,187 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */

-

-#ifndef _SHMPROTO_H_

-#define _SHMPROTO_H_

-

-#include <X11/extensions/shm.h>

-

-#define ShmSeg CARD32

-#define Drawable CARD32

-#define VisualID CARD32

-#define GContext CARD32

-#define Pixmap CARD32

-

-#define X_ShmQueryVersion		0

-#define X_ShmAttach			1

-#define X_ShmDetach			2

-#define X_ShmPutImage			3

-#define X_ShmGetImage			4

-#define X_ShmCreatePixmap		5

-

-typedef struct _ShmQueryVersion {

-    CARD8	reqType;		/* always ShmReqCode */

-    CARD8	shmReqType;		/* always X_ShmQueryVersion */

-    CARD16	length B16;

-} xShmQueryVersionReq;

-#define sz_xShmQueryVersionReq	4

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    BOOL	sharedPixmaps;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	majorVersion B16;	/* major version of SHM protocol */

-    CARD16	minorVersion B16;	/* minor version of SHM protocol */

-    CARD16	uid B16;

-    CARD16	gid B16;

-    CARD8	pixmapFormat;

-    CARD8	pad0;

-    CARD16	pad1 B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xShmQueryVersionReply;

-#define sz_xShmQueryVersionReply	32

-

-typedef struct _ShmAttach {

-    CARD8	reqType;	/* always ShmReqCode */

-    CARD8	shmReqType;	/* always X_ShmAttach */

-    CARD16	length B16;

-    ShmSeg	shmseg B32;

-    CARD32	shmid B32;

-    BOOL	readOnly;

-    BYTE	pad0;

-    CARD16	pad1 B16;

-} xShmAttachReq;

-#define sz_xShmAttachReq	16

-

-typedef struct _ShmDetach {

-    CARD8	reqType;	/* always ShmReqCode */

-    CARD8	shmReqType;	/* always X_ShmDetach */

-    CARD16	length B16;

-    ShmSeg	shmseg B32;

-} xShmDetachReq;

-#define sz_xShmDetachReq	8

-

-typedef struct _ShmPutImage {

-    CARD8	reqType;	/* always ShmReqCode */

-    CARD8	shmReqType;	/* always X_ShmPutImage */

-    CARD16	length B16;

-    Drawable	drawable B32;

-    GContext	gc B32;

-    CARD16	totalWidth B16;

-    CARD16	totalHeight B16;

-    CARD16	srcX B16;

-    CARD16	srcY B16;

-    CARD16	srcWidth B16;

-    CARD16	srcHeight B16;

-    INT16	dstX B16;

-    INT16	dstY B16;

-    CARD8	depth;

-    CARD8	format;

-    CARD8	sendEvent;

-    CARD8	bpad;

-    ShmSeg	shmseg B32;

-    CARD32	offset B32;

-} xShmPutImageReq;

-#define sz_xShmPutImageReq	40

-

-typedef struct _ShmGetImage {

-    CARD8	reqType;	/* always ShmReqCode */

-    CARD8	shmReqType;	/* always X_ShmGetImage */

-    CARD16	length B16;

-    Drawable	drawable B32;

-    INT16	x B16;

-    INT16	y B16;

-    CARD16	width B16;

-    CARD16	height B16;

-    CARD32	planeMask B32;

-    CARD8	format;

-    CARD8	pad0;

-    CARD8	pad1;

-    CARD8	pad2;

-    ShmSeg	shmseg B32;

-    CARD32	offset B32;

-} xShmGetImageReq;

-#define sz_xShmGetImageReq	32

-

-typedef struct _ShmGetImageReply {

-    BYTE	type;  /* X_Reply */

-    CARD8	depth;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    VisualID	visual B32;

-    CARD32	size B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-} xShmGetImageReply;

-#define sz_xShmGetImageReply	32

-

-typedef struct _ShmCreatePixmap {

-    CARD8	reqType;	/* always ShmReqCode */

-    CARD8	shmReqType;	/* always X_ShmCreatePixmap */

-    CARD16	length B16;

-    Pixmap	pid B32;

-    Drawable	drawable B32;

-    CARD16	width B16;

-    CARD16	height B16;

-    CARD8	depth;

-    CARD8	pad0;

-    CARD8	pad1;

-    CARD8	pad2;

-    ShmSeg	shmseg B32;

-    CARD32	offset B32;

-} xShmCreatePixmapReq;

-#define sz_xShmCreatePixmapReq 28

-

-typedef struct _ShmCompletion {

-    BYTE	type;		/* always eventBase + ShmCompletion */

-    BYTE	bpad0;

-    CARD16	sequenceNumber B16;

-    Drawable	drawable B32;

-    CARD16	minorEvent B16;

-    BYTE	majorEvent;

-    BYTE	bpad1;

-    ShmSeg	shmseg B32;

-    CARD32	offset B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-} xShmCompletionEvent;

-#define sz_xShmCompletionEvent	32

-

-#undef ShmSeg

-#undef Drawable

-#undef VisualID

-#undef GContext

-#undef Pixmap

-

-#endif /* _SHMPROTO_H_ */

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _SHMPROTO_H_
+#define _SHMPROTO_H_
+
+#include <X11/extensions/shm.h>
+
+#define ShmSeg CARD32
+#define Drawable CARD32
+#define VisualID CARD32
+#define GContext CARD32
+#define Pixmap CARD32
+
+#define X_ShmQueryVersion		0
+#define X_ShmAttach			1
+#define X_ShmDetach			2
+#define X_ShmPutImage			3
+#define X_ShmGetImage			4
+#define X_ShmCreatePixmap		5
+
+typedef struct _ShmQueryVersion {
+    CARD8	reqType;		/* always ShmReqCode */
+    CARD8	shmReqType;		/* always X_ShmQueryVersion */
+    CARD16	length B16;
+} xShmQueryVersionReq;
+#define sz_xShmQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	sharedPixmaps;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of SHM protocol */
+    CARD16	minorVersion B16;	/* minor version of SHM protocol */
+    CARD16	uid B16;
+    CARD16	gid B16;
+    CARD8	pixmapFormat;
+    CARD8	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xShmQueryVersionReply;
+#define sz_xShmQueryVersionReply	32
+
+typedef struct _ShmAttach {
+    CARD8	reqType;	/* always ShmReqCode */
+    CARD8	shmReqType;	/* always X_ShmAttach */
+    CARD16	length B16;
+    ShmSeg	shmseg B32;
+    CARD32	shmid B32;
+    BOOL	readOnly;
+    BYTE	pad0;
+    CARD16	pad1 B16;
+} xShmAttachReq;
+#define sz_xShmAttachReq	16
+
+typedef struct _ShmDetach {
+    CARD8	reqType;	/* always ShmReqCode */
+    CARD8	shmReqType;	/* always X_ShmDetach */
+    CARD16	length B16;
+    ShmSeg	shmseg B32;
+} xShmDetachReq;
+#define sz_xShmDetachReq	8
+
+typedef struct _ShmPutImage {
+    CARD8	reqType;	/* always ShmReqCode */
+    CARD8	shmReqType;	/* always X_ShmPutImage */
+    CARD16	length B16;
+    Drawable	drawable B32;
+    GContext	gc B32;
+    CARD16	totalWidth B16;
+    CARD16	totalHeight B16;
+    CARD16	srcX B16;
+    CARD16	srcY B16;
+    CARD16	srcWidth B16;
+    CARD16	srcHeight B16;
+    INT16	dstX B16;
+    INT16	dstY B16;
+    CARD8	depth;
+    CARD8	format;
+    CARD8	sendEvent;
+    CARD8	bpad;
+    ShmSeg	shmseg B32;
+    CARD32	offset B32;
+} xShmPutImageReq;
+#define sz_xShmPutImageReq	40
+
+typedef struct _ShmGetImage {
+    CARD8	reqType;	/* always ShmReqCode */
+    CARD8	shmReqType;	/* always X_ShmGetImage */
+    CARD16	length B16;
+    Drawable	drawable B32;
+    INT16	x B16;
+    INT16	y B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD32	planeMask B32;
+    CARD8	format;
+    CARD8	pad0;
+    CARD8	pad1;
+    CARD8	pad2;
+    ShmSeg	shmseg B32;
+    CARD32	offset B32;
+} xShmGetImageReq;
+#define sz_xShmGetImageReq	32
+
+typedef struct _ShmGetImageReply {
+    BYTE	type;  /* X_Reply */
+    CARD8	depth;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    VisualID	visual B32;
+    CARD32	size B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xShmGetImageReply;
+#define sz_xShmGetImageReply	32
+
+typedef struct _ShmCreatePixmap {
+    CARD8	reqType;	/* always ShmReqCode */
+    CARD8	shmReqType;	/* always X_ShmCreatePixmap */
+    CARD16	length B16;
+    Pixmap	pid B32;
+    Drawable	drawable B32;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD8	depth;
+    CARD8	pad0;
+    CARD8	pad1;
+    CARD8	pad2;
+    ShmSeg	shmseg B32;
+    CARD32	offset B32;
+} xShmCreatePixmapReq;
+#define sz_xShmCreatePixmapReq 28
+
+typedef struct _ShmCompletion {
+    BYTE	type;		/* always eventBase + ShmCompletion */
+    BYTE	bpad0;
+    CARD16	sequenceNumber B16;
+    Drawable	drawable B32;
+    CARD16	minorEvent B16;
+    BYTE	majorEvent;
+    BYTE	bpad1;
+    ShmSeg	shmseg B32;
+    CARD32	offset B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+} xShmCompletionEvent;
+#define sz_xShmCompletionEvent	32
+
+#undef ShmSeg
+#undef Drawable
+#undef VisualID
+#undef GContext
+#undef Pixmap
+
+#endif /* _SHMPROTO_H_ */
diff --git a/X11/extensions/shmstr.h b/X11/extensions/shmstr.h
index 7cd2933e0..78f375962 100644
--- a/X11/extensions/shmstr.h
+++ b/X11/extensions/shmstr.h
@@ -1,63 +1,63 @@
-/************************************************************

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-********************************************************/

-

-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */

-

-#ifndef _SHMSTR_H_

-#define _SHMSTR_H_

-

-#include <X11/extensions/shmproto.h>

-

-#ifdef _XSHM_SERVER_

-#define XSHM_PUT_IMAGE_ARGS \

-    DrawablePtr		/* dst */, \

-    GCPtr		/* pGC */, \

-    int			/* depth */, \

-    unsigned int	/* format */, \

-    int			/* w */, \

-    int			/* h */, \

-    int			/* sx */, \

-    int			/* sy */, \

-    int			/* sw */, \

-    int			/* sh */, \

-    int			/* dx */, \

-    int			/* dy */, \

-    char *		/* data */

-

-#define XSHM_CREATE_PIXMAP_ARGS \

-    ScreenPtr	/* pScreen */, \

-    int		/* width */, \

-    int		/* height */, \

-    int		/* depth */, \

-    char *	/* addr */

-

-typedef struct _ShmFuncs {

-    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);

-    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);

-} ShmFuncs, *ShmFuncsPtr;

-#endif

-

-#endif /* _SHMSTR_H_ */

+/************************************************************
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _SHMSTR_H_
+#define _SHMSTR_H_
+
+#include <X11/extensions/shmproto.h>
+
+#ifdef _XSHM_SERVER_
+#define XSHM_PUT_IMAGE_ARGS \
+    DrawablePtr		/* dst */, \
+    GCPtr		/* pGC */, \
+    int			/* depth */, \
+    unsigned int	/* format */, \
+    int			/* w */, \
+    int			/* h */, \
+    int			/* sx */, \
+    int			/* sy */, \
+    int			/* sw */, \
+    int			/* sh */, \
+    int			/* dx */, \
+    int			/* dy */, \
+    char *		/* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+    ScreenPtr	/* pScreen */, \
+    int		/* width */, \
+    int		/* height */, \
+    int		/* depth */, \
+    char *	/* addr */
+
+typedef struct _ShmFuncs {
+    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;
+#endif
+
+#endif /* _SHMSTR_H_ */
diff --git a/X11/extensions/syncconst.h b/X11/extensions/syncconst.h
index 33e77e99c..3acc387e3 100644
--- a/X11/extensions/syncconst.h
+++ b/X11/extensions/syncconst.h
@@ -1,181 +1,181 @@
-/*

-

-Copyright 1991, 1993, 1994, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-/***********************************************************

-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

-and Olivetti Research Limited, Cambridge, England.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for any purpose and without fee is hereby granted,

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in

-supporting documentation, and that the names of Digital or Olivetti

-not be used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-PERFORMANCE OF THIS SOFTWARE.

-

-******************************************************************/

-

-#ifndef _SYNCCONST_H_

-#define _SYNCCONST_H_

-

-#define SYNC_NAME "SYNC"

-

-#define SYNC_MAJOR_VERSION	3

-#define SYNC_MINOR_VERSION	1

-

-

-#define XSyncCounterNotify              0

-#define XSyncAlarmNotify		1

-#define XSyncAlarmNotifyMask 		(1L << XSyncAlarmNotify)

-

-#define XSyncNumberEvents		2L

-

-#define XSyncBadCounter			0L

-#define XSyncBadAlarm			1L

-#define XSyncBadFence           2L

-#define XSyncNumberErrors		(XSyncBadFence + 1)

-

-/*

- * Flags for Alarm Attributes

- */

-#define XSyncCACounter			(1L<<0)

-#define XSyncCAValueType		(1L<<1)

-#define XSyncCAValue			(1L<<2)

-#define XSyncCATestType			(1L<<3)

-#define XSyncCADelta			(1L<<4)

-#define XSyncCAEvents			(1L<<5)

-

-/*  The _XSync macros below are for library internal use only.  They exist

- *  so that if we have to make a fix, we can change it in this one place

- *  and have both the macro and function variants inherit the fix.

- */

-

-#define _XSyncIntToValue(pv, i)     ((pv)->hi=((i<0)?~0:0),(pv)->lo=(i))

-#define _XSyncIntsToValue(pv, l, h) ((pv)->lo = (l), (pv)->hi = (h))

-#define _XSyncValueGreaterThan(a, b)\

-    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>(b).lo))

-#define _XSyncValueLessThan(a, b)\

-    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<(b).lo))

-#define _XSyncValueGreaterOrEqual(a, b)\

-    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>=(b).lo))

-#define _XSyncValueLessOrEqual(a, b)\

-    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<=(b).lo))

-#define _XSyncValueEqual(a, b)	((a).lo==(b).lo && (a).hi==(b).hi)

-#define _XSyncValueIsNegative(v) (((v).hi & 0x80000000) ? 1 : 0)

-#define _XSyncValueIsZero(a)	((a).lo==0 && (a).hi==0)

-#define _XSyncValueIsPositive(v) (((v).hi & 0x80000000) ? 0 : 1)

-#define _XSyncValueLow32(v)	((v).lo)

-#define _XSyncValueHigh32(v)	((v).hi)

-#define _XSyncValueAdd(presult,a,b,poverflow) {\

-	int t = (a).lo;\

-	Bool signa = XSyncValueIsNegative(a);\

-	Bool signb = XSyncValueIsNegative(b);\

-	((presult)->lo = (a).lo + (b).lo);\

-	((presult)->hi = (a).hi + (b).hi);\

-	if (t>(presult)->lo) (presult)->hi++;\

-	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\

-     }

-#define _XSyncValueSubtract(presult,a,b,poverflow) {\

-	int t = (a).lo;\

-	Bool signa = XSyncValueIsNegative(a);\

-	Bool signb = XSyncValueIsNegative(b);\

-	((presult)->lo = (a).lo - (b).lo);\

-	((presult)->hi = (a).hi - (b).hi);\

-	if (t<(presult)->lo) (presult)->hi--;\

-	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\

-     }

-#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)

-#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)

-

-/*

- *  These are the publically usable macros.  If you want the function version

- *  of one of these, just #undef the macro to uncover the function.

- *  (This is the same convention that the ANSI C library uses.)

- */

-

-#define XSyncIntToValue(pv, i) _XSyncIntToValue(pv, i)

-#define XSyncIntsToValue(pv, l, h) _XSyncIntsToValue(pv, l, h)

-#define XSyncValueGreaterThan(a, b) _XSyncValueGreaterThan(a, b)

-#define XSyncValueLessThan(a, b) _XSyncValueLessThan(a, b)

-#define XSyncValueGreaterOrEqual(a, b) _XSyncValueGreaterOrEqual(a, b)

-#define XSyncValueLessOrEqual(a, b) _XSyncValueLessOrEqual(a, b)

-#define XSyncValueEqual(a, b) _XSyncValueEqual(a, b)

-#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)

-#define XSyncValueIsZero(a) _XSyncValueIsZero(a)

-#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)

-#define XSyncValueLow32(v) _XSyncValueLow32(v)

-#define XSyncValueHigh32(v) _XSyncValueHigh32(v)

-#define XSyncValueAdd(presult,a,b,poverflow) _XSyncValueAdd(presult,a,b,poverflow)

-#define XSyncValueSubtract(presult,a,b,poverflow) _XSyncValueSubtract(presult,a,b,poverflow)

-#define XSyncMaxValue(pv) _XSyncMaxValue(pv)

-#define XSyncMinValue(pv) _XSyncMinValue(pv)

-

-/*

- * Constants for the value_type argument of various requests

- */

-typedef enum {

-    XSyncAbsolute,

-    XSyncRelative

-} XSyncValueType;

-

-/*

- * Alarm Test types

- */

-typedef enum {

-    XSyncPositiveTransition,

-    XSyncNegativeTransition,

-    XSyncPositiveComparison,

-    XSyncNegativeComparison

-} XSyncTestType;

-

-/*

- * Alarm state constants

- */

-typedef enum {

-    XSyncAlarmActive,

-    XSyncAlarmInactive,

-    XSyncAlarmDestroyed

-} XSyncAlarmState;

-

-

-typedef XID XSyncCounter;

-typedef XID XSyncAlarm;

-typedef XID XSyncFence;

-typedef struct _XSyncValue {

-    int hi;

-    unsigned int lo;

-} XSyncValue;

-#endif /* _SYNCCONST_H_ */

+/*
+
+Copyright 1991, 1993, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+/***********************************************************
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+******************************************************************/
+
+#ifndef _SYNCCONST_H_
+#define _SYNCCONST_H_
+
+#define SYNC_NAME "SYNC"
+
+#define SYNC_MAJOR_VERSION	3
+#define SYNC_MINOR_VERSION	1
+
+
+#define XSyncCounterNotify              0
+#define XSyncAlarmNotify		1
+#define XSyncAlarmNotifyMask 		(1L << XSyncAlarmNotify)
+
+#define XSyncNumberEvents		2L
+
+#define XSyncBadCounter			0L
+#define XSyncBadAlarm			1L
+#define XSyncBadFence           2L
+#define XSyncNumberErrors		(XSyncBadFence + 1)
+
+/*
+ * Flags for Alarm Attributes
+ */
+#define XSyncCACounter			(1L<<0)
+#define XSyncCAValueType		(1L<<1)
+#define XSyncCAValue			(1L<<2)
+#define XSyncCATestType			(1L<<3)
+#define XSyncCADelta			(1L<<4)
+#define XSyncCAEvents			(1L<<5)
+
+/*  The _XSync macros below are for library internal use only.  They exist
+ *  so that if we have to make a fix, we can change it in this one place
+ *  and have both the macro and function variants inherit the fix.
+ */
+
+#define _XSyncIntToValue(pv, i)     ((pv)->hi=((i<0)?~0:0),(pv)->lo=(i))
+#define _XSyncIntsToValue(pv, l, h) ((pv)->lo = (l), (pv)->hi = (h))
+#define _XSyncValueGreaterThan(a, b)\
+    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>(b).lo))
+#define _XSyncValueLessThan(a, b)\
+    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<(b).lo))
+#define _XSyncValueGreaterOrEqual(a, b)\
+    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>=(b).lo))
+#define _XSyncValueLessOrEqual(a, b)\
+    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<=(b).lo))
+#define _XSyncValueEqual(a, b)	((a).lo==(b).lo && (a).hi==(b).hi)
+#define _XSyncValueIsNegative(v) (((v).hi & 0x80000000) ? 1 : 0)
+#define _XSyncValueIsZero(a)	((a).lo==0 && (a).hi==0)
+#define _XSyncValueIsPositive(v) (((v).hi & 0x80000000) ? 0 : 1)
+#define _XSyncValueLow32(v)	((v).lo)
+#define _XSyncValueHigh32(v)	((v).hi)
+#define _XSyncValueAdd(presult,a,b,poverflow) {\
+	int t = (a).lo;\
+	Bool signa = XSyncValueIsNegative(a);\
+	Bool signb = XSyncValueIsNegative(b);\
+	((presult)->lo = (a).lo + (b).lo);\
+	((presult)->hi = (a).hi + (b).hi);\
+	if (t>(presult)->lo) (presult)->hi++;\
+	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
+     }
+#define _XSyncValueSubtract(presult,a,b,poverflow) {\
+	int t = (a).lo;\
+	Bool signa = XSyncValueIsNegative(a);\
+	Bool signb = XSyncValueIsNegative(b);\
+	((presult)->lo = (a).lo - (b).lo);\
+	((presult)->hi = (a).hi - (b).hi);\
+	if (t<(presult)->lo) (presult)->hi--;\
+	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
+     }
+#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)
+#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)
+
+/*
+ *  These are the publically usable macros.  If you want the function version
+ *  of one of these, just #undef the macro to uncover the function.
+ *  (This is the same convention that the ANSI C library uses.)
+ */
+
+#define XSyncIntToValue(pv, i) _XSyncIntToValue(pv, i)
+#define XSyncIntsToValue(pv, l, h) _XSyncIntsToValue(pv, l, h)
+#define XSyncValueGreaterThan(a, b) _XSyncValueGreaterThan(a, b)
+#define XSyncValueLessThan(a, b) _XSyncValueLessThan(a, b)
+#define XSyncValueGreaterOrEqual(a, b) _XSyncValueGreaterOrEqual(a, b)
+#define XSyncValueLessOrEqual(a, b) _XSyncValueLessOrEqual(a, b)
+#define XSyncValueEqual(a, b) _XSyncValueEqual(a, b)
+#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)
+#define XSyncValueIsZero(a) _XSyncValueIsZero(a)
+#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)
+#define XSyncValueLow32(v) _XSyncValueLow32(v)
+#define XSyncValueHigh32(v) _XSyncValueHigh32(v)
+#define XSyncValueAdd(presult,a,b,poverflow) _XSyncValueAdd(presult,a,b,poverflow)
+#define XSyncValueSubtract(presult,a,b,poverflow) _XSyncValueSubtract(presult,a,b,poverflow)
+#define XSyncMaxValue(pv) _XSyncMaxValue(pv)
+#define XSyncMinValue(pv) _XSyncMinValue(pv)
+
+/*
+ * Constants for the value_type argument of various requests
+ */
+typedef enum {
+    XSyncAbsolute,
+    XSyncRelative
+} XSyncValueType;
+
+/*
+ * Alarm Test types
+ */
+typedef enum {
+    XSyncPositiveTransition,
+    XSyncNegativeTransition,
+    XSyncPositiveComparison,
+    XSyncNegativeComparison
+} XSyncTestType;
+
+/*
+ * Alarm state constants
+ */
+typedef enum {
+    XSyncAlarmActive,
+    XSyncAlarmInactive,
+    XSyncAlarmDestroyed
+} XSyncAlarmState;
+
+
+typedef XID XSyncCounter;
+typedef XID XSyncAlarm;
+typedef XID XSyncFence;
+typedef struct _XSyncValue {
+    int hi;
+    unsigned int lo;
+} XSyncValue;
+#endif /* _SYNCCONST_H_ */
diff --git a/X11/extensions/syncproto.h b/X11/extensions/syncproto.h
index ab7c1f528..1453e4401 100644
--- a/X11/extensions/syncproto.h
+++ b/X11/extensions/syncproto.h
@@ -1,474 +1,474 @@
-/*

-

-Copyright 1991, 1993, 1994, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-/***********************************************************

-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

-and Olivetti Research Limited, Cambridge, England.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for any purpose and without fee is hereby granted,

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in

-supporting documentation, and that the names of Digital or Olivetti

-not be used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-PERFORMANCE OF THIS SOFTWARE.

-

-******************************************************************/

-

-#ifndef _SYNCPROTO_H_

-#define _SYNCPROTO_H_

-

-#include <X11/extensions/syncconst.h>

-

-#define X_SyncInitialize		0

-#define X_SyncListSystemCounters	1

-#define X_SyncCreateCounter		2

-#define X_SyncSetCounter		3

-#define X_SyncChangeCounter		4

-#define X_SyncQueryCounter              5

-#define X_SyncDestroyCounter		6

-#define X_SyncAwait			7

-#define X_SyncCreateAlarm               8

-#define X_SyncChangeAlarm	        9

-#define X_SyncQueryAlarm	       10

-#define X_SyncDestroyAlarm	       11

-#define X_SyncSetPriority   	       12

-#define X_SyncGetPriority   	       13

-#define X_SyncCreateFence	       14

-#define X_SyncTriggerFence	       15

-#define X_SyncResetFence	       16

-#define X_SyncDestroyFence	       17

-#define X_SyncQueryFence	       18

-#define X_SyncAwaitFence	       19

-

-/* cover up types from sync.h to make sure they're the right size for

- * protocol packaging.  These will be undef'ed after all the protocol

- * structures are defined.

- */

-#define XSyncCounter CARD32

-#define XSyncAlarm   CARD32

-#define XSyncFence   CARD32

-#define Drawable     CARD32

-

-/*

- * Initialize

- */

-typedef struct _xSyncInitialize {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    CARD8	majorVersion;

-    CARD8	minorVersion;

-    CARD16	pad B16;

-} xSyncInitializeReq;

-#define sz_xSyncInitializeReq		8

-

-typedef struct {

-    BYTE	type;

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD8	majorVersion;

-    CARD8	minorVersion;

-    CARD16	pad B16;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xSyncInitializeReply;

-#define sz_xSyncInitializeReply	32

-

-/*

- * ListSystemCounters

- */

-typedef struct _xSyncListSystemCounters

-{

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-} xSyncListSystemCountersReq;

-#define sz_xSyncListSystemCountersReq	4

-

-typedef struct {

-    BYTE	type;

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    INT32	nCounters B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-} xSyncListSystemCountersReply;

-#define sz_xSyncListSystemCountersReply	32

-

-typedef struct {

-    XSyncCounter counter B32;

-    INT32	resolution_hi B32;

-    CARD32	resolution_lo B32;

-    CARD16	name_length B16;

-} xSyncSystemCounter;

-#define sz_xSyncSystemCounter 14

-

-/*

- * Create Counter

- */

-typedef struct _xSyncCreateCounterReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncCounter cid B32;

-    INT32       initial_value_hi B32;

-    CARD32	initial_value_lo B32;

-} xSyncCreateCounterReq;

-#define sz_xSyncCreateCounterReq	16

-

-/*

- * Change Counter

- */

-typedef struct _xSyncChangeCounterReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncCounter cid B32;

-    INT32       value_hi B32;

-    CARD32	value_lo B32;

-} xSyncChangeCounterReq;

-#define sz_xSyncChangeCounterReq	16

-

-/*

- * Set Counter

- */

-typedef struct _xSyncSetCounterReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncCounter cid B32;

-    INT32       value_hi B32;

-    CARD32	value_lo B32;

-} xSyncSetCounterReq;

-#define sz_xSyncSetCounterReq	16

-

-/*

- * Destroy Counter

- */

-typedef struct _xSyncDestroyCounterReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncCounter counter B32;

-} xSyncDestroyCounterReq;

-#define sz_xSyncDestroyCounterReq	8

-

-/*

- * Query Counter

- */

-typedef struct _xSyncQueryCounterReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncCounter counter B32;

-} xSyncQueryCounterReq;

-#define sz_xSyncQueryCounterReq		8

-

-

-typedef struct {

-    BYTE	type;

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    INT32	value_hi B32;

-    CARD32	value_lo B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-} xSyncQueryCounterReply;

-#define sz_xSyncQueryCounterReply	32

-

-/*

- * Await

- */

-typedef struct _xSyncAwaitReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-} xSyncAwaitReq;

-#define sz_xSyncAwaitReq		4

-

-typedef struct _xSyncWaitCondition {

-    XSyncCounter counter B32;

-    CARD32	value_type B32;

-    INT32       wait_value_hi B32;

-    CARD32      wait_value_lo B32;

-    CARD32	test_type B32;

-    INT32	event_threshold_hi B32;

-    CARD32	event_threshold_lo B32;

-} xSyncWaitCondition;

-#define sz_xSyncWaitCondition		28

-

-/*

- * Create Alarm

- */

-typedef struct _xSyncCreateAlarmReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncAlarm	id B32;

-    CARD32      valueMask B32;

-} xSyncCreateAlarmReq;

-#define sz_xSyncCreateAlarmReq		12

-

-/*

- * Destroy Alarm

- */

-typedef struct _xSyncDestroyAlarmReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncAlarm	alarm B32;

-} xSyncDestroyAlarmReq;

-#define sz_xSyncDestroyAlarmReq		8

-

-/*

- * Query Alarm

- */

-typedef struct _xSyncQueryAlarmReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncAlarm	alarm B32;

-} xSyncQueryAlarmReq;

-#define sz_xSyncQueryAlarmReq		8

-

-typedef struct {

-    BYTE	type;

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    XSyncCounter counter B32;

-    CARD32	value_type B32;

-    INT32	wait_value_hi B32;

-    CARD32	wait_value_lo B32;

-    CARD32	test_type      B32;

-    INT32	delta_hi B32;

-    CARD32	delta_lo B32;

-    BOOL        events;

-    BYTE        state;

-    BYTE	pad0;

-    BYTE	pad1;

-} xSyncQueryAlarmReply;

-#define sz_xSyncQueryAlarmReply		40

-

-/*

- * Change Alarm

- */

-typedef struct _xSyncChangeAlarmReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncAlarm	alarm B32;

-    CARD32	valueMask B32;

-} xSyncChangeAlarmReq;

-#define sz_xSyncChangeAlarmReq		12

-

-/*

- * SetPriority

- */

-typedef struct _xSyncSetPriority{

-    CARD8   	reqType;

-    CARD8   	syncReqType;

-    CARD16  	length B16;

-    CARD32  	id B32;

-    INT32  	priority B32;

-} xSyncSetPriorityReq;

-#define sz_xSyncSetPriorityReq	    	12

-

-/*

- * Get Priority

- */

-typedef struct _xSyncGetPriority{

-    CARD8   	reqType;

-    CARD8   	syncReqType;

-    CARD16  	length B16;

-    CARD32  	id B32; /*XXX XID? */

-} xSyncGetPriorityReq;

-#define sz_xSyncGetPriorityReq	    	 8

-

-typedef struct {

-    BYTE	type;

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    INT32  	priority B32;

-    CARD32  	pad0 B32;

-    CARD32  	pad1 B32;

-    CARD32  	pad2 B32;

-    CARD32  	pad3 B32;

-    CARD32  	pad4 B32;

-} xSyncGetPriorityReply;

-#define sz_xSyncGetPriorityReply	32

-

-/*

- * Create Fence

- */

-typedef struct _xSyncCreateFenceReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    Drawable	d B32;

-    XSyncFence	fid B32;

-    BOOL	initially_triggered;

-    CARD8	pad0;

-    CARD16	pad1;

-} xSyncCreateFenceReq;

-#define sz_xSyncCreateFenceReq		16

-

-/*

- * Put a fence object in the "triggered" state.

- */

-typedef struct _xSyncTriggerFenceReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncFence	fid B32;

-} xSyncTriggerFenceReq;

-#define sz_xSyncTriggerFenceReq		8

-

-/*

- * Put a fence in the "untriggered" state.

- */

-typedef struct _xSyncResetFenceReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncFence	fid B32;

-} xSyncResetFenceReq;

-#define sz_xSyncResetFenceReq		8

-

-/*

- * Destroy a fence object

- */

-typedef struct _xSyncDestroyFenceReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncFence	fid B32;

-} xSyncDestroyFenceReq;

-#define sz_xSyncDestroyFenceReq		8

-

-/*

- * Query a fence object

- */

-typedef struct _xSyncQueryFenceReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-    XSyncFence	fid B32;

-} xSyncQueryFenceReq;

-#define sz_xSyncQueryFenceReq		8

-

-/*

- * Wait for any of a list of fence sync objects

- * to reach the "triggered" state.

- */

-typedef struct _xSyncAwaitFenceReq {

-    CARD8	reqType;

-    CARD8	syncReqType;

-    CARD16	length B16;

-} xSyncAwaitFenceReq;

-#define sz_xSyncAwaitFenceReq		4

-

-typedef struct {

-    BYTE	type;

-    CARD8	unused;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    BOOL	triggered;

-    BYTE	pad0;

-    CARD16	pad1 B16;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-    CARD32	pad6 B32;

-} xSyncQueryFenceReply;

-#define sz_xSyncQueryFenceReply		32

-

-/*

- * Events

- */

-

-typedef struct _xSyncCounterNotifyEvent {

-    BYTE	type;

-    BYTE	kind;

-    CARD16	sequenceNumber B16;

-    XSyncCounter counter B32;

-    INT32	wait_value_hi B32;

-    CARD32	wait_value_lo B32;

-    INT32	counter_value_hi B32;

-    CARD32	counter_value_lo B32;

-    CARD32	time B32;

-    CARD16	count B16;

-    BOOL	destroyed;

-    BYTE        pad0;

-} xSyncCounterNotifyEvent;

-

-typedef struct _xSyncAlarmNotifyEvent {

-    BYTE	type;

-    BYTE	kind;

-    CARD16	sequenceNumber B16;

-    XSyncAlarm	alarm B32;

-    INT32	counter_value_hi B32;

-    CARD32	counter_value_lo B32;

-    INT32	alarm_value_hi B32;

-    CARD32	alarm_value_lo B32;

-    CARD32	time B32;

-    CARD8       state;

-    BYTE        pad0;

-    BYTE        pad1;

-    BYTE        pad2;

-} xSyncAlarmNotifyEvent;

-

-#undef XSyncCounter

-#undef XSyncAlarm

-#undef XSyncFence

-#undef Drawable

-

-

-#endif /* _SYNCPROTO_H_ */

+/*
+
+Copyright 1991, 1993, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+/***********************************************************
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+******************************************************************/
+
+#ifndef _SYNCPROTO_H_
+#define _SYNCPROTO_H_
+
+#include <X11/extensions/syncconst.h>
+
+#define X_SyncInitialize		0
+#define X_SyncListSystemCounters	1
+#define X_SyncCreateCounter		2
+#define X_SyncSetCounter		3
+#define X_SyncChangeCounter		4
+#define X_SyncQueryCounter              5
+#define X_SyncDestroyCounter		6
+#define X_SyncAwait			7
+#define X_SyncCreateAlarm               8
+#define X_SyncChangeAlarm	        9
+#define X_SyncQueryAlarm	       10
+#define X_SyncDestroyAlarm	       11
+#define X_SyncSetPriority   	       12
+#define X_SyncGetPriority   	       13
+#define X_SyncCreateFence	       14
+#define X_SyncTriggerFence	       15
+#define X_SyncResetFence	       16
+#define X_SyncDestroyFence	       17
+#define X_SyncQueryFence	       18
+#define X_SyncAwaitFence	       19
+
+/* cover up types from sync.h to make sure they're the right size for
+ * protocol packaging.  These will be undef'ed after all the protocol
+ * structures are defined.
+ */
+#define XSyncCounter CARD32
+#define XSyncAlarm   CARD32
+#define XSyncFence   CARD32
+#define Drawable     CARD32
+
+/*
+ * Initialize
+ */
+typedef struct _xSyncInitialize {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    CARD8	majorVersion;
+    CARD8	minorVersion;
+    CARD16	pad B16;
+} xSyncInitializeReq;
+#define sz_xSyncInitializeReq		8
+
+typedef struct {
+    BYTE	type;
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	majorVersion;
+    CARD8	minorVersion;
+    CARD16	pad B16;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xSyncInitializeReply;
+#define sz_xSyncInitializeReply	32
+
+/*
+ * ListSystemCounters
+ */
+typedef struct _xSyncListSystemCounters
+{
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+} xSyncListSystemCountersReq;
+#define sz_xSyncListSystemCountersReq	4
+
+typedef struct {
+    BYTE	type;
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    INT32	nCounters B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xSyncListSystemCountersReply;
+#define sz_xSyncListSystemCountersReply	32
+
+typedef struct {
+    XSyncCounter counter B32;
+    INT32	resolution_hi B32;
+    CARD32	resolution_lo B32;
+    CARD16	name_length B16;
+} xSyncSystemCounter;
+#define sz_xSyncSystemCounter 14
+
+/*
+ * Create Counter
+ */
+typedef struct _xSyncCreateCounterReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncCounter cid B32;
+    INT32       initial_value_hi B32;
+    CARD32	initial_value_lo B32;
+} xSyncCreateCounterReq;
+#define sz_xSyncCreateCounterReq	16
+
+/*
+ * Change Counter
+ */
+typedef struct _xSyncChangeCounterReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncCounter cid B32;
+    INT32       value_hi B32;
+    CARD32	value_lo B32;
+} xSyncChangeCounterReq;
+#define sz_xSyncChangeCounterReq	16
+
+/*
+ * Set Counter
+ */
+typedef struct _xSyncSetCounterReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncCounter cid B32;
+    INT32       value_hi B32;
+    CARD32	value_lo B32;
+} xSyncSetCounterReq;
+#define sz_xSyncSetCounterReq	16
+
+/*
+ * Destroy Counter
+ */
+typedef struct _xSyncDestroyCounterReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncCounter counter B32;
+} xSyncDestroyCounterReq;
+#define sz_xSyncDestroyCounterReq	8
+
+/*
+ * Query Counter
+ */
+typedef struct _xSyncQueryCounterReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncCounter counter B32;
+} xSyncQueryCounterReq;
+#define sz_xSyncQueryCounterReq		8
+
+
+typedef struct {
+    BYTE	type;
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    INT32	value_hi B32;
+    CARD32	value_lo B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xSyncQueryCounterReply;
+#define sz_xSyncQueryCounterReply	32
+
+/*
+ * Await
+ */
+typedef struct _xSyncAwaitReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+} xSyncAwaitReq;
+#define sz_xSyncAwaitReq		4
+
+typedef struct _xSyncWaitCondition {
+    XSyncCounter counter B32;
+    CARD32	value_type B32;
+    INT32       wait_value_hi B32;
+    CARD32      wait_value_lo B32;
+    CARD32	test_type B32;
+    INT32	event_threshold_hi B32;
+    CARD32	event_threshold_lo B32;
+} xSyncWaitCondition;
+#define sz_xSyncWaitCondition		28
+
+/*
+ * Create Alarm
+ */
+typedef struct _xSyncCreateAlarmReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncAlarm	id B32;
+    CARD32      valueMask B32;
+} xSyncCreateAlarmReq;
+#define sz_xSyncCreateAlarmReq		12
+
+/*
+ * Destroy Alarm
+ */
+typedef struct _xSyncDestroyAlarmReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncAlarm	alarm B32;
+} xSyncDestroyAlarmReq;
+#define sz_xSyncDestroyAlarmReq		8
+
+/*
+ * Query Alarm
+ */
+typedef struct _xSyncQueryAlarmReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncAlarm	alarm B32;
+} xSyncQueryAlarmReq;
+#define sz_xSyncQueryAlarmReq		8
+
+typedef struct {
+    BYTE	type;
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    XSyncCounter counter B32;
+    CARD32	value_type B32;
+    INT32	wait_value_hi B32;
+    CARD32	wait_value_lo B32;
+    CARD32	test_type      B32;
+    INT32	delta_hi B32;
+    CARD32	delta_lo B32;
+    BOOL        events;
+    BYTE        state;
+    BYTE	pad0;
+    BYTE	pad1;
+} xSyncQueryAlarmReply;
+#define sz_xSyncQueryAlarmReply		40
+
+/*
+ * Change Alarm
+ */
+typedef struct _xSyncChangeAlarmReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncAlarm	alarm B32;
+    CARD32	valueMask B32;
+} xSyncChangeAlarmReq;
+#define sz_xSyncChangeAlarmReq		12
+
+/*
+ * SetPriority
+ */
+typedef struct _xSyncSetPriority{
+    CARD8   	reqType;
+    CARD8   	syncReqType;
+    CARD16  	length B16;
+    CARD32  	id B32;
+    INT32  	priority B32;
+} xSyncSetPriorityReq;
+#define sz_xSyncSetPriorityReq	    	12
+
+/*
+ * Get Priority
+ */
+typedef struct _xSyncGetPriority{
+    CARD8   	reqType;
+    CARD8   	syncReqType;
+    CARD16  	length B16;
+    CARD32  	id B32; /*XXX XID? */
+} xSyncGetPriorityReq;
+#define sz_xSyncGetPriorityReq	    	 8
+
+typedef struct {
+    BYTE	type;
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    INT32  	priority B32;
+    CARD32  	pad0 B32;
+    CARD32  	pad1 B32;
+    CARD32  	pad2 B32;
+    CARD32  	pad3 B32;
+    CARD32  	pad4 B32;
+} xSyncGetPriorityReply;
+#define sz_xSyncGetPriorityReply	32
+
+/*
+ * Create Fence
+ */
+typedef struct _xSyncCreateFenceReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    Drawable	d B32;
+    XSyncFence	fid B32;
+    BOOL	initially_triggered;
+    CARD8	pad0;
+    CARD16	pad1;
+} xSyncCreateFenceReq;
+#define sz_xSyncCreateFenceReq		16
+
+/*
+ * Put a fence object in the "triggered" state.
+ */
+typedef struct _xSyncTriggerFenceReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncFence	fid B32;
+} xSyncTriggerFenceReq;
+#define sz_xSyncTriggerFenceReq		8
+
+/*
+ * Put a fence in the "untriggered" state.
+ */
+typedef struct _xSyncResetFenceReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncFence	fid B32;
+} xSyncResetFenceReq;
+#define sz_xSyncResetFenceReq		8
+
+/*
+ * Destroy a fence object
+ */
+typedef struct _xSyncDestroyFenceReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncFence	fid B32;
+} xSyncDestroyFenceReq;
+#define sz_xSyncDestroyFenceReq		8
+
+/*
+ * Query a fence object
+ */
+typedef struct _xSyncQueryFenceReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+    XSyncFence	fid B32;
+} xSyncQueryFenceReq;
+#define sz_xSyncQueryFenceReq		8
+
+/*
+ * Wait for any of a list of fence sync objects
+ * to reach the "triggered" state.
+ */
+typedef struct _xSyncAwaitFenceReq {
+    CARD8	reqType;
+    CARD8	syncReqType;
+    CARD16	length B16;
+} xSyncAwaitFenceReq;
+#define sz_xSyncAwaitFenceReq		4
+
+typedef struct {
+    BYTE	type;
+    CARD8	unused;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    BOOL	triggered;
+    BYTE	pad0;
+    CARD16	pad1 B16;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xSyncQueryFenceReply;
+#define sz_xSyncQueryFenceReply		32
+
+/*
+ * Events
+ */
+
+typedef struct _xSyncCounterNotifyEvent {
+    BYTE	type;
+    BYTE	kind;
+    CARD16	sequenceNumber B16;
+    XSyncCounter counter B32;
+    INT32	wait_value_hi B32;
+    CARD32	wait_value_lo B32;
+    INT32	counter_value_hi B32;
+    CARD32	counter_value_lo B32;
+    CARD32	time B32;
+    CARD16	count B16;
+    BOOL	destroyed;
+    BYTE        pad0;
+} xSyncCounterNotifyEvent;
+
+typedef struct _xSyncAlarmNotifyEvent {
+    BYTE	type;
+    BYTE	kind;
+    CARD16	sequenceNumber B16;
+    XSyncAlarm	alarm B32;
+    INT32	counter_value_hi B32;
+    CARD32	counter_value_lo B32;
+    INT32	alarm_value_hi B32;
+    CARD32	alarm_value_lo B32;
+    CARD32	time B32;
+    CARD8       state;
+    BYTE        pad0;
+    BYTE        pad1;
+    BYTE        pad2;
+} xSyncAlarmNotifyEvent;
+
+#undef XSyncCounter
+#undef XSyncAlarm
+#undef XSyncFence
+#undef Drawable
+
+
+#endif /* _SYNCPROTO_H_ */
diff --git a/X11/extensions/syncstr.h b/X11/extensions/syncstr.h
index 43697e498..25a48277e 100644
--- a/X11/extensions/syncstr.h
+++ b/X11/extensions/syncstr.h
@@ -1,182 +1,182 @@
-/*

-

-Copyright 1991, 1993, 1994, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-/***********************************************************

-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

-and Olivetti Research Limited, Cambridge, England.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the names of Digital or Olivetti

-not be used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-PERFORMANCE OF THIS SOFTWARE.

-

-******************************************************************/

-

-#ifndef _SYNCSTR_H_

-#define _SYNCSTR_H_

-

-#include <X11/extensions/syncproto.h>

-

-#ifdef _SYNC_SERVER

-

-#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */

-

-typedef struct _SyncCounter {

-    ClientPtr		client;	/* Owning client. 0 for system counters */

-    XSyncCounter	id;		/* resource ID */

-    CARD64		value;		/* counter value */

-    struct _SyncTriggerList *pTriglist;	/* list of triggers */

-    Bool		beingDestroyed; /* in process of going away */

-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */

-} SyncCounter;

-

-/*

- * The System Counter interface

- */

-

-typedef enum {

-    XSyncCounterNeverChanges,

-    XSyncCounterNeverIncreases,

-    XSyncCounterNeverDecreases,

-    XSyncCounterUnrestricted

-} SyncCounterType;

-

-typedef struct _SysCounterInfo {

-    char	*name;

-    CARD64	resolution;

-    CARD64	bracket_greater;

-    CARD64	bracket_less;

-    SyncCounterType counterType;  /* how can this counter change */

-    void        (*QueryValue)(

-			      pointer /*pCounter*/,

-			      CARD64 * /*freshvalue*/

-);

-    void	(*BracketValues)(

-				 pointer /*pCounter*/,

-				 CARD64 * /*lessthan*/,

-				 CARD64 * /*greaterthan*/

-);

-} SysCounterInfo;

-

-

-

-typedef struct _SyncTrigger {

-    SyncCounter *pCounter;

-    CARD64	wait_value;	/* wait value */

-    unsigned int value_type;     /* Absolute or Relative */

-    unsigned int test_type;	/* transition or Comparision type */

-    CARD64	test_value;	/* trigger event threshold value */

-    Bool	(*CheckTrigger)(

-				struct _SyncTrigger * /*pTrigger*/,

-				CARD64 /*newval*/

-				);

-    void	(*TriggerFired)(

-				struct _SyncTrigger * /*pTrigger*/

-				);

-    void	(*CounterDestroyed)(

-				struct _SyncTrigger * /*pTrigger*/

-				    );

-} SyncTrigger;

-

-typedef struct _SyncTriggerList {

-    SyncTrigger *pTrigger;

-    struct _SyncTriggerList *next;

-} SyncTriggerList;

-

-typedef struct _SyncAlarmClientList {

-    ClientPtr	client;

-    XID		delete_id;

-    struct _SyncAlarmClientList *next;

-} SyncAlarmClientList;

-

-typedef struct _SyncAlarm {

-    SyncTrigger trigger;

-    ClientPtr	client;

-    XSyncAlarm 	alarm_id;

-    CARD64	delta;

-    int		events;

-    int		state;

-    SyncAlarmClientList *pEventClients;

-} SyncAlarm;

-

-typedef struct {

-    ClientPtr	client;

-    CARD32 	delete_id;

-    int		num_waitconditions;

-} SyncAwaitHeader;

-

-typedef struct {

-    SyncTrigger trigger;

-    CARD64	event_threshold;

-    SyncAwaitHeader *pHeader;

-} SyncAwait;

-

-typedef union {

-    SyncAwaitHeader header;

-    SyncAwait	    await;

-} SyncAwaitUnion;

-

-

-extern pointer SyncCreateSystemCounter(

-    char *	/* name */,

-    CARD64  	/* inital_value */,

-    CARD64  	/* resolution */,

-    SyncCounterType /* change characterization */,

-    void        (* /*QueryValue*/ ) (

-        pointer /* pCounter */,

-        CARD64 * /* pValue_return */), /* XXX prototype */

-    void        (* /*BracketValues*/) (

-        pointer /* pCounter */, 

-        CARD64 * /* pbracket_less */,

-        CARD64 * /* pbracket_greater */)

-);

-

-extern void SyncChangeCounter(

-    SyncCounter *	/* pCounter*/,

-    CARD64  		/* new_value */

-);

-

-extern void SyncDestroySystemCounter(

-    pointer pCounter

-);

-extern void InitServertime(void);

-

-#endif /* _SYNC_SERVER */

-

-#endif /* _SYNCSTR_H_ */

+/*
+
+Copyright 1991, 1993, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+/***********************************************************
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+******************************************************************/
+
+#ifndef _SYNCSTR_H_
+#define _SYNCSTR_H_
+
+#include <X11/extensions/syncproto.h>
+
+#ifdef _SYNC_SERVER
+
+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
+
+typedef struct _SyncCounter {
+    ClientPtr		client;	/* Owning client. 0 for system counters */
+    XSyncCounter	id;		/* resource ID */
+    CARD64		value;		/* counter value */
+    struct _SyncTriggerList *pTriglist;	/* list of triggers */
+    Bool		beingDestroyed; /* in process of going away */
+    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
+} SyncCounter;
+
+/*
+ * The System Counter interface
+ */
+
+typedef enum {
+    XSyncCounterNeverChanges,
+    XSyncCounterNeverIncreases,
+    XSyncCounterNeverDecreases,
+    XSyncCounterUnrestricted
+} SyncCounterType;
+
+typedef struct _SysCounterInfo {
+    char	*name;
+    CARD64	resolution;
+    CARD64	bracket_greater;
+    CARD64	bracket_less;
+    SyncCounterType counterType;  /* how can this counter change */
+    void        (*QueryValue)(
+			      pointer /*pCounter*/,
+			      CARD64 * /*freshvalue*/
+);
+    void	(*BracketValues)(
+				 pointer /*pCounter*/,
+				 CARD64 * /*lessthan*/,
+				 CARD64 * /*greaterthan*/
+);
+} SysCounterInfo;
+
+
+
+typedef struct _SyncTrigger {
+    SyncCounter *pCounter;
+    CARD64	wait_value;	/* wait value */
+    unsigned int value_type;     /* Absolute or Relative */
+    unsigned int test_type;	/* transition or Comparision type */
+    CARD64	test_value;	/* trigger event threshold value */
+    Bool	(*CheckTrigger)(
+				struct _SyncTrigger * /*pTrigger*/,
+				CARD64 /*newval*/
+				);
+    void	(*TriggerFired)(
+				struct _SyncTrigger * /*pTrigger*/
+				);
+    void	(*CounterDestroyed)(
+				struct _SyncTrigger * /*pTrigger*/
+				    );
+} SyncTrigger;
+
+typedef struct _SyncTriggerList {
+    SyncTrigger *pTrigger;
+    struct _SyncTriggerList *next;
+} SyncTriggerList;
+
+typedef struct _SyncAlarmClientList {
+    ClientPtr	client;
+    XID		delete_id;
+    struct _SyncAlarmClientList *next;
+} SyncAlarmClientList;
+
+typedef struct _SyncAlarm {
+    SyncTrigger trigger;
+    ClientPtr	client;
+    XSyncAlarm 	alarm_id;
+    CARD64	delta;
+    int		events;
+    int		state;
+    SyncAlarmClientList *pEventClients;
+} SyncAlarm;
+
+typedef struct {
+    ClientPtr	client;
+    CARD32 	delete_id;
+    int		num_waitconditions;
+} SyncAwaitHeader;
+
+typedef struct {
+    SyncTrigger trigger;
+    CARD64	event_threshold;
+    SyncAwaitHeader *pHeader;
+} SyncAwait;
+
+typedef union {
+    SyncAwaitHeader header;
+    SyncAwait	    await;
+} SyncAwaitUnion;
+
+
+extern pointer SyncCreateSystemCounter(
+    char *	/* name */,
+    CARD64  	/* inital_value */,
+    CARD64  	/* resolution */,
+    SyncCounterType /* change characterization */,
+    void        (* /*QueryValue*/ ) (
+        pointer /* pCounter */,
+        CARD64 * /* pValue_return */), /* XXX prototype */
+    void        (* /*BracketValues*/) (
+        pointer /* pCounter */, 
+        CARD64 * /* pbracket_less */,
+        CARD64 * /* pbracket_greater */)
+);
+
+extern void SyncChangeCounter(
+    SyncCounter *	/* pCounter*/,
+    CARD64  		/* new_value */
+);
+
+extern void SyncDestroySystemCounter(
+    pointer pCounter
+);
+extern void InitServertime(void);
+
+#endif /* _SYNC_SERVER */
+
+#endif /* _SYNCSTR_H_ */
diff --git a/X11/extensions/xextproto.pc.in b/X11/extensions/xextproto.pc.in
index 5e1af0862..e85200fde 100644
--- a/X11/extensions/xextproto.pc.in
+++ b/X11/extensions/xextproto.pc.in
@@ -1,9 +1,9 @@
-prefix=@prefix@

-exec_prefix=@exec_prefix@

-libdir=@libdir@

-includedir=@includedir@

- 

-Name: XExtProto

-Description: XExt extension headers

-Version: @PACKAGE_VERSION@

-Cflags: -I${includedir}

+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: XExtProto
+Description: XExt extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
diff --git a/X11/extensions/xtestconst.h b/X11/extensions/xtestconst.h
index f10240445..e74b9042e 100644
--- a/X11/extensions/xtestconst.h
+++ b/X11/extensions/xtestconst.h
@@ -1,41 +1,41 @@
-/*

-

-Copyright 1992, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-#ifndef _XTEST_CONST_H_

-#define _XTEST_CONST_H_

-

-#define XTestNumberEvents	0

-

-#define XTestNumberErrors	0

-

-#define XTestCurrentCursor ((Cursor)1)

-

-#define XTestMajorVersion	2

-#define XTestMinorVersion	2

-

-#define XTestExtensionName	"XTEST"

-

-#endif

+/*
+
+Copyright 1992, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifndef _XTEST_CONST_H_
+#define _XTEST_CONST_H_
+
+#define XTestNumberEvents	0
+
+#define XTestNumberErrors	0
+
+#define XTestCurrentCursor ((Cursor)1)
+
+#define XTestMajorVersion	2
+#define XTestMinorVersion	2
+
+#define XTestExtensionName	"XTEST"
+
+#endif
diff --git a/X11/extensions/xtestext1const.h b/X11/extensions/xtestext1const.h
index 18951cfae..656edc6ba 100644
--- a/X11/extensions/xtestext1const.h
+++ b/X11/extensions/xtestext1const.h
@@ -1,160 +1,160 @@
-/*

- * xtestext1.h

- *

- * X11 Input Synthesis Extension include file

- */

-

-/*

-

-

-Copyright 1986, 1987, 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-

-Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation

-

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Hewlett-Packard not be used in

-advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-Hewlett-Packard makes no representations about the

-suitability of this software for any purpose.  It is provided

-"as is" without express or implied warranty.

-

-This software is not subject to any license of the American

-Telephone and Telegraph Company or of the Regents of the

-University of California.

-

-*/

-

-#ifndef _XTESTEXT1CONST_H

-#define _XTESTEXT1CONST_H 1

-

-#define XTestMAX_ACTION_LIST_SIZE       64

-#define XTestACTIONS_SIZE	28

-

-

-/*

- * used in the XTestPressButton and XTestPressKey functions

- */

-#define XTestPRESS                      1 << 0

-#define XTestRELEASE                    1 << 1

-#define XTestSTROKE                     1 << 2

-

-/*

- * When doing a key or button stroke, the number of milliseconds

- * to delay between the press and the release of a key or button

- * in the XTestPressButton and XTestPressKey functions.

- */

-

-#define XTestSTROKE_DELAY_TIME		10

-

-/*

- * used in the XTestGetInput function

- */

-#define XTestEXCLUSIVE                  1 << 0

-#define XTestPACKED_ACTIONS             1 << 1

-#define XTestPACKED_MOTION              1 << 2

-

-/*

- * used in the XTestFakeInput function

- */

-#define XTestFAKE_ACK_NOT_NEEDED        0

-#define XTestFAKE_ACK_REQUEST           1

-

-/*

- * used in the XTest extension initialization routine

- */

-#define XTestEXTENSION_NAME             "XTestExtension1"

-#define XTestEVENT_COUNT                2

-

-/*

- * This is the definition for the format of the header byte

- * in the input action structures.

- */

-#define XTestACTION_TYPE_MASK   0x03    /* bits 0 and 1          */

-#define XTestKEY_STATE_MASK     0x04    /* bit 2 (key action)    */

-#define XTestX_SIGN_BIT_MASK    0x04    /* bit 2 (motion action) */

-#define XTestY_SIGN_BIT_MASK    0x08    /* bit 3 (motion action) */

-#define XTestDEVICE_ID_MASK     0xf0    /* bits 4 through 7      */

-

-#define XTestMAX_DEVICE_ID	0x0f

-#define XTestPackDeviceID(x)	(((x) & XTestMAX_DEVICE_ID) << 4)

-#define XTestUnpackDeviceID(x)	(((x) & XTestDEVICE_ID_MASK) >> 4)

-

-/*

- * These are the possible action types.

- */

-#define XTestDELAY_ACTION       0

-#define XTestKEY_ACTION         1

-#define XTestMOTION_ACTION      2

-#define XTestJUMP_ACTION        3

-

-/*

- * These are the definitions for key/button motion input actions.

- */

-#define XTestKEY_UP             0x04

-#define XTestKEY_DOWN           0x00

-

-/*

- * These are the definitions for pointer relative motion input

- * actions.

- *

- * The sign bits for the x and y relative motions are contained

- * in the header byte.  The x and y relative motions are packed

- * into one byte to make things fit in 32 bits.  If the relative

- * motion range is larger than +/-15, use the pointer jump action.

- */

-#define XTestMOTION_MAX            15

-#define XTestMOTION_MIN            -15

-

-#define XTestX_NEGATIVE            0x04

-#define XTestY_NEGATIVE            0x08

-

-#define XTestX_MOTION_MASK         0x0f

-#define XTestY_MOTION_MASK         0xf0

-

-#define XTestPackXMotionValue(x)   ((x) & XTestX_MOTION_MASK)

-#define XTestPackYMotionValue(x)   (((x) << 4) & XTestY_MOTION_MASK)

-

-#define XTestUnpackXMotionValue(x) ((x) & XTestX_MOTION_MASK)

-#define XTestUnpackYMotionValue(x) (((x) & XTestY_MOTION_MASK) >> 4)

-/*

- * These are the definitions for a long delay input action.  It is

- * used when more than XTestSHORT_DELAY_TIME milliseconds of delay

- * (approximately one minute) is needed.

- *

- * The device ID for a delay is always set to XTestDELAY_DEVICE_ID.

- * This guarantees that a header byte with a value of 0 is not

- * a valid header, so it can be used as a flag to indicate that

- * there are no more input actions in an XTestInputAction event.

- */

-

-#define XTestSHORT_DELAY_TIME	0xffff

-#define XTestDELAY_DEVICE_ID    0x0f

-

-#endif /* _XTESTEXT1CONST_H */

+/*
+ * xtestext1.h
+ *
+ * X11 Input Synthesis Extension include file
+ */
+
+/*
+
+
+Copyright 1986, 1987, 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+
+Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Hewlett-Packard not be used in
+advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+This software is not subject to any license of the American
+Telephone and Telegraph Company or of the Regents of the
+University of California.
+
+*/
+
+#ifndef _XTESTEXT1CONST_H
+#define _XTESTEXT1CONST_H 1
+
+#define XTestMAX_ACTION_LIST_SIZE       64
+#define XTestACTIONS_SIZE	28
+
+
+/*
+ * used in the XTestPressButton and XTestPressKey functions
+ */
+#define XTestPRESS                      1 << 0
+#define XTestRELEASE                    1 << 1
+#define XTestSTROKE                     1 << 2
+
+/*
+ * When doing a key or button stroke, the number of milliseconds
+ * to delay between the press and the release of a key or button
+ * in the XTestPressButton and XTestPressKey functions.
+ */
+
+#define XTestSTROKE_DELAY_TIME		10
+
+/*
+ * used in the XTestGetInput function
+ */
+#define XTestEXCLUSIVE                  1 << 0
+#define XTestPACKED_ACTIONS             1 << 1
+#define XTestPACKED_MOTION              1 << 2
+
+/*
+ * used in the XTestFakeInput function
+ */
+#define XTestFAKE_ACK_NOT_NEEDED        0
+#define XTestFAKE_ACK_REQUEST           1
+
+/*
+ * used in the XTest extension initialization routine
+ */
+#define XTestEXTENSION_NAME             "XTestExtension1"
+#define XTestEVENT_COUNT                2
+
+/*
+ * This is the definition for the format of the header byte
+ * in the input action structures.
+ */
+#define XTestACTION_TYPE_MASK   0x03    /* bits 0 and 1          */
+#define XTestKEY_STATE_MASK     0x04    /* bit 2 (key action)    */
+#define XTestX_SIGN_BIT_MASK    0x04    /* bit 2 (motion action) */
+#define XTestY_SIGN_BIT_MASK    0x08    /* bit 3 (motion action) */
+#define XTestDEVICE_ID_MASK     0xf0    /* bits 4 through 7      */
+
+#define XTestMAX_DEVICE_ID	0x0f
+#define XTestPackDeviceID(x)	(((x) & XTestMAX_DEVICE_ID) << 4)
+#define XTestUnpackDeviceID(x)	(((x) & XTestDEVICE_ID_MASK) >> 4)
+
+/*
+ * These are the possible action types.
+ */
+#define XTestDELAY_ACTION       0
+#define XTestKEY_ACTION         1
+#define XTestMOTION_ACTION      2
+#define XTestJUMP_ACTION        3
+
+/*
+ * These are the definitions for key/button motion input actions.
+ */
+#define XTestKEY_UP             0x04
+#define XTestKEY_DOWN           0x00
+
+/*
+ * These are the definitions for pointer relative motion input
+ * actions.
+ *
+ * The sign bits for the x and y relative motions are contained
+ * in the header byte.  The x and y relative motions are packed
+ * into one byte to make things fit in 32 bits.  If the relative
+ * motion range is larger than +/-15, use the pointer jump action.
+ */
+#define XTestMOTION_MAX            15
+#define XTestMOTION_MIN            -15
+
+#define XTestX_NEGATIVE            0x04
+#define XTestY_NEGATIVE            0x08
+
+#define XTestX_MOTION_MASK         0x0f
+#define XTestY_MOTION_MASK         0xf0
+
+#define XTestPackXMotionValue(x)   ((x) & XTestX_MOTION_MASK)
+#define XTestPackYMotionValue(x)   (((x) << 4) & XTestY_MOTION_MASK)
+
+#define XTestUnpackXMotionValue(x) ((x) & XTestX_MOTION_MASK)
+#define XTestUnpackYMotionValue(x) (((x) & XTestY_MOTION_MASK) >> 4)
+/*
+ * These are the definitions for a long delay input action.  It is
+ * used when more than XTestSHORT_DELAY_TIME milliseconds of delay
+ * (approximately one minute) is needed.
+ *
+ * The device ID for a delay is always set to XTestDELAY_DEVICE_ID.
+ * This guarantees that a header byte with a value of 0 is not
+ * a valid header, so it can be used as a flag to indicate that
+ * there are no more input actions in an XTestInputAction event.
+ */
+
+#define XTestSHORT_DELAY_TIME	0xffff
+#define XTestDELAY_DEVICE_ID    0x0f
+
+#endif /* _XTESTEXT1CONST_H */
diff --git a/X11/extensions/xtestext1proto.h b/X11/extensions/xtestext1proto.h
index 0bfa4ca2b..e9bdee09f 100644
--- a/X11/extensions/xtestext1proto.h
+++ b/X11/extensions/xtestext1proto.h
@@ -1,221 +1,221 @@
-/*

- * xtestext1.h

- *

- * X11 Input Synthesis Extension include file

- */

-

-/*

-Copyright 1986, 1987, 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-

-Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation

-

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Hewlett-Packard not be used in

-advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-Hewlett-Packard makes no representations about the

-suitability of this software for any purpose.  It is provided

-"as is" without express or implied warranty.

-

-This software is not subject to any license of the American

-Telephone and Telegraph Company or of the Regents of the

-University of California.

-

-*/

-

-#ifndef _XTESTEXT1PROTO_H

-#define _XTESTEXT1PROTO_H 1

-

-#include <X11/extensions/xtestext1const.h>

-

-/*

- * the typedefs for CARD8, CARD16, and CARD32 are defined in Xmd.h

- */

-

-/*

- * XTest request type values

- *

- * used in the XTest extension protocol requests

- */

-#define X_TestFakeInput                  1

-#define X_TestGetInput                   2

-#define X_TestStopInput                  3

-#define X_TestReset                      4

-#define X_TestQueryInputSize             5

-

-/*

- * This defines the maximum size of a list of input actions

- * to be sent to the server.  It should always be a multiple of

- * 4 so that the entire xTestFakeInputReq structure size is a

- * multiple of 4.

- */

-

-typedef struct {

-        CARD8   reqType;        /* always XTestReqCode             */

-        CARD8   XTestReqType;   /* always X_TestFakeInput           */

-        CARD16  length B16;     /* 2 + XTestMAX_ACTION_LIST_SIZE/4 */

-        CARD32  ack B32;

-        CARD8   action_list[XTestMAX_ACTION_LIST_SIZE];

-} xTestFakeInputReq;

-#define sz_xTestFakeInputReq (XTestMAX_ACTION_LIST_SIZE + 8)

-

-typedef struct {

-        CARD8   reqType;        /* always XTestReqCode  */

-        CARD8   XTestReqType;   /* always X_TestGetInput */

-        CARD16  length B16;     /* 2                    */

-        CARD32  mode B32;

-} xTestGetInputReq;

-#define sz_xTestGetInputReq 8

-

-typedef struct {

-        CARD8   reqType;        /* always XTestReqCode   */

-        CARD8   XTestReqType;   /* always X_TestStopInput */

-        CARD16  length B32;     /* 1                     */

-} xTestStopInputReq;

-#define sz_xTestStopInputReq 4

-

-typedef struct {

-        CARD8   reqType;        /* always XTestReqCode */

-        CARD8   XTestReqType;   /* always X_TestReset   */

-        CARD16  length B16;     /* 1                   */

-} xTestResetReq;

-#define sz_xTestResetReq 4

-

-typedef struct {

-        CARD8   reqType;        /* always XTestReqCode        */

-        CARD8   XTestReqType;   /* always X_TestQueryInputSize */

-        CARD16  length B16;     /* 1                          */

-} xTestQueryInputSizeReq;

-#define sz_xTestQueryInputSizeReq 4

-

-/*

- * This is the definition of the reply for the xTestQueryInputSize

- * request.  It should remain the same minimum size as other replies

- * (32 bytes).

- */

-typedef struct {

-        CARD8   type;           /* always X_Reply  */

-        CARD8   pad1;

-        CARD16  sequenceNumber B16;

-        CARD32  length B32;     /* always 0 */

-        CARD32  size_return B32;

-        CARD32  pad2 B32;

-        CARD32  pad3 B32;

-        CARD32  pad4 B32;

-        CARD32  pad5 B32;

-        CARD32  pad6 B32;

-} xTestQueryInputSizeReply;

-

-/*

- * This is the definition for the input action wire event structure.

- * This event is sent to the client when the server has one or

- * more user input actions to report to the client.  It must

- * remain the same size as all other wire events (32 bytes).

- */

-typedef struct {

-        CARD8   type;           /* always XTestInputActionType */

-        CARD8   pad00;

-        CARD16  sequenceNumber B16;

-        CARD8   actions[XTestACTIONS_SIZE];

-} xTestInputActionEvent;

-

-/*

- * This is the definition for the xTestFakeAck wire event structure.

- * This event is sent to the client when the server has completely

- * processed its input action buffer, and is ready for more.

- * It must remain the same size as all other wire events (32 bytes).

- */

-typedef struct {

-        CARD8   type;           /* always XTestFakeAckType */

-        CARD8   pad00;

-        CARD16  sequenceNumber B16;

-        CARD32  pad02 B32;

-        CARD32  pad03 B32;

-        CARD32  pad04 B32;

-        CARD32  pad05 B32;

-        CARD32  pad06 B32;

-        CARD32  pad07 B32;

-        CARD32  pad08 B32;

-} xTestFakeAckEvent;

-

-/*

- * These are the definitions for key/button motion input actions.

- */

-typedef struct {

-        CARD8   header;         /* which device, key up/down */

-        CARD8   keycode;        /* which key/button to move  */

-        CARD16  delay_time B16; /* how long to delay (in ms) */

-} XTestKeyInfo;

-

-/*

- * This is the definition for pointer jump input actions.

- */

-typedef struct {

-        CARD8   header;         /* which pointer             */

-        CARD8   pad1;           /* unused padding byte       */

-        CARD16  jumpx B16;      /* x coord to jump to        */

-        CARD16  jumpy B16;      /* y coord to jump to        */

-        CARD16  delay_time B16; /* how long to delay (in ms) */

-} XTestJumpInfo;

-

-/*

- * These are the definitions for pointer relative motion input

- * actions.

- *

- * The sign bits for the x and y relative motions are contained

- * in the header byte.  The x and y relative motions are packed

- * into one byte to make things fit in 32 bits.  If the relative

- * motion range is larger than +/-15, use the pointer jump action.

- */

-

-typedef struct {

-        CARD8   header;         /* which pointer             */

-        CARD8   motion_data;    /* x,y relative motion       */

-        CARD16  delay_time B16; /* how long to delay (in ms) */

-} XTestMotionInfo;

-

-/*

- * These are the definitions for a long delay input action.  It is

- * used when more than XTestSHORT_DELAY_TIME milliseconds of delay

- * (approximately one minute) is needed.

- *

- * The device ID for a delay is always set to XTestDELAY_DEVICE_ID.

- * This guarantees that a header byte with a value of 0 is not

- * a valid header, so it can be used as a flag to indicate that

- * there are no more input actions in an XTestInputAction event.

- */

-

-typedef struct {

-        CARD8   header;         /* always XTestDELAY_DEVICE_ID */

-        CARD8   pad1;           /* unused padding byte         */

-        CARD16  pad2 B16;       /* unused padding word         */

-        CARD32  delay_time B32; /* how long to delay (in ms)   */

-} XTestDelayInfo;

-

-#endif /* _XTESTEXT1PROTO_H */

+/*
+ * xtestext1.h
+ *
+ * X11 Input Synthesis Extension include file
+ */
+
+/*
+Copyright 1986, 1987, 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+
+Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Hewlett-Packard not be used in
+advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+This software is not subject to any license of the American
+Telephone and Telegraph Company or of the Regents of the
+University of California.
+
+*/
+
+#ifndef _XTESTEXT1PROTO_H
+#define _XTESTEXT1PROTO_H 1
+
+#include <X11/extensions/xtestext1const.h>
+
+/*
+ * the typedefs for CARD8, CARD16, and CARD32 are defined in Xmd.h
+ */
+
+/*
+ * XTest request type values
+ *
+ * used in the XTest extension protocol requests
+ */
+#define X_TestFakeInput                  1
+#define X_TestGetInput                   2
+#define X_TestStopInput                  3
+#define X_TestReset                      4
+#define X_TestQueryInputSize             5
+
+/*
+ * This defines the maximum size of a list of input actions
+ * to be sent to the server.  It should always be a multiple of
+ * 4 so that the entire xTestFakeInputReq structure size is a
+ * multiple of 4.
+ */
+
+typedef struct {
+        CARD8   reqType;        /* always XTestReqCode             */
+        CARD8   XTestReqType;   /* always X_TestFakeInput           */
+        CARD16  length B16;     /* 2 + XTestMAX_ACTION_LIST_SIZE/4 */
+        CARD32  ack B32;
+        CARD8   action_list[XTestMAX_ACTION_LIST_SIZE];
+} xTestFakeInputReq;
+#define sz_xTestFakeInputReq (XTestMAX_ACTION_LIST_SIZE + 8)
+
+typedef struct {
+        CARD8   reqType;        /* always XTestReqCode  */
+        CARD8   XTestReqType;   /* always X_TestGetInput */
+        CARD16  length B16;     /* 2                    */
+        CARD32  mode B32;
+} xTestGetInputReq;
+#define sz_xTestGetInputReq 8
+
+typedef struct {
+        CARD8   reqType;        /* always XTestReqCode   */
+        CARD8   XTestReqType;   /* always X_TestStopInput */
+        CARD16  length B32;     /* 1                     */
+} xTestStopInputReq;
+#define sz_xTestStopInputReq 4
+
+typedef struct {
+        CARD8   reqType;        /* always XTestReqCode */
+        CARD8   XTestReqType;   /* always X_TestReset   */
+        CARD16  length B16;     /* 1                   */
+} xTestResetReq;
+#define sz_xTestResetReq 4
+
+typedef struct {
+        CARD8   reqType;        /* always XTestReqCode        */
+        CARD8   XTestReqType;   /* always X_TestQueryInputSize */
+        CARD16  length B16;     /* 1                          */
+} xTestQueryInputSizeReq;
+#define sz_xTestQueryInputSizeReq 4
+
+/*
+ * This is the definition of the reply for the xTestQueryInputSize
+ * request.  It should remain the same minimum size as other replies
+ * (32 bytes).
+ */
+typedef struct {
+        CARD8   type;           /* always X_Reply  */
+        CARD8   pad1;
+        CARD16  sequenceNumber B16;
+        CARD32  length B32;     /* always 0 */
+        CARD32  size_return B32;
+        CARD32  pad2 B32;
+        CARD32  pad3 B32;
+        CARD32  pad4 B32;
+        CARD32  pad5 B32;
+        CARD32  pad6 B32;
+} xTestQueryInputSizeReply;
+
+/*
+ * This is the definition for the input action wire event structure.
+ * This event is sent to the client when the server has one or
+ * more user input actions to report to the client.  It must
+ * remain the same size as all other wire events (32 bytes).
+ */
+typedef struct {
+        CARD8   type;           /* always XTestInputActionType */
+        CARD8   pad00;
+        CARD16  sequenceNumber B16;
+        CARD8   actions[XTestACTIONS_SIZE];
+} xTestInputActionEvent;
+
+/*
+ * This is the definition for the xTestFakeAck wire event structure.
+ * This event is sent to the client when the server has completely
+ * processed its input action buffer, and is ready for more.
+ * It must remain the same size as all other wire events (32 bytes).
+ */
+typedef struct {
+        CARD8   type;           /* always XTestFakeAckType */
+        CARD8   pad00;
+        CARD16  sequenceNumber B16;
+        CARD32  pad02 B32;
+        CARD32  pad03 B32;
+        CARD32  pad04 B32;
+        CARD32  pad05 B32;
+        CARD32  pad06 B32;
+        CARD32  pad07 B32;
+        CARD32  pad08 B32;
+} xTestFakeAckEvent;
+
+/*
+ * These are the definitions for key/button motion input actions.
+ */
+typedef struct {
+        CARD8   header;         /* which device, key up/down */
+        CARD8   keycode;        /* which key/button to move  */
+        CARD16  delay_time B16; /* how long to delay (in ms) */
+} XTestKeyInfo;
+
+/*
+ * This is the definition for pointer jump input actions.
+ */
+typedef struct {
+        CARD8   header;         /* which pointer             */
+        CARD8   pad1;           /* unused padding byte       */
+        CARD16  jumpx B16;      /* x coord to jump to        */
+        CARD16  jumpy B16;      /* y coord to jump to        */
+        CARD16  delay_time B16; /* how long to delay (in ms) */
+} XTestJumpInfo;
+
+/*
+ * These are the definitions for pointer relative motion input
+ * actions.
+ *
+ * The sign bits for the x and y relative motions are contained
+ * in the header byte.  The x and y relative motions are packed
+ * into one byte to make things fit in 32 bits.  If the relative
+ * motion range is larger than +/-15, use the pointer jump action.
+ */
+
+typedef struct {
+        CARD8   header;         /* which pointer             */
+        CARD8   motion_data;    /* x,y relative motion       */
+        CARD16  delay_time B16; /* how long to delay (in ms) */
+} XTestMotionInfo;
+
+/*
+ * These are the definitions for a long delay input action.  It is
+ * used when more than XTestSHORT_DELAY_TIME milliseconds of delay
+ * (approximately one minute) is needed.
+ *
+ * The device ID for a delay is always set to XTestDELAY_DEVICE_ID.
+ * This guarantees that a header byte with a value of 0 is not
+ * a valid header, so it can be used as a flag to indicate that
+ * there are no more input actions in an XTestInputAction event.
+ */
+
+typedef struct {
+        CARD8   header;         /* always XTestDELAY_DEVICE_ID */
+        CARD8   pad1;           /* unused padding byte         */
+        CARD16  pad2 B16;       /* unused padding word         */
+        CARD32  delay_time B32; /* how long to delay (in ms)   */
+} XTestDelayInfo;
+
+#endif /* _XTESTEXT1PROTO_H */
diff --git a/X11/extensions/xtestproto.h b/X11/extensions/xtestproto.h
index b96b43b38..4f8db2652 100644
--- a/X11/extensions/xtestproto.h
+++ b/X11/extensions/xtestproto.h
@@ -1,124 +1,124 @@
-/*

-

-Copyright 1992, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-#ifndef _XTESTPROTO_H_

-#define _XTESTPROTO_H_

-

-#include <X11/extensions/xtestconst.h>

-

-#define Window CARD32

-#define Time CARD32

-#define Cursor CARD32

-

-#define X_XTestGetVersion	0

-#define X_XTestCompareCursor	1

-#define X_XTestFakeInput	2

-#define X_XTestGrabControl	3

-

-typedef struct {

-    CARD8	reqType;	/* always XTestReqCode */

-    CARD8	xtReqType;	/* always X_XTestGetVersion */

-    CARD16	length B16;

-    CARD8	majorVersion;

-    CARD8	pad;

-    CARD16	minorVersion B16;

-} xXTestGetVersionReq;

-#define sz_xXTestGetVersionReq 8

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    CARD8	majorVersion;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD16	minorVersion B16;

-    CARD16	pad0 B16;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xXTestGetVersionReply;

-#define sz_xXTestGetVersionReply 32

-

-typedef struct {

-    CARD8	reqType;	/* always XTestReqCode */

-    CARD8	xtReqType;	/* always X_XTestCompareCursor */

-    CARD16	length B16;

-    Window	window B32;

-    Cursor	cursor B32;

-} xXTestCompareCursorReq;

-#define sz_xXTestCompareCursorReq 12

-

-typedef struct {

-    BYTE	type;			/* X_Reply */

-    BOOL	same;

-    CARD16	sequenceNumber B16;

-    CARD32	length B32;

-    CARD32	pad0 B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    CARD32	pad3 B32;

-    CARD32	pad4 B32;

-    CARD32	pad5 B32;

-} xXTestCompareCursorReply;

-#define sz_xXTestCompareCursorReply 32

-

-/* used only on the client side */

-typedef struct {

-    CARD8	reqType;	/* always XTestReqCode */

-    CARD8	xtReqType;	/* always X_XTestFakeInput */

-    CARD16	length B16;

-    BYTE	type;

-    BYTE	detail;

-    CARD16	pad0 B16;

-    Time	time B32;

-    Window	root B32;

-    CARD32	pad1 B32;

-    CARD32	pad2 B32;

-    INT16	rootX B16, rootY B16;

-    CARD32	pad3 B32;

-    CARD16	pad4 B16;

-    CARD8	pad5;

-    CARD8	deviceid;

-} xXTestFakeInputReq;

-#define sz_xXTestFakeInputReq 36

-

-typedef struct {

-    CARD8	reqType;	/* always XTestReqCode */

-    CARD8	xtReqType;	/* always X_XTestGrabControl */

-    CARD16	length B16;

-    BOOL	impervious;

-    CARD8	pad0;

-    CARD8	pad1;

-    CARD8	pad2;

-} xXTestGrabControlReq;

-#define sz_xXTestGrabControlReq 8

-

-#undef Window

-#undef Time

-#undef Cursor

-

-#endif /* _XTESTPROTO_H_ */

+/*
+
+Copyright 1992, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifndef _XTESTPROTO_H_
+#define _XTESTPROTO_H_
+
+#include <X11/extensions/xtestconst.h>
+
+#define Window CARD32
+#define Time CARD32
+#define Cursor CARD32
+
+#define X_XTestGetVersion	0
+#define X_XTestCompareCursor	1
+#define X_XTestFakeInput	2
+#define X_XTestGrabControl	3
+
+typedef struct {
+    CARD8	reqType;	/* always XTestReqCode */
+    CARD8	xtReqType;	/* always X_XTestGetVersion */
+    CARD16	length B16;
+    CARD8	majorVersion;
+    CARD8	pad;
+    CARD16	minorVersion B16;
+} xXTestGetVersionReq;
+#define sz_xXTestGetVersionReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	majorVersion;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	minorVersion B16;
+    CARD16	pad0 B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXTestGetVersionReply;
+#define sz_xXTestGetVersionReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always XTestReqCode */
+    CARD8	xtReqType;	/* always X_XTestCompareCursor */
+    CARD16	length B16;
+    Window	window B32;
+    Cursor	cursor B32;
+} xXTestCompareCursorReq;
+#define sz_xXTestCompareCursorReq 12
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	same;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad0 B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXTestCompareCursorReply;
+#define sz_xXTestCompareCursorReply 32
+
+/* used only on the client side */
+typedef struct {
+    CARD8	reqType;	/* always XTestReqCode */
+    CARD8	xtReqType;	/* always X_XTestFakeInput */
+    CARD16	length B16;
+    BYTE	type;
+    BYTE	detail;
+    CARD16	pad0 B16;
+    Time	time B32;
+    Window	root B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    INT16	rootX B16, rootY B16;
+    CARD32	pad3 B32;
+    CARD16	pad4 B16;
+    CARD8	pad5;
+    CARD8	deviceid;
+} xXTestFakeInputReq;
+#define sz_xXTestFakeInputReq 36
+
+typedef struct {
+    CARD8	reqType;	/* always XTestReqCode */
+    CARD8	xtReqType;	/* always X_XTestGrabControl */
+    CARD16	length B16;
+    BOOL	impervious;
+    CARD8	pad0;
+    CARD8	pad1;
+    CARD8	pad2;
+} xXTestGrabControlReq;
+#define sz_xXTestGrabControlReq 8
+
+#undef Window
+#undef Time
+#undef Cursor
+
+#endif /* _XTESTPROTO_H_ */