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

8 files changed, 758 insertions, 758 deletions

diff --git a/libXext/include/X11/extensions/MITMisc.h b/libXext/include/X11/extensions/MITMisc.h
index c6b7fefc1..4cfb334ee 100644
--- a/libXext/include/X11/extensions/MITMisc.h
+++ b/libXext/include/X11/extensions/MITMisc.h
@@ -1,54 +1,54 @@
-/************************************************************

-

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

-#define _XMITMISC_H_

-

-#include <X11/Xfuncproto.h>

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

-

-_XFUNCPROTOBEGIN

-

-Bool XMITMiscQueryExtension(

-    Display*		/* dpy */,

-    int*		/* event_basep */,

-    int*		/* error_basep */

-);

-

-Status XMITMiscSetBugMode(

-    Display*		/* dpy */,

-    Bool		/* onOff */

-);

-

-Bool XMITMiscGetBugMode(

-    Display*		/* dpy */

-);

-

-_XFUNCPROTOEND

-

-#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 _XMITMISC_H_
+#define _XMITMISC_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/mitmiscconst.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XMITMiscQueryExtension(
+    Display*		/* dpy */,
+    int*		/* event_basep */,
+    int*		/* error_basep */
+);
+
+Status XMITMiscSetBugMode(
+    Display*		/* dpy */,
+    Bool		/* onOff */
+);
+
+Bool XMITMiscGetBugMode(
+    Display*		/* dpy */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/libXext/include/X11/extensions/XEVI.h b/libXext/include/X11/extensions/XEVI.h
index 49132d1de..9ca441200 100644
--- a/libXext/include/X11/extensions/XEVI.h
+++ b/libXext/include/X11/extensions/XEVI.h
@@ -1,61 +1,61 @@
-/************************************************************

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

-#define _XEVI_H_

-#include <X11/Xfuncproto.h>

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

-

-typedef struct {

-    VisualID		core_visual_id;

-    int			screen;

-    int			level;

-    unsigned int	transparency_type;

-    unsigned int	transparency_value;

-    unsigned int	min_hw_colormaps;

-    unsigned int	max_hw_colormaps;

-    unsigned int	num_colormap_conflicts;

-    VisualID*		colormap_conflicts;

-} ExtendedVisualInfo;

-

-_XFUNCPROTOBEGIN

-

-Bool XeviQueryExtension(

-    Display*            /* dpy */

-);

-Status XeviQueryVersion(

-    Display*		/* dpy */,

-    int*		/* majorVersion */,

-    int*		/* minorVersion */

-);

-Status XeviGetVisualInfo(

-    Display*		 	/* dpy */,

-    VisualID*			/* visual_query */,

-    int				/* nVisual_query */,

-    ExtendedVisualInfo**	/* extendedVisualInfo_return */,

-    int*			/* nInfo_return */

-);

-

-_XFUNCPROTOEND

-

-#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 _XEVI_H_
+#define _XEVI_H_
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/EVI.h>
+
+typedef struct {
+    VisualID		core_visual_id;
+    int			screen;
+    int			level;
+    unsigned int	transparency_type;
+    unsigned int	transparency_value;
+    unsigned int	min_hw_colormaps;
+    unsigned int	max_hw_colormaps;
+    unsigned int	num_colormap_conflicts;
+    VisualID*		colormap_conflicts;
+} ExtendedVisualInfo;
+
+_XFUNCPROTOBEGIN
+
+Bool XeviQueryExtension(
+    Display*            /* dpy */
+);
+Status XeviQueryVersion(
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */
+);
+Status XeviGetVisualInfo(
+    Display*		 	/* dpy */,
+    VisualID*			/* visual_query */,
+    int				/* nVisual_query */,
+    ExtendedVisualInfo**	/* extendedVisualInfo_return */,
+    int*			/* nInfo_return */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/libXext/include/X11/extensions/Xag.h b/libXext/include/X11/extensions/Xag.h
index dfc2e7036..9f69f7875 100644
--- a/libXext/include/X11/extensions/Xag.h
+++ b/libXext/include/X11/extensions/Xag.h
@@ -1,90 +1,90 @@
-/*

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

-#define _XAG_H_

-

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

-#include <X11/Xfuncproto.h>

-

-#include <stdarg.h>

-

-_XFUNCPROTOBEGIN

-

-typedef XID XAppGroup;

-

-Bool XagQueryVersion(

-    Display*			/* dpy */,

-    int*			/* major_version */,

-    int*			/* minor_version */

-);

-

-Status XagCreateEmbeddedApplicationGroup(

-    Display*			/* dpy */,

-    VisualID			/* root_visual */,

-    Colormap			/* default_colormap */,

-    unsigned long		/* black_pixel */,

-    unsigned long		/* white_pixel */,

-    XAppGroup*			/* app_group_return */

-);

-

-Status XagCreateNonembeddedApplicationGroup(

-    Display*			/* dpy */,

-    XAppGroup*			/* app_group_return */

-);

-

-Status XagDestroyApplicationGroup(

-    Display*			/* dpy */,

-    XAppGroup			/* app_group */

-);

-

-Status XagGetApplicationGroupAttributes(

-    Display*			/* dpy */,

-    XAppGroup			/* app_group */,

-    ...

-);

-

-Status XagQueryApplicationGroup(

-    Display*			/* dpy */,

-    XID				/* resource_base */,

-    XAppGroup*			/* app_group_ret */

-);

-

-Status XagCreateAssociation(

-    Display*			/* dpy */,

-    Window*			/* window_ret */,

-    void*			/* system_window */

-);

-

-Status XagDestroyAssociation(

-    Display*			/* dpy */,

-    Window			/* window */

-);

-

-_XFUNCPROTOEND

-

-#endif /* _XAG_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 _XAG_H_
+#define _XAG_H_
+
+#include <X11/extensions/ag.h>
+#include <X11/Xfuncproto.h>
+
+#include <stdarg.h>
+
+_XFUNCPROTOBEGIN
+
+typedef XID XAppGroup;
+
+Bool XagQueryVersion(
+    Display*			/* dpy */,
+    int*			/* major_version */,
+    int*			/* minor_version */
+);
+
+Status XagCreateEmbeddedApplicationGroup(
+    Display*			/* dpy */,
+    VisualID			/* root_visual */,
+    Colormap			/* default_colormap */,
+    unsigned long		/* black_pixel */,
+    unsigned long		/* white_pixel */,
+    XAppGroup*			/* app_group_return */
+);
+
+Status XagCreateNonembeddedApplicationGroup(
+    Display*			/* dpy */,
+    XAppGroup*			/* app_group_return */
+);
+
+Status XagDestroyApplicationGroup(
+    Display*			/* dpy */,
+    XAppGroup			/* app_group */
+);
+
+Status XagGetApplicationGroupAttributes(
+    Display*			/* dpy */,
+    XAppGroup			/* app_group */,
+    ...
+);
+
+Status XagQueryApplicationGroup(
+    Display*			/* dpy */,
+    XID				/* resource_base */,
+    XAppGroup*			/* app_group_ret */
+);
+
+Status XagCreateAssociation(
+    Display*			/* dpy */,
+    Window*			/* window_ret */,
+    void*			/* system_window */
+);
+
+Status XagDestroyAssociation(
+    Display*			/* dpy */,
+    Window			/* window */
+);
+
+_XFUNCPROTOEND
+
+#endif /* _XAG_H_ */
+
diff --git a/libXext/include/X11/extensions/Xcup.h b/libXext/include/X11/extensions/Xcup.h
index 8d69575b1..c8074cf3d 100644
--- a/libXext/include/X11/extensions/Xcup.h
+++ b/libXext/include/X11/extensions/Xcup.h
@@ -1,58 +1,58 @@
-/*

-

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

-#define _XCUP_H_

-

-#include <X11/Xfuncproto.h>

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

-

-_XFUNCPROTOBEGIN

-

-Bool XcupQueryVersion(

-    Display*			/* dpy */,

-    int*			/* major_version */,

-    int*			/* minor_version */

-);

-

-Status XcupGetReservedColormapEntries(

-    Display*			/* dpy */,

-    int				/* screen */,

-    XColor**			/* colors_out */,

-    int*			/* ncolors */

-);

-

-Status XcupStoreColors(

-    Display*			/* dpy */,

-    Colormap			/* colormap */,

-    XColor*			/* colors */,

-    int				/* ncolors */

-);

-

-_XFUNCPROTOEND

-

-#endif /* _XCUP_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 _XCUP_H_
+#define _XCUP_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/cup.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XcupQueryVersion(
+    Display*			/* dpy */,
+    int*			/* major_version */,
+    int*			/* minor_version */
+);
+
+Status XcupGetReservedColormapEntries(
+    Display*			/* dpy */,
+    int				/* screen */,
+    XColor**			/* colors_out */,
+    int*			/* ncolors */
+);
+
+Status XcupStoreColors(
+    Display*			/* dpy */,
+    Colormap			/* colormap */,
+    XColor*			/* colors */,
+    int				/* ncolors */
+);
+
+_XFUNCPROTOEND
+
+#endif /* _XCUP_H_ */
+
diff --git a/libXext/include/X11/extensions/Xext.h b/libXext/include/X11/extensions/Xext.h
index c7c5723e2..858592b78 100644
--- a/libXext/include/X11/extensions/Xext.h
+++ b/libXext/include/X11/extensions/Xext.h
@@ -1,53 +1,53 @@
-/*

- *

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

-#define _XEXT_H_

-

-#include <X11/Xfuncproto.h>

-

-_XFUNCPROTOBEGIN

-

-typedef int (*XextErrorHandler) (

-    Display *		/* dpy */,

-    _Xconst char*	/* ext_name */,

-    _Xconst char*	/* reason */

-);

-

-extern XextErrorHandler XSetExtensionErrorHandler(

-    XextErrorHandler	/* handler */

-);

-

-extern int XMissingExtension(

-    Display*		/* dpy */,

-    _Xconst char*	/* ext_name */

-);

-

-_XFUNCPROTOEND

-

-#define X_EXTENSION_UNKNOWN "unknown"

-#define X_EXTENSION_MISSING "missing"

-

-#endif /* _XEXT_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 _XEXT_H_
+#define _XEXT_H_
+
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+typedef int (*XextErrorHandler) (
+    Display *		/* dpy */,
+    _Xconst char*	/* ext_name */,
+    _Xconst char*	/* reason */
+);
+
+extern XextErrorHandler XSetExtensionErrorHandler(
+    XextErrorHandler	/* handler */
+);
+
+extern int XMissingExtension(
+    Display*		/* dpy */,
+    _Xconst char*	/* ext_name */
+);
+
+_XFUNCPROTOEND
+
+#define X_EXTENSION_UNKNOWN "unknown"
+#define X_EXTENSION_MISSING "missing"
+
+#endif /* _XEXT_H_ */
diff --git a/libXext/include/X11/extensions/multibuf.h b/libXext/include/X11/extensions/multibuf.h
index d2f805ee7..12fda357d 100644
--- a/libXext/include/X11/extensions/multibuf.h
+++ b/libXext/include/X11/extensions/multibuf.h
@@ -1,213 +1,213 @@
-/*

- *

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

-#define _MULTIBUF_H_

-

-#include <X11/Xfuncproto.h>

-

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

-

-#if !defined(UNIXCPP) || defined(ANSICPP)

-#define MbufGetReq(name,req,info) GetReq (name, req); \

-	req->reqType = info->codes->major_opcode; \

-	req->mbufReqType = X_##name;

-#else

-#define MbufGetReq(name,req,info) GetReq (name, req); \

-	req->reqType = info->codes->major_opcode; \

-	req->mbufReqType = X_/**/name;

-#endif

-

-/*

- * Extra definitions that will only be needed in the client

- */

-typedef XID Multibuffer;

-

-typedef struct {

-    int	type;		    /* of event */

-    unsigned long serial;   /* # of last request processed by server */

-    int send_event;	    /* true if this came frome a SendEvent request */

-    Display *display;	    /* Display the event was read from */

-    Multibuffer buffer;	    /* buffer of event */

-    int	state;		    /* see Clobbered constants above */

-} XmbufClobberNotifyEvent;

-

-typedef struct {

-    int	type;		    /* of event */

-    unsigned long serial;   /* # of last request processed by server */

-    int send_event;	    /* true if this came frome a SendEvent request */

-    Display *display;	    /* Display the event was read from */

-    Multibuffer buffer;	    /* buffer of event */

-} XmbufUpdateNotifyEvent;

-

-

-/*

- * per-window attributes that can be got

- */

-typedef struct {

-    int displayed_index;	/* which buffer is being displayed */

-    int update_action;		/* Undefined, Background, Untouched, Copied */

-    int update_hint;		/* Frequent, Intermittent, Static */

-    int window_mode;		/* Mono, Stereo */

-    int nbuffers;		/* Number of buffers */

-    Multibuffer *buffers;	/* Buffers */

-} XmbufWindowAttributes;

-

-/*

- * per-window attributes that can be set

- */

-typedef struct {

-    int update_hint;		/* Frequent, Intermittent, Static */

-} XmbufSetWindowAttributes;

-

-

-/*

- * per-buffer attributes that can be got

- */

-typedef struct {

-    Window window;		/* which window this belongs to */

-    unsigned long event_mask;	/* events that have been selected */

-    int buffer_index;		/* which buffer is this */

-    int side;			/* Mono, Left, Right */

-} XmbufBufferAttributes;

-

-/*

- * per-buffer attributes that can be set

- */

-typedef struct {

-    unsigned long event_mask;	/* events that have been selected */

-} XmbufSetBufferAttributes;

-

-

-/*

- * per-screen buffer info (there will be lists of them)

- */

-typedef struct {

-    VisualID visualid;		/* visual usuable at this depth */

-    int max_buffers;		/* most buffers for this visual */

-    int depth;			/* depth of buffers to be created */

-} XmbufBufferInfo;

-

-_XFUNCPROTOBEGIN

-

-extern Bool XmbufQueryExtension(

-    Display*		/* dpy */,

-    int*		/* event_base_return */,

-    int*		/* error_base_return */

-);

-

-extern Status XmbufGetVersion(

-    Display*		/* dpy */,

-    int*		/* major_version_return */,

-    int*		/* minor_version_return */

-);

-

-extern int XmbufCreateBuffers(

-    Display*		/* dpy */,

-    Window		/* w */,

-    int			/* count */,

-    int			/* update_action */,

-    int			/* update_hint */,

-    Multibuffer*	/* buffers */

-);

-

-extern void XmbufDestroyBuffers(

-    Display*		/* dpy */,

-    Window		/* window */

-);

-

-extern void XmbufDisplayBuffers(

-    Display*		/* dpy */,

-    int			/* count */,

-    Multibuffer*	/* buffers */,

-    int			/* min_delay */,

-    int			/* max_delay */

-);

-

-extern Status XmbufGetWindowAttributes(

-    Display*			/* dpy */,

-    Window			/* w */,

-    XmbufWindowAttributes*	/* attr */

-);

-

-extern void XmbufChangeWindowAttributes(

-    Display*			/* dpy */,

-    Window			/* w */,

-    unsigned long		/* valuemask */,

-    XmbufSetWindowAttributes*	/* attr */

-);

-

-extern Status XmbufGetBufferAttributes(

-    Display*			/* dpy */,

-    Multibuffer			/* b */,

-    XmbufBufferAttributes*	/* attr */

-);

-

-extern void XmbufChangeBufferAttributes(

-    Display*			/* dpy */,

-    Multibuffer			/* b */,

-    unsigned long		/* valuemask */,

-    XmbufSetBufferAttributes*	/* attr */

-);

-

-extern Status XmbufGetScreenInfo(

-    Display*			/* dpy */,

-    Drawable			/* d */,

-    int*			/* nmono_return */,

-    XmbufBufferInfo**		/* mono_info_return */,

-    int*			/* nstereo_return */,

-    XmbufBufferInfo**		/* stereo_info_return */

-);

-

-extern Window XmbufCreateStereoWindow(

-    Display*			/* dpy */,

-    Window			/* parent */,

-    int				/* x */,

-    int				/* y */,

-    unsigned int		/* width */,

-    unsigned int		/* height */,

-    unsigned int		/* border_width */,

-    int				/* depth */,

-    unsigned int		/* class */,

-    Visual*			/* visual */,

-    unsigned long		/* valuemask */,

-    XSetWindowAttributes*	/* attr */,

-    Multibuffer*		/* leftp */,

-    Multibuffer*		/* rightp */

-);

-

-extern void XmbufClearBufferArea(

-    Display*			/* dpy */,

-    Multibuffer			/* buffer */,

-    int				/* x */,

-    int				/* y */,

-    unsigned int		/* width */,

-    unsigned int		/* height */,

-    Bool			/* exposures */

-);

-

-_XFUNCPROTOEND

-

-#endif /* _MULTIBUF_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 _MULTIBUF_H_
+#define _MULTIBUF_H_
+
+#include <X11/Xfuncproto.h>
+
+#include <X11/extensions/multibufconst.h>
+
+#if !defined(UNIXCPP) || defined(ANSICPP)
+#define MbufGetReq(name,req,info) GetReq (name, req); \
+	req->reqType = info->codes->major_opcode; \
+	req->mbufReqType = X_##name;
+#else
+#define MbufGetReq(name,req,info) GetReq (name, req); \
+	req->reqType = info->codes->major_opcode; \
+	req->mbufReqType = X_/**/name;
+#endif
+
+/*
+ * Extra definitions that will only be needed in the client
+ */
+typedef XID Multibuffer;
+
+typedef struct {
+    int	type;		    /* of event */
+    unsigned long serial;   /* # of last request processed by server */
+    int send_event;	    /* true if this came frome a SendEvent request */
+    Display *display;	    /* Display the event was read from */
+    Multibuffer buffer;	    /* buffer of event */
+    int	state;		    /* see Clobbered constants above */
+} XmbufClobberNotifyEvent;
+
+typedef struct {
+    int	type;		    /* of event */
+    unsigned long serial;   /* # of last request processed by server */
+    int send_event;	    /* true if this came frome a SendEvent request */
+    Display *display;	    /* Display the event was read from */
+    Multibuffer buffer;	    /* buffer of event */
+} XmbufUpdateNotifyEvent;
+
+
+/*
+ * per-window attributes that can be got
+ */
+typedef struct {
+    int displayed_index;	/* which buffer is being displayed */
+    int update_action;		/* Undefined, Background, Untouched, Copied */
+    int update_hint;		/* Frequent, Intermittent, Static */
+    int window_mode;		/* Mono, Stereo */
+    int nbuffers;		/* Number of buffers */
+    Multibuffer *buffers;	/* Buffers */
+} XmbufWindowAttributes;
+
+/*
+ * per-window attributes that can be set
+ */
+typedef struct {
+    int update_hint;		/* Frequent, Intermittent, Static */
+} XmbufSetWindowAttributes;
+
+
+/*
+ * per-buffer attributes that can be got
+ */
+typedef struct {
+    Window window;		/* which window this belongs to */
+    unsigned long event_mask;	/* events that have been selected */
+    int buffer_index;		/* which buffer is this */
+    int side;			/* Mono, Left, Right */
+} XmbufBufferAttributes;
+
+/*
+ * per-buffer attributes that can be set
+ */
+typedef struct {
+    unsigned long event_mask;	/* events that have been selected */
+} XmbufSetBufferAttributes;
+
+
+/*
+ * per-screen buffer info (there will be lists of them)
+ */
+typedef struct {
+    VisualID visualid;		/* visual usuable at this depth */
+    int max_buffers;		/* most buffers for this visual */
+    int depth;			/* depth of buffers to be created */
+} XmbufBufferInfo;
+
+_XFUNCPROTOBEGIN
+
+extern Bool XmbufQueryExtension(
+    Display*		/* dpy */,
+    int*		/* event_base_return */,
+    int*		/* error_base_return */
+);
+
+extern Status XmbufGetVersion(
+    Display*		/* dpy */,
+    int*		/* major_version_return */,
+    int*		/* minor_version_return */
+);
+
+extern int XmbufCreateBuffers(
+    Display*		/* dpy */,
+    Window		/* w */,
+    int			/* count */,
+    int			/* update_action */,
+    int			/* update_hint */,
+    Multibuffer*	/* buffers */
+);
+
+extern void XmbufDestroyBuffers(
+    Display*		/* dpy */,
+    Window		/* window */
+);
+
+extern void XmbufDisplayBuffers(
+    Display*		/* dpy */,
+    int			/* count */,
+    Multibuffer*	/* buffers */,
+    int			/* min_delay */,
+    int			/* max_delay */
+);
+
+extern Status XmbufGetWindowAttributes(
+    Display*			/* dpy */,
+    Window			/* w */,
+    XmbufWindowAttributes*	/* attr */
+);
+
+extern void XmbufChangeWindowAttributes(
+    Display*			/* dpy */,
+    Window			/* w */,
+    unsigned long		/* valuemask */,
+    XmbufSetWindowAttributes*	/* attr */
+);
+
+extern Status XmbufGetBufferAttributes(
+    Display*			/* dpy */,
+    Multibuffer			/* b */,
+    XmbufBufferAttributes*	/* attr */
+);
+
+extern void XmbufChangeBufferAttributes(
+    Display*			/* dpy */,
+    Multibuffer			/* b */,
+    unsigned long		/* valuemask */,
+    XmbufSetBufferAttributes*	/* attr */
+);
+
+extern Status XmbufGetScreenInfo(
+    Display*			/* dpy */,
+    Drawable			/* d */,
+    int*			/* nmono_return */,
+    XmbufBufferInfo**		/* mono_info_return */,
+    int*			/* nstereo_return */,
+    XmbufBufferInfo**		/* stereo_info_return */
+);
+
+extern Window XmbufCreateStereoWindow(
+    Display*			/* dpy */,
+    Window			/* parent */,
+    int				/* x */,
+    int				/* y */,
+    unsigned int		/* width */,
+    unsigned int		/* height */,
+    unsigned int		/* border_width */,
+    int				/* depth */,
+    unsigned int		/* class */,
+    Visual*			/* visual */,
+    unsigned long		/* valuemask */,
+    XSetWindowAttributes*	/* attr */,
+    Multibuffer*		/* leftp */,
+    Multibuffer*		/* rightp */
+);
+
+extern void XmbufClearBufferArea(
+    Display*			/* dpy */,
+    Multibuffer			/* buffer */,
+    int				/* x */,
+    int				/* y */,
+    unsigned int		/* width */,
+    unsigned int		/* height */,
+    Bool			/* exposures */
+);
+
+_XFUNCPROTOEND
+
+#endif /* _MULTIBUF_H_ */
diff --git a/libXext/include/X11/extensions/security.h b/libXext/include/X11/extensions/security.h
index 90abc07ee..f5541310b 100644
--- a/libXext/include/X11/extensions/security.h
+++ b/libXext/include/X11/extensions/security.h
@@ -1,77 +1,77 @@
-/*

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

-#define _SECURITY_H

-

-#define _XAUTH_STRUCT_ONLY

-#include <X11/Xauth.h>

-

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

-

-_XFUNCPROTOBEGIN

-

-Status XSecurityQueryExtension (

-    Display *dpy,

-    int *major_version_return,

-    int *minor_version_return);

-

-Xauth *XSecurityAllocXauth(void);

-

-void XSecurityFreeXauth(Xauth *auth);

-

-/* type for returned auth ids */

-typedef unsigned long XSecurityAuthorization;

-

-typedef struct {

-    unsigned int timeout;

-    unsigned int trust_level;

-    XID          group;

-    long	 event_mask;

-} XSecurityAuthorizationAttributes;

-

-Xauth *XSecurityGenerateAuthorization(

-    Display *dpy,

-    Xauth *auth_in,

-    unsigned long valuemask,

-    XSecurityAuthorizationAttributes *attributes,

-    XSecurityAuthorization *auth_id_return);

-

-Status XSecurityRevokeAuthorization(

-    Display *dpy,

-    XSecurityAuthorization auth_id);

-

-_XFUNCPROTOEND

-

-typedef struct {

-    int type;		      /* event base + XSecurityAuthorizationRevoked */

-    unsigned long serial;     /* # of last request processed by server */

-    Bool send_event;	      /* true if this came from a SendEvent request */

-    Display *display;	      /* Display the event was read from */

-    XSecurityAuthorization auth_id; /* revoked authorization id */

-} XSecurityAuthorizationRevokedEvent;

-

-#endif /* _SECURITY_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 _SECURITY_H
+#define _SECURITY_H
+
+#define _XAUTH_STRUCT_ONLY
+#include <X11/Xauth.h>
+
+#include <X11/extensions/secur.h>
+
+_XFUNCPROTOBEGIN
+
+Status XSecurityQueryExtension (
+    Display *dpy,
+    int *major_version_return,
+    int *minor_version_return);
+
+Xauth *XSecurityAllocXauth(void);
+
+void XSecurityFreeXauth(Xauth *auth);
+
+/* type for returned auth ids */
+typedef unsigned long XSecurityAuthorization;
+
+typedef struct {
+    unsigned int timeout;
+    unsigned int trust_level;
+    XID          group;
+    long	 event_mask;
+} XSecurityAuthorizationAttributes;
+
+Xauth *XSecurityGenerateAuthorization(
+    Display *dpy,
+    Xauth *auth_in,
+    unsigned long valuemask,
+    XSecurityAuthorizationAttributes *attributes,
+    XSecurityAuthorization *auth_id_return);
+
+Status XSecurityRevokeAuthorization(
+    Display *dpy,
+    XSecurityAuthorization auth_id);
+
+_XFUNCPROTOEND
+
+typedef struct {
+    int type;		      /* event base + XSecurityAuthorizationRevoked */
+    unsigned long serial;     /* # of last request processed by server */
+    Bool send_event;	      /* true if this came from a SendEvent request */
+    Display *display;	      /* Display the event was read from */
+    XSecurityAuthorization auth_id; /* revoked authorization id */
+} XSecurityAuthorizationRevokedEvent;
+
+#endif /* _SECURITY_H */
diff --git a/libXext/include/X11/extensions/shape.h b/libXext/include/X11/extensions/shape.h
index e2f62d0bc..66af5b1b4 100644
--- a/libXext/include/X11/extensions/shape.h
+++ b/libXext/include/X11/extensions/shape.h
@@ -1,152 +1,152 @@
-/************************************************************

-

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

-#define _SHAPE_H_

-

-#include <X11/Xfuncproto.h>

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

-

-#ifndef _SHAPE_SERVER_

-#include <X11/Xutil.h>

-

-typedef struct {

-    int	type;		    /* of event */

-    unsigned long serial;   /* # of last request processed by server */

-    Bool send_event;	    /* true if this came frome a SendEvent request */

-    Display *display;	    /* Display the event was read from */

-    Window window;	    /* window of event */

-    int kind;		    /* ShapeBounding or ShapeClip */

-    int x, y;		    /* extents of new region */

-    unsigned width, height;

-    Time time;		    /* server timestamp when region changed */

-    Bool shaped;	    /* true if the region exists */

-} XShapeEvent;

-

-_XFUNCPROTOBEGIN

-

-extern Bool XShapeQueryExtension (

-    Display*	/* display */,

-    int*	/* event_base */,

-    int*	/* error_base */

-);

-

-extern Status XShapeQueryVersion (

-    Display*	/* display */,

-    int*	/* major_version */,

-    int*	/* minor_version */

-);

-

-extern void XShapeCombineRegion (

-    Display*	/* display */,

-    Window	/* dest */,

-    int		/* dest_kind */,

-    int		/* x_off */,

-    int		/* y_off */,

-    Region	/* region */,

-    int		/* op */

-);

-

-extern void XShapeCombineRectangles (

-    Display*	/* display */,

-    Window	/* dest */,

-    int		/* dest_kind */,

-    int		/* x_off */,

-    int		/* y_off */,

-    XRectangle*	/* rectangles */,

-    int		/* n_rects */,

-    int		/* op */,

-    int		/* ordering */

-);

-

-extern void XShapeCombineMask (

-    Display*	/* display */,

-    Window	/* dest */,

-    int		/* dest_kind */,

-    int		/* x_off */,

-    int		/* y_off */,

-    Pixmap	/* src */,

-    int		/* op */

-);

-

-extern void XShapeCombineShape (

-    Display*	/* display */,

-    Window	/* dest */,

-    int		/* dest_kind */,

-    int		/* x_off */,

-    int		/* y_off */,

-    Window	/* src */,

-    int		/* src_kind */,

-    int		/* op */

-);

-

-extern void XShapeOffsetShape (

-    Display*	/* display */,

-    Window	/* dest */,

-    int		/* dest_kind */,

-    int		/* x_off */,

-    int		/* y_off */

-);

-

-extern Status XShapeQueryExtents (

-    Display*		/* display */,

-    Window		/* window */,

-    Bool*		/* bounding_shaped */,

-    int*		/* x_bounding */,

-    int*		/* y_bounding */,

-    unsigned int*	/* w_bounding */,

-    unsigned int*	/* h_bounding */,

-    Bool*		/* clip_shaped */,

-    int*		/* x_clip */,

-    int*		/* y_clip */,

-    unsigned int*	/* w_clip */,

-    unsigned int*	/* h_clip */

-);

-

-extern void XShapeSelectInput (

-    Display*		/* display */,

-    Window		/* window */,

-    unsigned long	/* mask */

-);

-

-extern unsigned long XShapeInputSelected (

-    Display*	/* display */,

-    Window	/* window */

-);

-

-extern XRectangle *XShapeGetRectangles (

-    Display*	/* display */,

-    Window	/* window */,

-    int		/* kind */,

-    int*	/* count */,

-    int*	/* ordering */

-);

-

-_XFUNCPROTOEND

-

-#endif /* !_SHAPE_SERVER_ */

-

-#endif /* _SHAPE_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 _SHAPE_H_
+#define _SHAPE_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/shapeconst.h>
+
+#ifndef _SHAPE_SERVER_
+#include <X11/Xutil.h>
+
+typedef struct {
+    int	type;		    /* of event */
+    unsigned long serial;   /* # of last request processed by server */
+    Bool send_event;	    /* true if this came frome a SendEvent request */
+    Display *display;	    /* Display the event was read from */
+    Window window;	    /* window of event */
+    int kind;		    /* ShapeBounding or ShapeClip */
+    int x, y;		    /* extents of new region */
+    unsigned width, height;
+    Time time;		    /* server timestamp when region changed */
+    Bool shaped;	    /* true if the region exists */
+} XShapeEvent;
+
+_XFUNCPROTOBEGIN
+
+extern Bool XShapeQueryExtension (
+    Display*	/* display */,
+    int*	/* event_base */,
+    int*	/* error_base */
+);
+
+extern Status XShapeQueryVersion (
+    Display*	/* display */,
+    int*	/* major_version */,
+    int*	/* minor_version */
+);
+
+extern void XShapeCombineRegion (
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    Region	/* region */,
+    int		/* op */
+);
+
+extern void XShapeCombineRectangles (
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    XRectangle*	/* rectangles */,
+    int		/* n_rects */,
+    int		/* op */,
+    int		/* ordering */
+);
+
+extern void XShapeCombineMask (
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    Pixmap	/* src */,
+    int		/* op */
+);
+
+extern void XShapeCombineShape (
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */,
+    Window	/* src */,
+    int		/* src_kind */,
+    int		/* op */
+);
+
+extern void XShapeOffsetShape (
+    Display*	/* display */,
+    Window	/* dest */,
+    int		/* dest_kind */,
+    int		/* x_off */,
+    int		/* y_off */
+);
+
+extern Status XShapeQueryExtents (
+    Display*		/* display */,
+    Window		/* window */,
+    Bool*		/* bounding_shaped */,
+    int*		/* x_bounding */,
+    int*		/* y_bounding */,
+    unsigned int*	/* w_bounding */,
+    unsigned int*	/* h_bounding */,
+    Bool*		/* clip_shaped */,
+    int*		/* x_clip */,
+    int*		/* y_clip */,
+    unsigned int*	/* w_clip */,
+    unsigned int*	/* h_clip */
+);
+
+extern void XShapeSelectInput (
+    Display*		/* display */,
+    Window		/* window */,
+    unsigned long	/* mask */
+);
+
+extern unsigned long XShapeInputSelected (
+    Display*	/* display */,
+    Window	/* window */
+);
+
+extern XRectangle *XShapeGetRectangles (
+    Display*	/* display */,
+    Window	/* window */,
+    int		/* kind */,
+    int*	/* count */,
+    int*	/* ordering */
+);
+
+_XFUNCPROTOEND
+
+#endif /* !_SHAPE_SERVER_ */
+
+#endif /* _SHAPE_H_ */