xextproto git update 6-12-2010

6 files changed, 923 insertions, 825 deletions

diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac
index 599651b35..92d49d9d7 100644
--- a/X11/extensions/configure.ac
+++ b/X11/extensions/configure.ac
@@ -1,18 +1,18 @@
-AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
-XORG_DEFAULT_OPTIONS
-XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
-
-AC_OUTPUT([Makefile
-           specs/Makefile
-           xextproto.pc])
+AC_PREREQ([2.60])

+AC_INIT([XExtProto], [7.1.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+# Require xorg-macros minimum of 1.10 for DocBook XML documentation

+m4_ifndef([XORG_MACROS_VERSION],

+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])

+XORG_MACROS_VERSION(1.10)

+XORG_DEFAULT_OPTIONS

+XORG_ENABLE_SPECS

+XORG_WITH_XMLTO(0.0.20)

+XORG_WITH_FOP

+XORG_CHECK_SGML_DOCTOOLS(1.5)

+

+AC_OUTPUT([Makefile

+           specs/Makefile

+           xextproto.pc])

diff --git a/X11/extensions/shmstr.h b/X11/extensions/shmstr.h
index 635886053..7cd2933e0 100644
--- a/X11/extensions/shmstr.h
+++ b/X11/extensions/shmstr.h
@@ -1,66 +1,63 @@
-/* $XFree86: xc/include/extensions/shmstr.h,v 3.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.
-
-********************************************************/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _SHMSTR_H_
-#define _SHMSTR_H_
-
-/* $Xorg: shmstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#include <X11/extensions/shmproto.h>
-
-#ifdef _XSHM_SERVER_
-#define XSHM_PUT_IMAGE_ARGS \
-    DrawablePtr		/* dst */, \
-    GCPtr		/* pGC */, \
-    int			/* depth */, \
-    unsigned int	/* format */, \
-    int			/* w */, \
-    int			/* h */, \
-    int			/* sx */, \
-    int			/* sy */, \
-    int			/* sw */, \
-    int			/* sh */, \
-    int			/* dx */, \
-    int			/* dy */, \
-    char *		/* data */
-
-#define XSHM_CREATE_PIXMAP_ARGS \
-    ScreenPtr	/* pScreen */, \
-    int		/* width */, \
-    int		/* height */, \
-    int		/* depth */, \
-    char *	/* addr */
-
-typedef struct _ShmFuncs {
-    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
-    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);
-} ShmFuncs, *ShmFuncsPtr;
-#endif
-
-#endif /* _SHMSTR_H_ */
+/************************************************************

+

+Copyright 1989, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+********************************************************/

+

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

+

+#ifndef _SHMSTR_H_

+#define _SHMSTR_H_

+

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

+

+#ifdef _XSHM_SERVER_

+#define XSHM_PUT_IMAGE_ARGS \

+    DrawablePtr		/* dst */, \

+    GCPtr		/* pGC */, \

+    int			/* depth */, \

+    unsigned int	/* format */, \

+    int			/* w */, \

+    int			/* h */, \

+    int			/* sx */, \

+    int			/* sy */, \

+    int			/* sw */, \

+    int			/* sh */, \

+    int			/* dx */, \

+    int			/* dy */, \

+    char *		/* data */

+

+#define XSHM_CREATE_PIXMAP_ARGS \

+    ScreenPtr	/* pScreen */, \

+    int		/* width */, \

+    int		/* height */, \

+    int		/* depth */, \

+    char *	/* addr */

+

+typedef struct _ShmFuncs {

+    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);

+    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);

+} ShmFuncs, *ShmFuncsPtr;

+#endif

+

+#endif /* _SHMSTR_H_ */

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

+

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

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

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

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

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

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

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

+both that copyright notice and this permission notice appear in

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

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

+software without specific, written prior permission.

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

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

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

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

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

+PERFORMANCE OF THIS SOFTWARE.

+

+******************************************************************/

+

+#ifndef _SYNCCONST_H_

+#define _SYNCCONST_H_

+

+#define SYNC_NAME "SYNC"

+

+#define SYNC_MAJOR_VERSION	3

+#define SYNC_MINOR_VERSION	1

+

+

+#define XSyncCounterNotify              0

+#define XSyncAlarmNotify		1

+#define XSyncAlarmNotifyMask 		(1L << XSyncAlarmNotify)

+

+#define XSyncNumberEvents		2L

+

+#define XSyncBadCounter			0L

+#define XSyncBadAlarm			1L

+#define XSyncBadFence           2L

+#define XSyncNumberErrors		(XSyncBadFence + 1)

+

+/*

+ * Flags for Alarm Attributes

+ */

+#define XSyncCACounter			(1L<<0)

+#define XSyncCAValueType		(1L<<1)

+#define XSyncCAValue			(1L<<2)

+#define XSyncCATestType			(1L<<3)

+#define XSyncCADelta			(1L<<4)

+#define XSyncCAEvents			(1L<<5)

+

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

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

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

+ */

+

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

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

+#define _XSyncValueGreaterThan(a, b)\

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

+#define _XSyncValueLessThan(a, b)\

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

+#define _XSyncValueGreaterOrEqual(a, b)\

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

+#define _XSyncValueLessOrEqual(a, b)\

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

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

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

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

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

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

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

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

+	int t = (a).lo;\

+	Bool signa = XSyncValueIsNegative(a);\

+	Bool signb = XSyncValueIsNegative(b);\

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

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

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

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

+     }

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

+	int t = (a).lo;\

+	Bool signa = XSyncValueIsNegative(a);\

+	Bool signb = XSyncValueIsNegative(b);\

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

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

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

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

+     }

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

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

+

+/*

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

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

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

+ */

+

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

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

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

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

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

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

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

+#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)

+#define XSyncValueIsZero(a) _XSyncValueIsZero(a)

+#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)

+#define XSyncValueLow32(v) _XSyncValueLow32(v)

+#define XSyncValueHigh32(v) _XSyncValueHigh32(v)

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

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

+#define XSyncMaxValue(pv) _XSyncMaxValue(pv)

+#define XSyncMinValue(pv) _XSyncMinValue(pv)

+

+/*

+ * Constants for the value_type argument of various requests

+ */

+typedef enum {

+    XSyncAbsolute,

+    XSyncRelative

+} XSyncValueType;

+

+/*

+ * Alarm Test types

+ */

+typedef enum {

+    XSyncPositiveTransition,

+    XSyncNegativeTransition,

+    XSyncPositiveComparison,

+    XSyncNegativeComparison

+} XSyncTestType;

+

+/*

+ * Alarm state constants

+ */

+typedef enum {

+    XSyncAlarmActive,

+    XSyncAlarmInactive,

+    XSyncAlarmDestroyed

+} XSyncAlarmState;

+

+

+typedef XID XSyncCounter;

+typedef XID XSyncAlarm;

+typedef XID XSyncFence;

+typedef struct _XSyncValue {

+    int hi;

+    unsigned int lo;

+} XSyncValue;

+#endif /* _SYNCCONST_H_ */

diff --git a/X11/extensions/syncproto.h b/X11/extensions/syncproto.h
index 13b53d531..ab7c1f528 100644
--- a/X11/extensions/syncproto.h
+++ b/X11/extensions/syncproto.h
@@ -1,378 +1,474 @@
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-
-#ifndef _SYNCPROTO_H_
-#define _SYNCPROTO_H_
-
-#include <X11/extensions/syncconst.h>
-
-#define X_SyncInitialize		0
-#define X_SyncListSystemCounters	1
-#define X_SyncCreateCounter		2
-#define X_SyncSetCounter		3
-#define X_SyncChangeCounter		4
-#define X_SyncQueryCounter              5
-#define X_SyncDestroyCounter		6
-#define X_SyncAwait			7
-#define X_SyncCreateAlarm               8
-#define X_SyncChangeAlarm	        9
-#define X_SyncQueryAlarm	       10
-#define X_SyncDestroyAlarm	       11
-#define X_SyncSetPriority   	       12
-#define X_SyncGetPriority   	       13
-
-/* cover up types from sync.h to make sure they're the right size for
- * protocol packaging.  These will be undef'ed after all the protocol
- * structures are defined.
- */
-#define XSyncCounter CARD32
-#define XSyncAlarm   CARD32
-
-/*
- * Initialize
- */
-typedef struct _xSyncInitialize {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    CARD8	majorVersion;
-    CARD8	minorVersion;
-    CARD16	pad B16;
-} xSyncInitializeReq;
-#define sz_xSyncInitializeReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	majorVersion;
-    CARD8	minorVersion;
-    CARD16	pad B16;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xSyncInitializeReply;
-#define sz_xSyncInitializeReply	32
-
-/*
- * ListSystemCounters
- */
-typedef struct _xSyncListSystemCounters
-{
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-} xSyncListSystemCountersReq;
-#define sz_xSyncListSystemCountersReq	4
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32	nCounters B32;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xSyncListSystemCountersReply;
-#define sz_xSyncListSystemCountersReply	32
-
-typedef struct {
-    XSyncCounter counter B32;
-    INT32	resolution_hi B32;
-    CARD32	resolution_lo B32;
-    CARD16	name_length B16;
-} xSyncSystemCounter;
-#define sz_xSyncSystemCounter 14
-
-/*
- * Create Counter
- */
-typedef struct _xSyncCreateCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       initial_value_hi B32;
-    CARD32	initial_value_lo B32;
-} xSyncCreateCounterReq;
-#define sz_xSyncCreateCounterReq	16
-
-/*
- * Change Counter
- */
-typedef struct _xSyncChangeCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       value_hi B32;
-    CARD32	value_lo B32;
-} xSyncChangeCounterReq;
-#define sz_xSyncChangeCounterReq	16
-
-/*
- * Set Counter
- */
-typedef struct _xSyncSetCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       value_hi B32;
-    CARD32	value_lo B32;
-} xSyncSetCounterReq;
-#define sz_xSyncSetCounterReq	16
-
-/*
- * Destroy Counter
- */
-typedef struct _xSyncDestroyCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter counter B32;
-} xSyncDestroyCounterReq;
-#define sz_xSyncDestroyCounterReq	8
-
-/*
- * Query Counter
- */
-typedef struct _xSyncQueryCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter counter B32;
-} xSyncQueryCounterReq;
-#define sz_xSyncQueryCounterReq		8
-
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32	value_hi B32;
-    CARD32	value_lo B32;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xSyncQueryCounterReply;
-#define sz_xSyncQueryCounterReply	32
-
-/*
- * Await
- */
-typedef struct _xSyncAwaitReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-} xSyncAwaitReq;
-#define sz_xSyncAwaitReq		4
-
-typedef struct _xSyncWaitCondition {
-    XSyncCounter counter B32;
-    CARD32	value_type B32;
-    INT32       wait_value_hi B32;
-    CARD32      wait_value_lo B32;
-    CARD32	test_type B32;
-    INT32	event_threshold_hi B32;
-    CARD32	event_threshold_lo B32;
-} xSyncWaitCondition;
-#define sz_xSyncWaitCondition		28
-
-/*
- * Create Alarm
- */
-typedef struct _xSyncCreateAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	id B32;
-    CARD32      valueMask B32;
-} xSyncCreateAlarmReq;
-#define sz_xSyncCreateAlarmReq		12
-
-/*
- * Destroy Alarm
- */
-typedef struct _xSyncDestroyAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-} xSyncDestroyAlarmReq;
-#define sz_xSyncDestroyAlarmReq		8
-
-/*
- * Query Alarm
- */
-typedef struct _xSyncQueryAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-} xSyncQueryAlarmReq;
-#define sz_xSyncQueryAlarmReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    XSyncCounter counter B32;
-    CARD32	value_type B32;
-    INT32	wait_value_hi B32;
-    CARD32	wait_value_lo B32;
-    CARD32	test_type      B32;
-    INT32	delta_hi B32;
-    CARD32	delta_lo B32;
-    BOOL        events;
-    BYTE        state;
-    BYTE	pad0;
-    BYTE	pad1;
-} xSyncQueryAlarmReply;
-#define sz_xSyncQueryAlarmReply		40
-
-/*
- * Change Alarm
- */
-typedef struct _xSyncChangeAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-    CARD32	valueMask B32;
-} xSyncChangeAlarmReq;
-#define sz_xSyncChangeAlarmReq		12
-
-/*
- * SetPriority
- */
-typedef struct _xSyncSetPriority{
-    CARD8   	reqType;
-    CARD8   	syncReqType;
-    CARD16  	length B16;
-    CARD32  	id B32;
-    INT32  	priority B32;
-} xSyncSetPriorityReq;
-#define sz_xSyncSetPriorityReq	    	12
-
-/*
- * Get Priority
- */
-typedef struct _xSyncGetPriority{
-    CARD8   	reqType;
-    CARD8   	syncReqType;
-    CARD16  	length B16;
-    CARD32  	id B32; /*XXX XID? */
-} xSyncGetPriorityReq;
-#define sz_xSyncGetPriorityReq	    	 8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32  	priority B32;
-    CARD32  	pad0 B32;
-    CARD32  	pad1 B32;
-    CARD32  	pad2 B32;
-    CARD32  	pad3 B32;
-    CARD32  	pad4 B32;
-} xSyncGetPriorityReply;
-#define sz_xSyncGetPriorityReply	32
-
-/*
- * Events
- */
-
-typedef struct _xSyncCounterNotifyEvent {
-    BYTE	type;
-    BYTE	kind;
-    CARD16	sequenceNumber B16;
-    XSyncCounter counter B32;
-    INT32	wait_value_hi B32;
-    CARD32	wait_value_lo B32;
-    INT32	counter_value_hi B32;
-    CARD32	counter_value_lo B32;
-    CARD32	time B32;
-    CARD16	count B16;
-    BOOL	destroyed;
-    BYTE        pad0;
-} xSyncCounterNotifyEvent;
-
-typedef struct _xSyncAlarmNotifyEvent {
-    BYTE	type;
-    BYTE	kind;
-    CARD16	sequenceNumber B16;
-    XSyncAlarm	alarm B32;
-    INT32	counter_value_hi B32;
-    CARD32	counter_value_lo B32;
-    INT32	alarm_value_hi B32;
-    CARD32	alarm_value_lo B32;
-    CARD32	time B32;
-    CARD8       state;
-    BYTE        pad0;
-    BYTE        pad1;
-    BYTE        pad2;
-} xSyncAlarmNotifyEvent;
-
-#undef XSyncCounter
-#undef XSyncAlarm
-
-
-#endif /* _SYNCPROTO_H_ */
+/*

+

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

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

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

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

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

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

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

+both that copyright notice and this permission notice appear in

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

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

+software without specific, written prior permission.

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

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

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

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

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

+PERFORMANCE OF THIS SOFTWARE.

+

+******************************************************************/

+

+#ifndef _SYNCPROTO_H_

+#define _SYNCPROTO_H_

+

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

+

+#define X_SyncInitialize		0

+#define X_SyncListSystemCounters	1

+#define X_SyncCreateCounter		2

+#define X_SyncSetCounter		3

+#define X_SyncChangeCounter		4

+#define X_SyncQueryCounter              5

+#define X_SyncDestroyCounter		6

+#define X_SyncAwait			7

+#define X_SyncCreateAlarm               8

+#define X_SyncChangeAlarm	        9

+#define X_SyncQueryAlarm	       10

+#define X_SyncDestroyAlarm	       11

+#define X_SyncSetPriority   	       12

+#define X_SyncGetPriority   	       13

+#define X_SyncCreateFence	       14

+#define X_SyncTriggerFence	       15

+#define X_SyncResetFence	       16

+#define X_SyncDestroyFence	       17

+#define X_SyncQueryFence	       18

+#define X_SyncAwaitFence	       19

+

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

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

+ * structures are defined.

+ */

+#define XSyncCounter CARD32

+#define XSyncAlarm   CARD32

+#define XSyncFence   CARD32

+#define Drawable     CARD32

+

+/*

+ * Initialize

+ */

+typedef struct _xSyncInitialize {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    CARD8	majorVersion;

+    CARD8	minorVersion;

+    CARD16	pad B16;

+} xSyncInitializeReq;

+#define sz_xSyncInitializeReq		8

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD8	majorVersion;

+    CARD8	minorVersion;

+    CARD16	pad B16;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+} xSyncInitializeReply;

+#define sz_xSyncInitializeReply	32

+

+/*

+ * ListSystemCounters

+ */

+typedef struct _xSyncListSystemCounters

+{

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+} xSyncListSystemCountersReq;

+#define sz_xSyncListSystemCountersReq	4

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    INT32	nCounters B32;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+} xSyncListSystemCountersReply;

+#define sz_xSyncListSystemCountersReply	32

+

+typedef struct {

+    XSyncCounter counter B32;

+    INT32	resolution_hi B32;

+    CARD32	resolution_lo B32;

+    CARD16	name_length B16;

+} xSyncSystemCounter;

+#define sz_xSyncSystemCounter 14

+

+/*

+ * Create Counter

+ */

+typedef struct _xSyncCreateCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter cid B32;

+    INT32       initial_value_hi B32;

+    CARD32	initial_value_lo B32;

+} xSyncCreateCounterReq;

+#define sz_xSyncCreateCounterReq	16

+

+/*

+ * Change Counter

+ */

+typedef struct _xSyncChangeCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter cid B32;

+    INT32       value_hi B32;

+    CARD32	value_lo B32;

+} xSyncChangeCounterReq;

+#define sz_xSyncChangeCounterReq	16

+

+/*

+ * Set Counter

+ */

+typedef struct _xSyncSetCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter cid B32;

+    INT32       value_hi B32;

+    CARD32	value_lo B32;

+} xSyncSetCounterReq;

+#define sz_xSyncSetCounterReq	16

+

+/*

+ * Destroy Counter

+ */

+typedef struct _xSyncDestroyCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter counter B32;

+} xSyncDestroyCounterReq;

+#define sz_xSyncDestroyCounterReq	8

+

+/*

+ * Query Counter

+ */

+typedef struct _xSyncQueryCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter counter B32;

+} xSyncQueryCounterReq;

+#define sz_xSyncQueryCounterReq		8

+

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    INT32	value_hi B32;

+    CARD32	value_lo B32;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+} xSyncQueryCounterReply;

+#define sz_xSyncQueryCounterReply	32

+

+/*

+ * Await

+ */

+typedef struct _xSyncAwaitReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+} xSyncAwaitReq;

+#define sz_xSyncAwaitReq		4

+

+typedef struct _xSyncWaitCondition {

+    XSyncCounter counter B32;

+    CARD32	value_type B32;

+    INT32       wait_value_hi B32;

+    CARD32      wait_value_lo B32;

+    CARD32	test_type B32;

+    INT32	event_threshold_hi B32;

+    CARD32	event_threshold_lo B32;

+} xSyncWaitCondition;

+#define sz_xSyncWaitCondition		28

+

+/*

+ * Create Alarm

+ */

+typedef struct _xSyncCreateAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	id B32;

+    CARD32      valueMask B32;

+} xSyncCreateAlarmReq;

+#define sz_xSyncCreateAlarmReq		12

+

+/*

+ * Destroy Alarm

+ */

+typedef struct _xSyncDestroyAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	alarm B32;

+} xSyncDestroyAlarmReq;

+#define sz_xSyncDestroyAlarmReq		8

+

+/*

+ * Query Alarm

+ */

+typedef struct _xSyncQueryAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	alarm B32;

+} xSyncQueryAlarmReq;

+#define sz_xSyncQueryAlarmReq		8

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    XSyncCounter counter B32;

+    CARD32	value_type B32;

+    INT32	wait_value_hi B32;

+    CARD32	wait_value_lo B32;

+    CARD32	test_type      B32;

+    INT32	delta_hi B32;

+    CARD32	delta_lo B32;

+    BOOL        events;

+    BYTE        state;

+    BYTE	pad0;

+    BYTE	pad1;

+} xSyncQueryAlarmReply;

+#define sz_xSyncQueryAlarmReply		40

+

+/*

+ * Change Alarm

+ */

+typedef struct _xSyncChangeAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	alarm B32;

+    CARD32	valueMask B32;

+} xSyncChangeAlarmReq;

+#define sz_xSyncChangeAlarmReq		12

+

+/*

+ * SetPriority

+ */

+typedef struct _xSyncSetPriority{

+    CARD8   	reqType;

+    CARD8   	syncReqType;

+    CARD16  	length B16;

+    CARD32  	id B32;

+    INT32  	priority B32;

+} xSyncSetPriorityReq;

+#define sz_xSyncSetPriorityReq	    	12

+

+/*

+ * Get Priority

+ */

+typedef struct _xSyncGetPriority{

+    CARD8   	reqType;

+    CARD8   	syncReqType;

+    CARD16  	length B16;

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

+} xSyncGetPriorityReq;

+#define sz_xSyncGetPriorityReq	    	 8

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    INT32  	priority B32;

+    CARD32  	pad0 B32;

+    CARD32  	pad1 B32;

+    CARD32  	pad2 B32;

+    CARD32  	pad3 B32;

+    CARD32  	pad4 B32;

+} xSyncGetPriorityReply;

+#define sz_xSyncGetPriorityReply	32

+

+/*

+ * Create Fence

+ */

+typedef struct _xSyncCreateFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    Drawable	d B32;

+    XSyncFence	fid B32;

+    BOOL	initially_triggered;

+    CARD8	pad0;

+    CARD16	pad1;

+} xSyncCreateFenceReq;

+#define sz_xSyncCreateFenceReq		16

+

+/*

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

+ */

+typedef struct _xSyncTriggerFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncTriggerFenceReq;

+#define sz_xSyncTriggerFenceReq		8

+

+/*

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

+ */

+typedef struct _xSyncResetFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncResetFenceReq;

+#define sz_xSyncResetFenceReq		8

+

+/*

+ * Destroy a fence object

+ */

+typedef struct _xSyncDestroyFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncDestroyFenceReq;

+#define sz_xSyncDestroyFenceReq		8

+

+/*

+ * Query a fence object

+ */

+typedef struct _xSyncQueryFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncQueryFenceReq;

+#define sz_xSyncQueryFenceReq		8

+

+/*

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

+ * to reach the "triggered" state.

+ */

+typedef struct _xSyncAwaitFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+} xSyncAwaitFenceReq;

+#define sz_xSyncAwaitFenceReq		4

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    BOOL	triggered;

+    BYTE	pad0;

+    CARD16	pad1 B16;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+    CARD32	pad6 B32;

+} xSyncQueryFenceReply;

+#define sz_xSyncQueryFenceReply		32

+

+/*

+ * Events

+ */

+

+typedef struct _xSyncCounterNotifyEvent {

+    BYTE	type;

+    BYTE	kind;

+    CARD16	sequenceNumber B16;

+    XSyncCounter counter B32;

+    INT32	wait_value_hi B32;

+    CARD32	wait_value_lo B32;

+    INT32	counter_value_hi B32;

+    CARD32	counter_value_lo B32;

+    CARD32	time B32;

+    CARD16	count B16;

+    BOOL	destroyed;

+    BYTE        pad0;

+} xSyncCounterNotifyEvent;

+

+typedef struct _xSyncAlarmNotifyEvent {

+    BYTE	type;

+    BYTE	kind;

+    CARD16	sequenceNumber B16;

+    XSyncAlarm	alarm B32;

+    INT32	counter_value_hi B32;

+    CARD32	counter_value_lo B32;

+    INT32	alarm_value_hi B32;

+    CARD32	alarm_value_lo B32;

+    CARD32	time B32;

+    CARD8       state;

+    BYTE        pad0;

+    BYTE        pad1;

+    BYTE        pad2;

+} xSyncAlarmNotifyEvent;

+

+#undef XSyncCounter

+#undef XSyncAlarm

+#undef XSyncFence

+#undef Drawable

+

+

+#endif /* _SYNCPROTO_H_ */

diff --git a/X11/extensions/syncstr.h b/X11/extensions/syncstr.h
index 87697a22f..43697e498 100644
--- a/X11/extensions/syncstr.h
+++ b/X11/extensions/syncstr.h
@@ -1,184 +1,182 @@
-/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
-
-#ifndef _SYNCSTR_H_
-#define _SYNCSTR_H_
-
-#include <X11/extensions/syncproto.h>
-
-#ifdef _SYNC_SERVER
-
-#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
-
-typedef struct _SyncCounter {
-    ClientPtr		client;	/* Owning client. 0 for system counters */
-    XSyncCounter	id;		/* resource ID */
-    CARD64		value;		/* counter value */
-    struct _SyncTriggerList *pTriglist;	/* list of triggers */
-    Bool		beingDestroyed; /* in process of going away */
-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
-} SyncCounter;
-
-/*
- * The System Counter interface
- */
-
-typedef enum {
-    XSyncCounterNeverChanges,
-    XSyncCounterNeverIncreases,
-    XSyncCounterNeverDecreases,
-    XSyncCounterUnrestricted
-} SyncCounterType;
-
-typedef struct _SysCounterInfo {
-    char	*name;
-    CARD64	resolution;
-    CARD64	bracket_greater;
-    CARD64	bracket_less;
-    SyncCounterType counterType;  /* how can this counter change */
-    void        (*QueryValue)(
-			      pointer /*pCounter*/,
-			      CARD64 * /*freshvalue*/
-);
-    void	(*BracketValues)(
-				 pointer /*pCounter*/,
-				 CARD64 * /*lessthan*/,
-				 CARD64 * /*greaterthan*/
-);
-} SysCounterInfo;
-
-
-
-typedef struct _SyncTrigger {
-    SyncCounter *pCounter;
-    CARD64	wait_value;	/* wait value */
-    unsigned int value_type;     /* Absolute or Relative */
-    unsigned int test_type;	/* transition or Comparision type */
-    CARD64	test_value;	/* trigger event threshold value */
-    Bool	(*CheckTrigger)(
-				struct _SyncTrigger * /*pTrigger*/,
-				CARD64 /*newval*/
-				);
-    void	(*TriggerFired)(
-				struct _SyncTrigger * /*pTrigger*/
-				);
-    void	(*CounterDestroyed)(
-				struct _SyncTrigger * /*pTrigger*/
-				    );
-} SyncTrigger;
-
-typedef struct _SyncTriggerList {
-    SyncTrigger *pTrigger;
-    struct _SyncTriggerList *next;
-} SyncTriggerList;
-
-typedef struct _SyncAlarmClientList {
-    ClientPtr	client;
-    XID		delete_id;
-    struct _SyncAlarmClientList *next;
-} SyncAlarmClientList;
-
-typedef struct _SyncAlarm {
-    SyncTrigger trigger;
-    ClientPtr	client;
-    XSyncAlarm 	alarm_id;
-    CARD64	delta;
-    int		events;
-    int		state;
-    SyncAlarmClientList *pEventClients;
-} SyncAlarm;
-
-typedef struct {
-    ClientPtr	client;
-    CARD32 	delete_id;
-    int		num_waitconditions;
-} SyncAwaitHeader;
-
-typedef struct {
-    SyncTrigger trigger;
-    CARD64	event_threshold;
-    SyncAwaitHeader *pHeader;
-} SyncAwait;
-
-typedef union {
-    SyncAwaitHeader header;
-    SyncAwait	    await;
-} SyncAwaitUnion;
-
-
-extern pointer SyncCreateSystemCounter(
-    char *	/* name */,
-    CARD64  	/* inital_value */,
-    CARD64  	/* resolution */,
-    SyncCounterType /* change characterization */,
-    void        (* /*QueryValue*/ ) (
-        pointer /* pCounter */,
-        CARD64 * /* pValue_return */), /* XXX prototype */
-    void        (* /*BracketValues*/) (
-        pointer /* pCounter */, 
-        CARD64 * /* pbracket_less */,
-        CARD64 * /* pbracket_greater */)
-);
-
-extern void SyncChangeCounter(
-    SyncCounter *	/* pCounter*/,
-    CARD64  		/* new_value */
-);
-
-extern void SyncDestroySystemCounter(
-    pointer pCounter
-);
-extern void InitServertime(void);
-
-#endif /* _SYNC_SERVER */
-
-#endif /* _SYNCSTR_H_ */
+/*

+

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

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

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

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

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

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

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

+both that copyright notice and this permission notice appear in 

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

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

+software without specific, written prior permission.  

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

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

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

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

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

+PERFORMANCE OF THIS SOFTWARE.

+

+******************************************************************/

+

+#ifndef _SYNCSTR_H_

+#define _SYNCSTR_H_

+

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

+

+#ifdef _SYNC_SERVER

+

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

+

+typedef struct _SyncCounter {

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

+    XSyncCounter	id;		/* resource ID */

+    CARD64		value;		/* counter value */

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

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

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

+} SyncCounter;

+

+/*

+ * The System Counter interface

+ */

+

+typedef enum {

+    XSyncCounterNeverChanges,

+    XSyncCounterNeverIncreases,

+    XSyncCounterNeverDecreases,

+    XSyncCounterUnrestricted

+} SyncCounterType;

+

+typedef struct _SysCounterInfo {

+    char	*name;

+    CARD64	resolution;

+    CARD64	bracket_greater;

+    CARD64	bracket_less;

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

+    void        (*QueryValue)(

+			      pointer /*pCounter*/,

+			      CARD64 * /*freshvalue*/

+);

+    void	(*BracketValues)(

+				 pointer /*pCounter*/,

+				 CARD64 * /*lessthan*/,

+				 CARD64 * /*greaterthan*/

+);

+} SysCounterInfo;

+

+

+

+typedef struct _SyncTrigger {

+    SyncCounter *pCounter;

+    CARD64	wait_value;	/* wait value */

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

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

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

+    Bool	(*CheckTrigger)(

+				struct _SyncTrigger * /*pTrigger*/,

+				CARD64 /*newval*/

+				);

+    void	(*TriggerFired)(

+				struct _SyncTrigger * /*pTrigger*/

+				);

+    void	(*CounterDestroyed)(

+				struct _SyncTrigger * /*pTrigger*/

+				    );

+} SyncTrigger;

+

+typedef struct _SyncTriggerList {

+    SyncTrigger *pTrigger;

+    struct _SyncTriggerList *next;

+} SyncTriggerList;

+

+typedef struct _SyncAlarmClientList {

+    ClientPtr	client;

+    XID		delete_id;

+    struct _SyncAlarmClientList *next;

+} SyncAlarmClientList;

+

+typedef struct _SyncAlarm {

+    SyncTrigger trigger;

+    ClientPtr	client;

+    XSyncAlarm 	alarm_id;

+    CARD64	delta;

+    int		events;

+    int		state;

+    SyncAlarmClientList *pEventClients;

+} SyncAlarm;

+

+typedef struct {

+    ClientPtr	client;

+    CARD32 	delete_id;

+    int		num_waitconditions;

+} SyncAwaitHeader;

+

+typedef struct {

+    SyncTrigger trigger;

+    CARD64	event_threshold;

+    SyncAwaitHeader *pHeader;

+} SyncAwait;

+

+typedef union {

+    SyncAwaitHeader header;

+    SyncAwait	    await;

+} SyncAwaitUnion;

+

+

+extern pointer SyncCreateSystemCounter(

+    char *	/* name */,

+    CARD64  	/* inital_value */,

+    CARD64  	/* resolution */,

+    SyncCounterType /* change characterization */,

+    void        (* /*QueryValue*/ ) (

+        pointer /* pCounter */,

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

+    void        (* /*BracketValues*/) (

+        pointer /* pCounter */, 

+        CARD64 * /* pbracket_less */,

+        CARD64 * /* pbracket_greater */)

+);

+

+extern void SyncChangeCounter(

+    SyncCounter *	/* pCounter*/,

+    CARD64  		/* new_value */

+);

+

+extern void SyncDestroySystemCounter(

+    pointer pCounter

+);

+extern void InitServertime(void);

+

+#endif /* _SYNC_SERVER */

+

+#endif /* _SYNCSTR_H_ */

diff --git a/updategit.bat b/updategit.bat
index 92f94a6c1..987cedac5 100644
--- a/updategit.bat
+++ b/updategit.bat
@@ -13,6 +13,7 @@ git clone git://anongit.freedesktop.org/xorg/lib/libXinerama
 git clone git://anongit.freedesktop.org/xorg/lib/libXau

 git clone git://anongit.freedesktop.org/xorg/app/xkbcomp

 git clone git://anongit.freedesktop.org/pixman

+git clone git://anongit.freedesktop.org/xorg/proto/xextproto

 

 :noclone

 pushd .

@@ -65,5 +66,9 @@ echo Updating pixman     |& tee /a d:\updategit.log
 pushd pixman             |& tee /a d:\updategit.log

 git pull                 |& tee /a d:\updategit.log

 popd

+echo Updating exextproto |& tee /a d:\updategit.log

+pushd xextproto          |& tee /a d:\updategit.log

+git pull                 |& tee /a d:\updategit.log

+popd

 popd

 setlocal off