synchronised files

16 files changed, 1357 insertions, 1393 deletions

diff --git a/X11/Xauth.h b/X11/Xauth.h
index ace975d84..ec8375a35 100644
--- a/X11/Xauth.h
+++ b/X11/Xauth.h
@@ -1,141 +1,137 @@
-/* $Xorg: Xauth.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
-
-/*
-
-Copyright 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.
-
-*/
-
-/* $XFree86: xc/lib/Xau/Xauth.h,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
-
-#ifndef _Xauth_h
-#define _Xauth_h
-
-typedef struct xauth {
-    unsigned short   family;
-    unsigned short   address_length;
-    char    	    *address;
-    unsigned short   number_length;
-    char    	    *number;
-    unsigned short   name_length;
-    char    	    *name;
-    unsigned short   data_length;
-    char   	    *data;
-} Xauth;
-
-#ifndef _XAUTH_STRUCT_ONLY
-
-# include   <X11/Xfuncproto.h>
-# include   <X11/Xfuncs.h>
-
-# include   <stdio.h>
-
-# define FamilyLocal (256)	/* not part of X standard (i.e. X.h) */
-# define FamilyWild  (65535)
-# define FamilyNetname    (254)   /* not part of X standard */
-# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
-# define FamilyLocalHost (252)	/* for local non-net authentication */
-
-
-_XFUNCPROTOBEGIN
-
-char *XauFileName(void);
-
-Xauth *XauReadAuth(
-FILE*	/* auth_file */
-);
-
-int XauLockAuth(
-_Xconst char*	/* file_name */,
-int		/* retries */,
-int		/* timeout */,
-long		/* dead */
-);
-
-int XauUnlockAuth(
-_Xconst char*	/* file_name */
-);
-
-int XauWriteAuth(
-FILE*		/* auth_file */,
-Xauth*		/* auth */
-);
-
-Xauth *XauGetAuthByAddr(
-#if NeedWidePrototypes
-unsigned int	/* family */,
-unsigned int	/* address_length */,
-#else
-unsigned short	/* family */,
-unsigned short	/* address_length */,
-#endif
-_Xconst char*	/* address */,
-#if NeedWidePrototypes
-unsigned int	/* number_length */,
-#else
-unsigned short	/* number_length */,
-#endif
-_Xconst char*	/* number */,
-#if NeedWidePrototypes
-unsigned int	/* name_length */,
-#else
-unsigned short	/* name_length */,
-#endif
-_Xconst char*	/* name */
-);
-
-Xauth *XauGetBestAuthByAddr(
-#if NeedWidePrototypes
-unsigned int	/* family */,
-unsigned int	/* address_length */,
-#else
-unsigned short	/* family */,
-unsigned short	/* address_length */,
-#endif
-_Xconst char*	/* address */,
-#if NeedWidePrototypes
-unsigned int	/* number_length */,
-#else
-unsigned short	/* number_length */,
-#endif
-_Xconst char*	/* number */,
-int		/* types_length */,
-char**		/* type_names */,
-_Xconst int*	/* type_lengths */
-);
-
-void XauDisposeAuth(
-Xauth*		/* auth */
-);
-
-_XFUNCPROTOEND
-
-/* Return values from XauLockAuth */
-
-# define LOCK_SUCCESS	0	/* lock succeeded */
-# define LOCK_ERROR	1	/* lock unexpectely failed, check errno */
-# define LOCK_TIMEOUT	2	/* lock failed, timeouts expired */
-
-#endif /* _XAUTH_STRUCT_ONLY */
-
-#endif /* _Xauth_h */
+/*

+

+Copyright 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 _Xauth_h

+#define _Xauth_h

+

+typedef struct xauth {

+    unsigned short   family;

+    unsigned short   address_length;

+    char    	    *address;

+    unsigned short   number_length;

+    char    	    *number;

+    unsigned short   name_length;

+    char    	    *name;

+    unsigned short   data_length;

+    char   	    *data;

+} Xauth;

+

+#ifndef _XAUTH_STRUCT_ONLY

+

+# include   <X11/Xfuncproto.h>

+# include   <X11/Xfuncs.h>

+

+# include   <stdio.h>

+

+# define FamilyLocal (256)	/* not part of X standard (i.e. X.h) */

+# define FamilyWild  (65535)

+# define FamilyNetname    (254)   /* not part of X standard */

+# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */

+# define FamilyLocalHost (252)	/* for local non-net authentication */

+

+

+_XFUNCPROTOBEGIN

+

+char *XauFileName(void);

+

+Xauth *XauReadAuth(

+FILE*	/* auth_file */

+);

+

+int XauLockAuth(

+_Xconst char*	/* file_name */,

+int		/* retries */,

+int		/* timeout */,

+long		/* dead */

+);

+

+int XauUnlockAuth(

+_Xconst char*	/* file_name */

+);

+

+int XauWriteAuth(

+FILE*		/* auth_file */,

+Xauth*		/* auth */

+);

+

+Xauth *XauGetAuthByAddr(

+#if NeedWidePrototypes

+unsigned int	/* family */,

+unsigned int	/* address_length */,

+#else

+unsigned short	/* family */,

+unsigned short	/* address_length */,

+#endif

+_Xconst char*	/* address */,

+#if NeedWidePrototypes

+unsigned int	/* number_length */,

+#else

+unsigned short	/* number_length */,

+#endif

+_Xconst char*	/* number */,

+#if NeedWidePrototypes

+unsigned int	/* name_length */,

+#else

+unsigned short	/* name_length */,

+#endif

+_Xconst char*	/* name */

+);

+

+Xauth *XauGetBestAuthByAddr(

+#if NeedWidePrototypes

+unsigned int	/* family */,

+unsigned int	/* address_length */,

+#else

+unsigned short	/* family */,

+unsigned short	/* address_length */,

+#endif

+_Xconst char*	/* address */,

+#if NeedWidePrototypes

+unsigned int	/* number_length */,

+#else

+unsigned short	/* number_length */,

+#endif

+_Xconst char*	/* number */,

+int		/* types_length */,

+char**		/* type_names */,

+_Xconst int*	/* type_lengths */

+);

+

+void XauDisposeAuth(

+Xauth*		/* auth */

+);

+

+_XFUNCPROTOEND

+

+/* Return values from XauLockAuth */

+

+# define LOCK_SUCCESS	0	/* lock succeeded */

+# define LOCK_ERROR	1	/* lock unexpectely failed, check errno */

+# define LOCK_TIMEOUT	2	/* lock failed, timeouts expired */

+

+#endif /* _XAUTH_STRUCT_ONLY */

+

+#endif /* _Xauth_h */

diff --git a/X11/extensions/MITMisc.h b/X11/extensions/MITMisc.h
index 5b9713e09..c6b7fefc1 100644
--- a/X11/extensions/MITMisc.h
+++ b/X11/extensions/MITMisc.h
@@ -1,56 +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 */
-
-/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
-#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/X11/extensions/XEVI.h b/X11/extensions/XEVI.h
index 5fb53c4bb..49132d1de 100644
--- a/X11/extensions/XEVI.h
+++ b/X11/extensions/XEVI.h
@@ -1,63 +1,61 @@
-/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-/************************************************************
-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.
-********************************************************/
-/* $XFree86$ */
-
-#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/X11/extensions/XLbx.h b/X11/extensions/XLbx.h
index 54d9dd93c..94153343a 100644
--- a/X11/extensions/XLbx.h
+++ b/X11/extensions/XLbx.h
@@ -1,52 +1,50 @@
-/* $Xorg: XLbx.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * 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.
- *
- */
-/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */
- 
-#ifndef _XLBX_H_
-#define _XLBX_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xdefs.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/lbx.h>
-
-_XFUNCPROTOBEGIN
-
-Bool XLbxQueryExtension(
-    Display*		/* dpy */,
-    int*		/* requestp */,
-    int*		/* event_basep */,
-    int*		/* error_basep */
-);
-
-Bool XLbxQueryVersion(
-    Display*		/* dpy */,
-    int*		/* majorVersion */,
-    int*		/* minorVersion */
-);
-
-int XLbxGetEventBase(Display *dpy);
-
-_XFUNCPROTOEND
-
-#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 _XLBX_H_

+#define _XLBX_H_

+

+#include <X11/Xfuncproto.h>

+#include <X11/Xdefs.h>

+#include <X11/Xlib.h>

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

+

+_XFUNCPROTOBEGIN

+

+Bool XLbxQueryExtension(

+    Display*		/* dpy */,

+    int*		/* requestp */,

+    int*		/* event_basep */,

+    int*		/* error_basep */

+);

+

+Bool XLbxQueryVersion(

+    Display*		/* dpy */,

+    int*		/* majorVersion */,

+    int*		/* minorVersion */

+);

+

+int XLbxGetEventBase(Display *dpy);

+

+_XFUNCPROTOEND

+

+#endif

diff --git a/X11/extensions/XShm.h b/X11/extensions/XShm.h
index b2d77ba59..daeef3e32 100644
--- a/X11/extensions/XShm.h
+++ b/X11/extensions/XShm.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/XShm.h,v 1.11 2003/04/03 15:11:07 dawes Exp $ */

 /************************************************************

 

 Copyright 1989, 1998  The Open Group

@@ -27,8 +26,6 @@ in this Software without prior written authorization from The Open Group.
 

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

 

-/* $Xorg: XShm.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */

-

 #ifndef _XSHM_H_

 #define _XSHM_H_

 

diff --git a/X11/extensions/Xag.h b/X11/extensions/Xag.h
index eb2e2c458..dfc2e7036 100644
--- a/X11/extensions/Xag.h
+++ b/X11/extensions/Xag.h
@@ -1,92 +1,90 @@
-/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
-/*
-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.
-*/
-/* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#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/X11/extensions/Xcup.h b/X11/extensions/Xcup.h
index 1a909c7af..8d69575b1 100644
--- a/X11/extensions/Xcup.h
+++ b/X11/extensions/Xcup.h
@@ -1,60 +1,58 @@
-/* $Xorg: Xcup.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-
-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.
-
-*/
-/* $XFree86$ */
-
-#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/X11/extensions/Xdbe.h b/X11/extensions/Xdbe.h
index 390738d78..5ac72aa82 100644
--- a/X11/extensions/Xdbe.h
+++ b/X11/extensions/Xdbe.h
@@ -1,140 +1,138 @@
-/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/******************************************************************************
- * 
- * 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
- *
- *****************************************************************************/
-/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */
-
-#ifndef XDBE_H
-#define XDBE_H
-
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/dbe.h>
-
-typedef struct
-{
-    VisualID    visual;    /* one visual ID that supports double-buffering */
-    int         depth;     /* depth of visual in bits                      */
-    int         perflevel; /* performance level of visual                  */
-}
-XdbeVisualInfo;
-
-typedef struct
-{
-    int                 count;          /* number of items in visual_depth   */
-    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */
-}
-XdbeScreenVisualInfo;
-
-
-typedef Drawable XdbeBackBuffer;
-
-typedef unsigned char XdbeSwapAction;
-
-typedef struct
-{
-    Window		swap_window;    /* window for which to swap buffers   */
-    XdbeSwapAction	swap_action;    /* swap action to use for swap_window */
-}
-XdbeSwapInfo;
-
-typedef struct
-{
-    Window	window;			/* window that buffer belongs to */
-}
-XdbeBackBufferAttributes;
-
-typedef struct
-{
-    int			type;
-    Display		*display;	/* display the event was read from */
-    XdbeBackBuffer	buffer;		/* resource id                     */
-    unsigned long	serial;		/* serial number of failed request */
-    unsigned char	error_code;	/* error base + XdbeBadBuffer      */
-    unsigned char	request_code;	/* major opcode of failed request  */
-    unsigned char	minor_code;	/* minor opcode of failed request  */
-}
-XdbeBufferError;
-
-/* _XFUNCPROTOBEGIN and _XFUNCPROTOEND are defined as noops
- * (for non-C++ builds) in X11/Xfuncproto.h.
- */
-_XFUNCPROTOBEGIN
-
-extern Status XdbeQueryExtension(
-    Display*		/* dpy                  */,
-    int*		/* major_version_return */,
-    int*		/* minor_version_return */
-);
-
-extern XdbeBackBuffer XdbeAllocateBackBufferName(
-    Display*		/* dpy         */,
-    Window		/* window      */,
-    XdbeSwapAction	/* swap_action */
-);
-
-extern Status XdbeDeallocateBackBufferName(
-    Display*		/* dpy    */,
-    XdbeBackBuffer	/* buffer */
-);
-
-extern Status XdbeSwapBuffers(
-    Display*		/* dpy         */,
-    XdbeSwapInfo*	/* swap_info   */,
-    int			/* num_windows */
-);
-
-extern Status XdbeBeginIdiom(
-    Display*		/* dpy */
-);
-
-extern Status XdbeEndIdiom(
-    Display*		/* dpy */
-);
-
-extern XdbeScreenVisualInfo *XdbeGetVisualInfo(
-    Display*		/* dpy               */,
-    Drawable*		/* screen_specifiers */,
-    int*		/* num_screens       */
-);
-
-extern void XdbeFreeVisualInfo(
-    XdbeScreenVisualInfo*	/* visual_info */
-);
-
-extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
-    Display*		/* dpy    */,
-    XdbeBackBuffer	/* buffer */
-);
-
-_XFUNCPROTOEND
-
-#endif /* XDBE_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 XDBE_H

+#define XDBE_H

+

+#include <X11/Xfuncproto.h>

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

+

+typedef struct

+{

+    VisualID    visual;    /* one visual ID that supports double-buffering */

+    int         depth;     /* depth of visual in bits                      */

+    int         perflevel; /* performance level of visual                  */

+}

+XdbeVisualInfo;

+

+typedef struct

+{

+    int                 count;          /* number of items in visual_depth   */

+    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */

+}

+XdbeScreenVisualInfo;

+

+

+typedef Drawable XdbeBackBuffer;

+

+typedef unsigned char XdbeSwapAction;

+

+typedef struct

+{

+    Window		swap_window;    /* window for which to swap buffers   */

+    XdbeSwapAction	swap_action;    /* swap action to use for swap_window */

+}

+XdbeSwapInfo;

+

+typedef struct

+{

+    Window	window;			/* window that buffer belongs to */

+}

+XdbeBackBufferAttributes;

+

+typedef struct

+{

+    int			type;

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

+    XdbeBackBuffer	buffer;		/* resource id                     */

+    unsigned long	serial;		/* serial number of failed request */

+    unsigned char	error_code;	/* error base + XdbeBadBuffer      */

+    unsigned char	request_code;	/* major opcode of failed request  */

+    unsigned char	minor_code;	/* minor opcode of failed request  */

+}

+XdbeBufferError;

+

+/* _XFUNCPROTOBEGIN and _XFUNCPROTOEND are defined as noops

+ * (for non-C++ builds) in X11/Xfuncproto.h.

+ */

+_XFUNCPROTOBEGIN

+

+extern Status XdbeQueryExtension(

+    Display*		/* dpy                  */,

+    int*		/* major_version_return */,

+    int*		/* minor_version_return */

+);

+

+extern XdbeBackBuffer XdbeAllocateBackBufferName(

+    Display*		/* dpy         */,

+    Window		/* window      */,

+    XdbeSwapAction	/* swap_action */

+);

+

+extern Status XdbeDeallocateBackBufferName(

+    Display*		/* dpy    */,

+    XdbeBackBuffer	/* buffer */

+);

+

+extern Status XdbeSwapBuffers(

+    Display*		/* dpy         */,

+    XdbeSwapInfo*	/* swap_info   */,

+    int			/* num_windows */

+);

+

+extern Status XdbeBeginIdiom(

+    Display*		/* dpy */

+);

+

+extern Status XdbeEndIdiom(

+    Display*		/* dpy */

+);

+

+extern XdbeScreenVisualInfo *XdbeGetVisualInfo(

+    Display*		/* dpy               */,

+    Drawable*		/* screen_specifiers */,

+    int*		/* num_screens       */

+);

+

+extern void XdbeFreeVisualInfo(

+    XdbeScreenVisualInfo*	/* visual_info */

+);

+

+extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(

+    Display*		/* dpy    */,

+    XdbeBackBuffer	/* buffer */

+);

+

+_XFUNCPROTOEND

+

+#endif /* XDBE_H */

+

diff --git a/X11/extensions/Xext.h b/X11/extensions/Xext.h
index 92dc423c3..c7c5723e2 100644
--- a/X11/extensions/Xext.h
+++ b/X11/extensions/Xext.h
@@ -1,55 +1,53 @@
-/*
- * $Xorg: Xext.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
-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.
- */
-/* $XFree86: xc/include/extensions/Xext.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */
-
-#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/X11/extensions/dpms.h b/X11/extensions/dpms.h
index 037c44652..b57007bda 100644
--- a/X11/extensions/dpms.h
+++ b/X11/extensions/dpms.h
@@ -1,4 +1,3 @@
-/* $Xorg: dpms.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */

 /*****************************************************************

 

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

@@ -26,7 +25,6 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.

 

 ******************************************************************/

-/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */

 

 #ifndef _X11_EXTENSIONS_DPMS_H

 #define _X11_EXTENSIONS_DPMS_H 1

diff --git a/X11/extensions/extutil.h b/X11/extensions/extutil.h
index 825d81e93..dd05a6580 100644
--- a/X11/extensions/extutil.h
+++ b/X11/extensions/extutil.h
@@ -1,192 +1,190 @@
-/*
- * $Xorg: extutil.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
-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.
- *
- * Author:  Jim Fulton, MIT The Open Group
- * 
- *                     Xlib Extension-Writing Utilities
- *
- * This package contains utilities for writing the client API for various
- * protocol extensions.  THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
- * ARE SUBJECT TO CHANGE!
- */
-/* $XFree86: xc/include/extensions/extutil.h,v 1.9 2001/12/14 19:53:28 dawes Exp $ */
-
-#ifndef _EXTUTIL_H_
-#define _EXTUTIL_H_
-
-#include <X11/extensions/Xext.h>
-
-/*
- * We need to keep a list of open displays since the Xlib display list isn't
- * public.  We also have to per-display info in a separate block since it isn't
- * stored directly in the Display structure.
- */
-typedef struct _XExtDisplayInfo {
-    struct _XExtDisplayInfo *next;	/* keep a linked list */
-    Display *display;			/* which display this is */
-    XExtCodes *codes;			/* the extension protocol codes */
-    XPointer data;			/* extra data for extension to use */
-} XExtDisplayInfo;
-
-typedef struct _XExtensionInfo {
-    XExtDisplayInfo *head;		/* start of list */
-    XExtDisplayInfo *cur;		/* most recently used */
-    int ndisplays;			/* number of displays */
-} XExtensionInfo;
-
-typedef struct _XExtensionHooks {
-    int (*create_gc)(
-	      Display*			/* display */,
-	      GC			/* gc */,
-	      XExtCodes*		/* codes */
-);
-    int (*copy_gc)(
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-);
-    int (*flush_gc)(
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-);
-    int (*free_gc)(
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-);
-    int (*create_font)(
-	      Display*			/* display */,
-              XFontStruct*		/* fs */,
-              XExtCodes*		/* codes */
-);
-    int (*free_font)(
-	      Display*			/* display */,
-              XFontStruct*		/* fs */,
-              XExtCodes*		/* codes */
-);
-    int (*close_display)(
-	      Display*			/* display */,
-              XExtCodes*		/* codes */
-);
-    Bool (*wire_to_event)(
-	       Display*			/* display */,
-               XEvent*			/* re */,
-               xEvent*			/* event */
-);
-    Status (*event_to_wire)(
-	      Display*			/* display */,
-              XEvent*			/* re */,
-              xEvent*			/* event */
-);
-    int (*error)(
-	      Display*			/* display */,
-              xError*			/* err */,
-              XExtCodes*		/* codes */,
-              int*			/* ret_code */
-);
-    char *(*error_string)(
-	        Display*		/* display */,
-                int			/* code */,
-                XExtCodes*		/* codes */,
-                char*			/* buffer */,
-                int			/* nbytes */
-);
-} XExtensionHooks;
-
-extern XExtensionInfo *XextCreateExtension(
-    void
-);
-extern void XextDestroyExtension(
-    XExtensionInfo*	/* info */
-);
-extern XExtDisplayInfo *XextAddDisplay(
-    XExtensionInfo*	/* extinfo */,
-    Display*		/* dpy */,
-    char*		/* ext_name */,
-    XExtensionHooks*	/* hooks */,
-    int			/* nevents */,
-    XPointer		/* data */
-);
-extern int XextRemoveDisplay(
-    XExtensionInfo*	/* extinfo */,
-    Display*		/* dpy */
-);
-extern XExtDisplayInfo *XextFindDisplay(
-    XExtensionInfo*	/* extinfo */,
-    Display*		/* dpy */
-);
-
-#define XextHasExtension(i) ((i) && ((i)->codes))
-#define XextCheckExtension(dpy,i,name,val) \
-  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }
-#define XextSimpleCheckExtension(dpy,i,name) \
-  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }
-
-
-/*
- * helper macros to generate code that is common to all extensions; caller
- * should prefix it with static if extension source is in one file; this
- * could be a utility function, but have to stack 6 unused arguments for 
- * something that is called many, many times would be bad.
- */
-#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
-XExtDisplayInfo *proc (Display *dpy) \
-{ \
-    XExtDisplayInfo *dpyinfo; \
-    if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \
-    if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \
-      dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \
-    return dpyinfo; \
-}
-
-#define XEXT_FIND_DISPLAY_PROTO(proc) \
-	XExtDisplayInfo *proc(Display *dpy)
-
-#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \
-int proc (Display *dpy, XExtCodes *codes) \
-{ \
-    return XextRemoveDisplay (extinfo, dpy); \
-}
-
-#define XEXT_CLOSE_DISPLAY_PROTO(proc) \
-	int proc(Display *dpy, XExtCodes *codes)
-
-#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \
-char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \
-{  \
-    code -= codes->first_error;  \
-    if (code >= 0 && code < nerr) { \
-	char tmp[256]; \
-	sprintf (tmp, "%s.%d", extname, code); \
-	XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
-	return buf; \
-    } \
-    return (char *)0; \
-}
-
-#define XEXT_ERROR_STRING_PROTO(proc) \
-	char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
-#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.

+ *

+ * Author:  Jim Fulton, MIT The Open Group

+ * 

+ *                     Xlib Extension-Writing Utilities

+ *

+ * This package contains utilities for writing the client API for various

+ * protocol extensions.  THESE INTERFACES ARE NOT PART OF THE X STANDARD AND

+ * ARE SUBJECT TO CHANGE!

+ */

+

+#ifndef _EXTUTIL_H_

+#define _EXTUTIL_H_

+

+#include <X11/extensions/Xext.h>

+

+/*

+ * We need to keep a list of open displays since the Xlib display list isn't

+ * public.  We also have to per-display info in a separate block since it isn't

+ * stored directly in the Display structure.

+ */

+typedef struct _XExtDisplayInfo {

+    struct _XExtDisplayInfo *next;	/* keep a linked list */

+    Display *display;			/* which display this is */

+    XExtCodes *codes;			/* the extension protocol codes */

+    XPointer data;			/* extra data for extension to use */

+} XExtDisplayInfo;

+

+typedef struct _XExtensionInfo {

+    XExtDisplayInfo *head;		/* start of list */

+    XExtDisplayInfo *cur;		/* most recently used */

+    int ndisplays;			/* number of displays */

+} XExtensionInfo;

+

+typedef struct _XExtensionHooks {

+    int (*create_gc)(

+	      Display*			/* display */,

+	      GC			/* gc */,

+	      XExtCodes*		/* codes */

+);

+    int (*copy_gc)(

+	      Display*			/* display */,

+              GC			/* gc */,

+              XExtCodes*		/* codes */

+);

+    int (*flush_gc)(

+	      Display*			/* display */,

+              GC			/* gc */,

+              XExtCodes*		/* codes */

+);

+    int (*free_gc)(

+	      Display*			/* display */,

+              GC			/* gc */,

+              XExtCodes*		/* codes */

+);

+    int (*create_font)(

+	      Display*			/* display */,

+              XFontStruct*		/* fs */,

+              XExtCodes*		/* codes */

+);

+    int (*free_font)(

+	      Display*			/* display */,

+              XFontStruct*		/* fs */,

+              XExtCodes*		/* codes */

+);

+    int (*close_display)(

+	      Display*			/* display */,

+              XExtCodes*		/* codes */

+);

+    Bool (*wire_to_event)(

+	       Display*			/* display */,

+               XEvent*			/* re */,

+               xEvent*			/* event */

+);

+    Status (*event_to_wire)(

+	      Display*			/* display */,

+              XEvent*			/* re */,

+              xEvent*			/* event */

+);

+    int (*error)(

+	      Display*			/* display */,

+              xError*			/* err */,

+              XExtCodes*		/* codes */,

+              int*			/* ret_code */

+);

+    char *(*error_string)(

+	        Display*		/* display */,

+                int			/* code */,

+                XExtCodes*		/* codes */,

+                char*			/* buffer */,

+                int			/* nbytes */

+);

+} XExtensionHooks;

+

+extern XExtensionInfo *XextCreateExtension(

+    void

+);

+extern void XextDestroyExtension(

+    XExtensionInfo*	/* info */

+);

+extern XExtDisplayInfo *XextAddDisplay(

+    XExtensionInfo*	/* extinfo */,

+    Display*		/* dpy */,

+    char*		/* ext_name */,

+    XExtensionHooks*	/* hooks */,

+    int			/* nevents */,

+    XPointer		/* data */

+);

+extern int XextRemoveDisplay(

+    XExtensionInfo*	/* extinfo */,

+    Display*		/* dpy */

+);

+extern XExtDisplayInfo *XextFindDisplay(

+    XExtensionInfo*	/* extinfo */,

+    Display*		/* dpy */

+);

+

+#define XextHasExtension(i) ((i) && ((i)->codes))

+#define XextCheckExtension(dpy,i,name,val) \

+  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }

+#define XextSimpleCheckExtension(dpy,i,name) \

+  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }

+

+

+/*

+ * helper macros to generate code that is common to all extensions; caller

+ * should prefix it with static if extension source is in one file; this

+ * could be a utility function, but have to stack 6 unused arguments for 

+ * something that is called many, many times would be bad.

+ */

+#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \

+XExtDisplayInfo *proc (Display *dpy) \

+{ \

+    XExtDisplayInfo *dpyinfo; \

+    if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \

+    if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \

+      dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \

+    return dpyinfo; \

+}

+

+#define XEXT_FIND_DISPLAY_PROTO(proc) \

+	XExtDisplayInfo *proc(Display *dpy)

+

+#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \

+int proc (Display *dpy, XExtCodes *codes) \

+{ \

+    return XextRemoveDisplay (extinfo, dpy); \

+}

+

+#define XEXT_CLOSE_DISPLAY_PROTO(proc) \

+	int proc(Display *dpy, XExtCodes *codes)

+

+#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \

+char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \

+{  \

+    code -= codes->first_error;  \

+    if (code >= 0 && code < nerr) { \

+	char tmp[256]; \

+	sprintf (tmp, "%s.%d", extname, code); \

+	XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \

+	return buf; \

+    } \

+    return (char *)0; \

+}

+

+#define XEXT_ERROR_STRING_PROTO(proc) \

+	char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)

+#endif

diff --git a/X11/extensions/multibuf.h b/X11/extensions/multibuf.h
index 2b1a8f607..d2f805ee7 100644
--- a/X11/extensions/multibuf.h
+++ b/X11/extensions/multibuf.h
@@ -1,216 +1,213 @@
-/*
- * $Xorg: multibuf.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
-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.
- */
-
-/* $XFree86: xc/include/extensions/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */
-
-#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/X11/extensions/security.h b/X11/extensions/security.h
index be7a86203..90abc07ee 100644
--- a/X11/extensions/security.h
+++ b/X11/extensions/security.h
@@ -1,79 +1,77 @@
-/* $Xorg: security.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-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.
-*/
-/* $XFree86: xc/include/extensions/security.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
-
-#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/X11/extensions/shape.h b/X11/extensions/shape.h
index 7992f7a5a..e2f62d0bc 100644
--- a/X11/extensions/shape.h
+++ b/X11/extensions/shape.h
@@ -1,155 +1,152 @@
-/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
-/************************************************************
-
-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.
-
-********************************************************/
-
-/* $Xorg: shape.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#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_ */

diff --git a/X11/extensions/sync.h b/X11/extensions/sync.h
index 9d8c88545..460bf56ca 100644
--- a/X11/extensions/sync.h
+++ b/X11/extensions/sync.h
@@ -1,4 +1,3 @@
-/* $Xorg: sync.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */

 /*

 

 Copyright 1991, 1993, 1994, 1998  The Open Group

@@ -48,7 +47,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.

 

 ******************************************************************/

-/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */

 

 #ifndef _SYNC_H_

 #define _SYNC_H_

diff --git a/X11/extensions/xtestext1.h b/X11/extensions/xtestext1.h
index 55dcf7873..d6fae784e 100644
--- a/X11/extensions/xtestext1.h
+++ b/X11/extensions/xtestext1.h
@@ -1,85 +1,84 @@
-/* $Xorg: xtestext1.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
- * 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 _XTESTEXT1_H
-#define _XTESTEXT1_H
-/*
- * the typedefs for CARD8, CARD16, and CARD32 are defined in Xmd.h
- */
-
-#include <X11/extensions/xtestext1const.h>
-/*
- * This is the definition for the input action host format event structure.
- * This is the form that a client using this extension will see when
- * it receives an input action event.
- */
-typedef struct {
-        int     type;           /* always XTestInputActionType */
-	Display *display;
-	Window  window;
-        CARD8   actions[XTestACTIONS_SIZE];
-} XTestInputActionEvent;
-
-/*
- * This is the definition for the xTestFakeAck host format event structure.
- * This is the form that a client using this extension will see when
- * it receives an XTestFakeAck event.
- */
-typedef struct {
-        int     type;           /* always XTestFakeAckType */
-	Display *display;
-	Window  window;
-} XTestFakeAckEvent;
-
-#endif /* _XTESTEXT1_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 _XTESTEXT1_H

+#define _XTESTEXT1_H

+/*

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

+ */

+

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

+/*

+ * This is the definition for the input action host format event structure.

+ * This is the form that a client using this extension will see when

+ * it receives an input action event.

+ */

+typedef struct {

+        int     type;           /* always XTestInputActionType */

+	Display *display;

+	Window  window;

+        CARD8   actions[XTestACTIONS_SIZE];

+} XTestInputActionEvent;

+

+/*

+ * This is the definition for the xTestFakeAck host format event structure.

+ * This is the form that a client using this extension will see when

+ * it receives an XTestFakeAck event.

+ */

+typedef struct {

+        int     type;           /* always XTestFakeAckType */

+	Display *display;

+	Window  window;

+} XTestFakeAckEvent;

+

+#endif /* _XTESTEXT1_H */