svn merge ^/branches/released .

71 files changed, 4179 insertions, 4425 deletions

diff --git a/libXau/AuDispose.c b/libXau/AuDispose.c
index cb6f85cd6..164fe947d 100644
--- a/libXau/AuDispose.c
+++ b/libXau/AuDispose.c
@@ -1,50 +1,47 @@
-/* $Xorg: AuDispose.c,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/AuDispose.c,v 1.4 2001/07/25 15:04:48 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <stdlib.h>
-
-void
-XauDisposeAuth (Xauth *auth)
-{
-    if (auth) {
-	if (auth->address) (void) free (auth->address);
-	if (auth->number) (void) free (auth->number);
-	if (auth->name) (void) free (auth->name);
-	if (auth->data) {
-	    (void) bzero (auth->data, auth->data_length);
-	    (void) free (auth->data);
-	}
-	free ((char *) auth);
-    }
-    return;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <stdlib.h>

+

+void

+XauDisposeAuth (Xauth *auth)

+{

+    if (auth) {

+	if (auth->address) (void) free (auth->address);

+	if (auth->number) (void) free (auth->number);

+	if (auth->name) (void) free (auth->name);

+	if (auth->data) {

+	    (void) bzero (auth->data, auth->data_length);

+	    (void) free (auth->data);

+	}

+	free ((char *) auth);

+    }

+    return;

+}

diff --git a/libXau/AuFileName.c b/libXau/AuFileName.c
index b21b048cd..4419070bc 100644
--- a/libXau/AuFileName.c
+++ b/libXau/AuFileName.c
@@ -1,75 +1,72 @@
-/* $Xorg: AuFileName.c,v 1.5 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/AuFileName.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-#include <stdlib.h>
-
-char *
-XauFileName (void)
-{
-    const char *slashDotXauthority = "/.Xauthority";
-    char    *name;
-    static char	*buf;
-    static int	bsize;
-#ifdef WIN32
-    char    dir[128];
-#endif
-    int	    size;
-
-    if ((name = getenv ("XAUTHORITY")))
-	return name;
-    name = getenv ("HOME");
-    if (!name) {
-#ifdef WIN32
-	(void) strcpy (dir, "/users/");
-	if ((name = getenv("USERNAME"))) {
-	    (void) strcat (dir, name);
-	    name = dir;
-	}
-	if (!name)
-#endif
-	return NULL;
-    }
-    size = strlen (name) + strlen(&slashDotXauthority[1]) + 2;
-    if (size > bsize) {
-	if (buf)
-	    free (buf);
-	buf = malloc ((unsigned) size);
-	if (!buf)
-	    return NULL;
-	bsize = size;
-    }
-    strcpy (buf, name);
-    strcat (buf, slashDotXauthority + (name[1] == '\0' ? 1 : 0));
-    return buf;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <X11/Xos.h>

+#include <stdlib.h>

+

+char *

+XauFileName (void)

+{

+    const char *slashDotXauthority = "/.Xauthority";

+    char    *name;

+    static char	*buf;

+    static int	bsize;

+#ifdef WIN32

+    char    dir[128];

+#endif

+    int	    size;

+

+    if ((name = getenv ("XAUTHORITY")))

+	return name;

+    name = getenv ("HOME");

+    if (!name) {

+#ifdef WIN32

+	(void) strcpy (dir, "/users/");

+	if ((name = getenv("USERNAME"))) {

+	    (void) strcat (dir, name);

+	    name = dir;

+	}

+	if (!name)

+#endif

+	return NULL;

+    }

+    size = strlen (name) + strlen(&slashDotXauthority[1]) + 2;

+    if (size > bsize) {

+	if (buf)

+	    free (buf);

+	buf = malloc ((unsigned) size);

+	if (!buf)

+	    return NULL;

+	bsize = size;

+    }

+    strcpy (buf, name);

+    strcat (buf, slashDotXauthority + (name[1] == '\0' ? 1 : 0));

+    return buf;

+}

diff --git a/libXau/AuGetAddr.c b/libXau/AuGetAddr.c
index 6275531be..f26c58ba4 100644
--- a/libXau/AuGetAddr.c
+++ b/libXau/AuGetAddr.c
@@ -1,112 +1,109 @@
-/* $Xorg: AuGetAddr.c,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/AuGetAddr.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-
-static int
-binaryEqual (_Xconst char *a, _Xconst char *b, int len)
-{
-    while (len--)
-	if (*a++ != *b++)
-	    return 0;
-    return 1;
-}
-
-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)
-{
-    FILE    *auth_file;
-    char    *auth_name;
-    Xauth   *entry;
-
-    auth_name = XauFileName ();
-    if (!auth_name)
-	return NULL;
-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
-	return NULL;
-    auth_file = fopen (auth_name, "rb");
-    if (!auth_file)
-	return NULL;
-    for (;;) {
-	entry = XauReadAuth (auth_file);
-	if (!entry)
-	    break;
-	/*
-	 * Match when:
-	 *   either family or entry->family are FamilyWild or
-	 *    family and entry->family are the same and
-	 *     address and entry->address are the same
-	 *  and
-	 *   either number or entry->number are empty or
-	 *    number and entry->number are the same
-	 *  and
-	 *   either name or entry->name are empty or
-	 *    name and entry->name are the same
-	 */
-
-	if ((family == FamilyWild || entry->family == FamilyWild ||
-	     (entry->family == family &&
-	      address_length == entry->address_length &&
-	      binaryEqual (entry->address, address, (int)address_length))) &&
-	    (number_length == 0 || entry->number_length == 0 ||
-	     (number_length == entry->number_length &&
-	      binaryEqual (entry->number, number, (int)number_length))) &&
-	    (name_length == 0 || entry->name_length == 0 ||
-	     (entry->name_length == name_length &&
- 	      binaryEqual (entry->name, name, (int)name_length))))
-	    break;
-	XauDisposeAuth (entry);
-    }
-    (void) fclose (auth_file);
-    return entry;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <X11/Xos.h>

+

+static int

+binaryEqual (_Xconst char *a, _Xconst char *b, int len)

+{

+    while (len--)

+	if (*a++ != *b++)

+	    return 0;

+    return 1;

+}

+

+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)

+{

+    FILE    *auth_file;

+    char    *auth_name;

+    Xauth   *entry;

+

+    auth_name = XauFileName ();

+    if (!auth_name)

+	return NULL;

+    if (access (auth_name, R_OK) != 0)		/* checks REAL id */

+	return NULL;

+    auth_file = fopen (auth_name, "rb");

+    if (!auth_file)

+	return NULL;

+    for (;;) {

+	entry = XauReadAuth (auth_file);

+	if (!entry)

+	    break;

+	/*

+	 * Match when:

+	 *   either family or entry->family are FamilyWild or

+	 *    family and entry->family are the same and

+	 *     address and entry->address are the same

+	 *  and

+	 *   either number or entry->number are empty or

+	 *    number and entry->number are the same

+	 *  and

+	 *   either name or entry->name are empty or

+	 *    name and entry->name are the same

+	 */

+

+	if ((family == FamilyWild || entry->family == FamilyWild ||

+	     (entry->family == family &&

+	      address_length == entry->address_length &&

+	      binaryEqual (entry->address, address, (int)address_length))) &&

+	    (number_length == 0 || entry->number_length == 0 ||

+	     (number_length == entry->number_length &&

+	      binaryEqual (entry->number, number, (int)number_length))) &&

+	    (name_length == 0 || entry->name_length == 0 ||

+	     (entry->name_length == name_length &&

+ 	      binaryEqual (entry->name, name, (int)name_length))))

+	    break;

+	XauDisposeAuth (entry);

+    }

+    (void) fclose (auth_file);

+    return entry;

+}

diff --git a/libXau/AuGetBest.c b/libXau/AuGetBest.c
index ae2b748dc..7d001526f 100644
--- a/libXau/AuGetBest.c
+++ b/libXau/AuGetBest.c
@@ -1,173 +1,170 @@
-/* $Xorg: AuGetBest.c,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/AuGetBest.c,v 1.7 2001/12/14 19:54:36 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-#ifdef XTHREADS
-#include <X11/Xthreads.h>
-#endif
-#ifdef hpux
-#define X_INCLUDE_NETDB_H
-#define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
-#endif
-
-static int
-binaryEqual (_Xconst char *a, _Xconst char *b, int len)
-{
-    while (len--)
-	if (*a++ != *b++)
-	    return 0;
-    return 1;
-}
-
-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**		types,
-    _Xconst int*	type_lengths)
-{
-    FILE    *auth_file;
-    char    *auth_name;
-    Xauth   *entry;
-    Xauth   *best;
-    int	    best_type;
-    int	    type;
-#ifdef hpux
-    char		*fully_qual_address;
-    unsigned short	fully_qual_address_length;
-#endif
-
-    auth_name = XauFileName ();
-    if (!auth_name)
-	return NULL;
-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
-	return NULL;
-    auth_file = fopen (auth_name, "rb");
-    if (!auth_file)
-	return NULL;
-
-#ifdef hpux
-    if (family == FamilyLocal) {
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
-	_Xgethostbynameparams hparams;
-#endif
-	struct hostent *hostp;
-
-	/* make sure we try fully-qualified hostname */
-	if ((hostp = _XGethostbyname(address,hparams)) != NULL) {
-	    fully_qual_address = hostp->h_name;
-	    fully_qual_address_length = strlen(fully_qual_address);
-	}
-	else
-	{
-	    fully_qual_address = NULL;
-	    fully_qual_address_length = 0;
-	}
-    }
-#endif /* hpux */
-
-    best = NULL;
-    best_type = types_length;
-    for (;;) {
-	entry = XauReadAuth (auth_file);
-	if (!entry)
-	    break;
-	/*
-	 * Match when:
-	 *   either family or entry->family are FamilyWild or
-	 *    family and entry->family are the same and
-	 *     address and entry->address are the same
-	 *  and
-	 *   either number or entry->number are empty or
-	 *    number and entry->number are the same
-	 *  and
-	 *   either name or entry->name are empty or
-	 *    name and entry->name are the same
-	 */
-
-	if ((family == FamilyWild || entry->family == FamilyWild ||
-	     (entry->family == family &&
-	     ((address_length == entry->address_length &&
-	      binaryEqual (entry->address, address, (int)address_length))
-#ifdef hpux
-	     || (family == FamilyLocal &&
-		fully_qual_address_length == entry->address_length &&
-	     	binaryEqual (entry->address, fully_qual_address,
-		    (int) fully_qual_address_length))
-#endif
-	    ))) &&
-	    (number_length == 0 || entry->number_length == 0 ||
-	     (number_length == entry->number_length &&
-	      binaryEqual (entry->number, number, (int)number_length))))
-	{
-	    if (best_type == 0)
-	    {
-		best = entry;
-		break;
-	    }
-	    for (type = 0; type < best_type; type++)
-		if (type_lengths[type] == entry->name_length &&
-		    !(strncmp (types[type], entry->name, entry->name_length)))
-		{
-		    break;
-		}
-	    if (type < best_type)
-	    {
-		if (best)
-		    XauDisposeAuth (best);
-		best = entry;
-		best_type = type;
-		if (type == 0)
-		    break;
-		continue;
-	    }
-	}
-	XauDisposeAuth (entry);
-    }
-    (void) fclose (auth_file);
-    return best;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <X11/Xos.h>

+#ifdef XTHREADS

+#include <X11/Xthreads.h>

+#endif

+#ifdef hpux

+#define X_INCLUDE_NETDB_H

+#define XOS_USE_NO_LOCKING

+#include <X11/Xos_r.h>

+#endif

+

+static int

+binaryEqual (_Xconst char *a, _Xconst char *b, int len)

+{

+    while (len--)

+	if (*a++ != *b++)

+	    return 0;

+    return 1;

+}

+

+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**		types,

+    _Xconst int*	type_lengths)

+{

+    FILE    *auth_file;

+    char    *auth_name;

+    Xauth   *entry;

+    Xauth   *best;

+    int	    best_type;

+    int	    type;

+#ifdef hpux

+    char		*fully_qual_address;

+    unsigned short	fully_qual_address_length;

+#endif

+

+    auth_name = XauFileName ();

+    if (!auth_name)

+	return NULL;

+    if (access (auth_name, R_OK) != 0)		/* checks REAL id */

+	return NULL;

+    auth_file = fopen (auth_name, "rb");

+    if (!auth_file)

+	return NULL;

+

+#ifdef hpux

+    if (family == FamilyLocal) {

+#ifdef XTHREADS_NEEDS_BYNAMEPARAMS

+	_Xgethostbynameparams hparams;

+#endif

+	struct hostent *hostp;

+

+	/* make sure we try fully-qualified hostname */

+	if ((hostp = _XGethostbyname(address,hparams)) != NULL) {

+	    fully_qual_address = hostp->h_name;

+	    fully_qual_address_length = strlen(fully_qual_address);

+	}

+	else

+	{

+	    fully_qual_address = NULL;

+	    fully_qual_address_length = 0;

+	}

+    }

+#endif /* hpux */

+

+    best = NULL;

+    best_type = types_length;

+    for (;;) {

+	entry = XauReadAuth (auth_file);

+	if (!entry)

+	    break;

+	/*

+	 * Match when:

+	 *   either family or entry->family are FamilyWild or

+	 *    family and entry->family are the same and

+	 *     address and entry->address are the same

+	 *  and

+	 *   either number or entry->number are empty or

+	 *    number and entry->number are the same

+	 *  and

+	 *   either name or entry->name are empty or

+	 *    name and entry->name are the same

+	 */

+

+	if ((family == FamilyWild || entry->family == FamilyWild ||

+	     (entry->family == family &&

+	     ((address_length == entry->address_length &&

+	      binaryEqual (entry->address, address, (int)address_length))

+#ifdef hpux

+	     || (family == FamilyLocal &&

+		fully_qual_address_length == entry->address_length &&

+	     	binaryEqual (entry->address, fully_qual_address,

+		    (int) fully_qual_address_length))

+#endif

+	    ))) &&

+	    (number_length == 0 || entry->number_length == 0 ||

+	     (number_length == entry->number_length &&

+	      binaryEqual (entry->number, number, (int)number_length))))

+	{

+	    if (best_type == 0)

+	    {

+		best = entry;

+		break;

+	    }

+	    for (type = 0; type < best_type; type++)

+		if (type_lengths[type] == entry->name_length &&

+		    !(strncmp (types[type], entry->name, entry->name_length)))

+		{

+		    break;

+		}

+	    if (type < best_type)

+	    {

+		if (best)

+		    XauDisposeAuth (best);

+		best = entry;

+		best_type = type;

+		if (type == 0)

+		    break;

+		continue;

+	    }

+	}

+	XauDisposeAuth (entry);

+    }

+    (void) fclose (auth_file);

+    return best;

+}

diff --git a/libXau/AuLock.c b/libXau/AuLock.c
index 69b1fd69a..45d6b71a3 100644
--- a/libXau/AuLock.c
+++ b/libXau/AuLock.c
@@ -1,120 +1,117 @@
-/* $Xorg: AuLock.c,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/AuLock.c,v 3.6 2002/05/31 18:45:43 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <time.h>
-#define Time_t time_t
-#ifndef X_NOT_POSIX
-#include <unistd.h>
-#else
-#ifndef WIN32
-extern unsigned	sleep ();
-#else
-#include <X11/Xwindows.h>
-#define link rename
-#endif
-#endif
-#ifdef __UNIXOS2__
-#define link rename
-#endif
-
-int
-XauLockAuth (
-_Xconst char *file_name,
-int	retries,
-int	timeout,
-long	dead)
-{
-    char	creat_name[1025], link_name[1025];
-    struct stat	statb;
-    Time_t	now;
-    int		creat_fd = -1;
-
-    if (strlen (file_name) > 1022)
-	return LOCK_ERROR;
-    (void) strcpy (creat_name, file_name);
-    (void) strcat (creat_name, "-c");
-    (void) strcpy (link_name, file_name);
-    (void) strcat (link_name, "-l");
-    if (stat (creat_name, &statb) != -1) {
-	now = time ((Time_t *) 0);
-	/*
-	 * NFS may cause ctime to be before now, special
-	 * case a 0 deadtime to force lock removal
-	 */
-	if (dead == 0 || now - statb.st_ctime > dead) {
-	    (void) unlink (creat_name);
-	    (void) unlink (link_name);
-	}
-    }
-    
-    while (retries > 0) {
-	if (creat_fd == -1) {
-	    creat_fd = open (creat_name, O_WRONLY | O_CREAT | O_EXCL, 0600);
-	    if (creat_fd == -1) {
-		if (errno != EACCES)
-		    return LOCK_ERROR;
-	    } else
-		(void) close (creat_fd);
-	}
-	if (creat_fd != -1) {
-#ifndef X_NOT_POSIX
-	    /* The file system may not support hard links, and pathconf should tell us that. */
-	    if (1 == pathconf(creat_name, _PC_LINK_MAX)) {
-		if (-1 == rename(creat_name, link_name)) {
-		    /* Is this good enough?  Perhaps we should retry.  TEST */
-		    return LOCK_ERROR;
-		} else {
-		    return LOCK_SUCCESS;
-		}
-	    } else {
-#endif
-	    	if (link (creat_name, link_name) != -1)
-		    return LOCK_SUCCESS;
-		if (errno == ENOENT) {
-		    creat_fd = -1;	/* force re-creat next time around */
-		    continue;
-	    	}
-	    	if (errno != EEXIST)
-		    return LOCK_ERROR;
-#ifndef X_NOT_POSIX
-	   }
-#endif
-	}
-	(void) sleep ((unsigned) timeout);
-	--retries;
-    }
-    return LOCK_TIMEOUT;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <X11/Xos.h>

+#include <sys/stat.h>

+#include <errno.h>

+#include <time.h>

+#define Time_t time_t

+#ifndef X_NOT_POSIX

+#include <unistd.h>

+#else

+#ifndef WIN32

+extern unsigned	sleep ();

+#else

+#include <X11/Xwindows.h>

+#define link rename

+#endif

+#endif

+#ifdef __UNIXOS2__

+#define link rename

+#endif

+

+int

+XauLockAuth (

+_Xconst char *file_name,

+int	retries,

+int	timeout,

+long	dead)

+{

+    char	creat_name[1025], link_name[1025];

+    struct stat	statb;

+    Time_t	now;

+    int		creat_fd = -1;

+

+    if (strlen (file_name) > 1022)

+	return LOCK_ERROR;

+    (void) strcpy (creat_name, file_name);

+    (void) strcat (creat_name, "-c");

+    (void) strcpy (link_name, file_name);

+    (void) strcat (link_name, "-l");

+    if (stat (creat_name, &statb) != -1) {

+	now = time ((Time_t *) 0);

+	/*

+	 * NFS may cause ctime to be before now, special

+	 * case a 0 deadtime to force lock removal

+	 */

+	if (dead == 0 || now - statb.st_ctime > dead) {

+	    (void) unlink (creat_name);

+	    (void) unlink (link_name);

+	}

+    }

+    

+    while (retries > 0) {

+	if (creat_fd == -1) {

+	    creat_fd = open (creat_name, O_WRONLY | O_CREAT | O_EXCL, 0600);

+	    if (creat_fd == -1) {

+		if (errno != EACCES)

+		    return LOCK_ERROR;

+	    } else

+		(void) close (creat_fd);

+	}

+	if (creat_fd != -1) {

+#ifndef X_NOT_POSIX

+	    /* The file system may not support hard links, and pathconf should tell us that. */

+	    if (1 == pathconf(creat_name, _PC_LINK_MAX)) {

+		if (-1 == rename(creat_name, link_name)) {

+		    /* Is this good enough?  Perhaps we should retry.  TEST */

+		    return LOCK_ERROR;

+		} else {

+		    return LOCK_SUCCESS;

+		}

+	    } else {

+#endif

+	    	if (link (creat_name, link_name) != -1)

+		    return LOCK_SUCCESS;

+		if (errno == ENOENT) {

+		    creat_fd = -1;	/* force re-creat next time around */

+		    continue;

+	    	}

+	    	if (errno != EEXIST)

+		    return LOCK_ERROR;

+#ifndef X_NOT_POSIX

+	   }

+#endif

+	}

+	(void) sleep ((unsigned) timeout);

+	--retries;

+    }

+    return LOCK_TIMEOUT;

+}

diff --git a/libXau/AuRead.c b/libXau/AuRead.c
index 9979c1dfc..09e454336 100644
--- a/libXau/AuRead.c
+++ b/libXau/AuRead.c
@@ -1,110 +1,107 @@
-/* $Xorg: AuRead.c,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/AuRead.c,v 1.5 2001/07/25 15:04:48 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <stdlib.h>
-
-static int
-read_short (unsigned short *shortp, FILE *file)
-{
-    unsigned char   file_short[2];
-
-    if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
-	return 0;
-    *shortp = file_short[0] * 256 + file_short[1];
-    return 1;
-}
-
-static int
-read_counted_string (unsigned short *countp, char **stringp, FILE *file)
-{
-    unsigned short  len;
-    char	    *data;
-
-    if (read_short (&len, file) == 0)
-	return 0;
-    if (len == 0) {
-	data = NULL;
-    } else {
-    	data = malloc ((unsigned) len);
-    	if (!data)
-	    return 0;
-    	if (fread (data, (int) sizeof (char), (int) len, file) != len) {
-	    bzero (data, len);
-	    free (data);
-	    return 0;
-    	}
-    }
-    *stringp = data;
-    *countp = len;
-    return 1;
-}
-
-Xauth *
-XauReadAuth (FILE *auth_file)
-{
-    Xauth   local;
-    Xauth   *ret;
-
-    if (read_short (&local.family, auth_file) == 0)
-	return NULL;
-    if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
-	return NULL;
-    if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
-	if (local.address) free (local.address);
-	return NULL;
-    }
-    if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
-	if (local.address) free (local.address);
-	if (local.number) free (local.number);
-	return NULL;
-    }
-    if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
-	if (local.address) free (local.address);
-	if (local.number) free (local.number);
-	if (local.name) free (local.name);
-	return NULL;
-    }
-    ret = (Xauth *) malloc (sizeof (Xauth));
-    if (!ret) {
-	if (local.address) free (local.address);
-	if (local.number) free (local.number);
-	if (local.name) free (local.name);
-	if (local.data) {
-	    bzero (local.data, local.data_length);
-	    free (local.data);
-	}
-	return NULL;
-    }
-    *ret = local;
-    return ret;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <stdlib.h>

+

+static int

+read_short (unsigned short *shortp, FILE *file)

+{

+    unsigned char   file_short[2];

+

+    if (fread ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)

+	return 0;

+    *shortp = file_short[0] * 256 + file_short[1];

+    return 1;

+}

+

+static int

+read_counted_string (unsigned short *countp, char **stringp, FILE *file)

+{

+    unsigned short  len;

+    char	    *data;

+

+    if (read_short (&len, file) == 0)

+	return 0;

+    if (len == 0) {

+	data = NULL;

+    } else {

+    	data = malloc ((unsigned) len);

+    	if (!data)

+	    return 0;

+    	if (fread (data, (int) sizeof (char), (int) len, file) != len) {

+	    bzero (data, len);

+	    free (data);

+	    return 0;

+    	}

+    }

+    *stringp = data;

+    *countp = len;

+    return 1;

+}

+

+Xauth *

+XauReadAuth (FILE *auth_file)

+{

+    Xauth   local;

+    Xauth   *ret;

+

+    if (read_short (&local.family, auth_file) == 0)

+	return NULL;

+    if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)

+	return NULL;

+    if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {

+	if (local.address) free (local.address);

+	return NULL;

+    }

+    if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {

+	if (local.address) free (local.address);

+	if (local.number) free (local.number);

+	return NULL;

+    }

+    if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {

+	if (local.address) free (local.address);

+	if (local.number) free (local.number);

+	if (local.name) free (local.name);

+	return NULL;

+    }

+    ret = (Xauth *) malloc (sizeof (Xauth));

+    if (!ret) {

+	if (local.address) free (local.address);

+	if (local.number) free (local.number);

+	if (local.name) free (local.name);

+	if (local.data) {

+	    bzero (local.data, local.data_length);

+	    free (local.data);

+	}

+	return NULL;

+    }

+    *ret = local;

+    return ret;

+}

diff --git a/libXau/AuUnlock.c b/libXau/AuUnlock.c
index 460effe86..072331e34 100644
--- a/libXau/AuUnlock.c
+++ b/libXau/AuUnlock.c
@@ -1,62 +1,59 @@
-/* $Xorg: AuUnlock.c,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/AuUnlock.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
-
-int
-XauUnlockAuth (
-_Xconst char *file_name)
-{
-#ifndef WIN32
-    char	creat_name[1025];
-#endif
-    char	link_name[1025];
-
-    if (strlen (file_name) > 1022)
-	return 0;
-#ifndef WIN32
-    (void) strcpy (creat_name, file_name);
-    (void) strcat (creat_name, "-c");
-#endif
-    (void) strcpy (link_name, file_name);
-    (void) strcat (link_name, "-l");
-    /*
-     * I think this is the correct order
-     */
-#ifndef WIN32
-    (void) unlink (creat_name);
-#endif
-    (void) unlink (link_name);
-
-    return 1;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <X11/Xos.h>

+

+int

+XauUnlockAuth (

+_Xconst char *file_name)

+{

+#ifndef WIN32

+    char	creat_name[1025];

+#endif

+    char	link_name[1025];

+

+    if (strlen (file_name) > 1022)

+	return 0;

+#ifndef WIN32

+    (void) strcpy (creat_name, file_name);

+    (void) strcat (creat_name, "-c");

+#endif

+    (void) strcpy (link_name, file_name);

+    (void) strcat (link_name, "-l");

+    /*

+     * I think this is the correct order

+     */

+#ifndef WIN32

+    (void) unlink (creat_name);

+#endif

+    (void) unlink (link_name);

+

+    return 1;

+}

diff --git a/libXau/AuWrite.c b/libXau/AuWrite.c
index 5852759d6..2ad7a07af 100644
--- a/libXau/AuWrite.c
+++ b/libXau/AuWrite.c
@@ -1,71 +1,68 @@
-/* $Xorg: AuWrite.c,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/AuWrite.c,v 1.3 2001/01/17 19:42:24 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-
-static int
-write_short (unsigned short s, FILE *file)
-{
-    unsigned char   file_short[2];
-
-    file_short[0] = (s & (unsigned)0xff00) >> 8;
-    file_short[1] = s & 0xff;
-    if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
-	return 0;
-    return 1;
-}
-
-static int
-write_counted_string (unsigned short count, char *string, FILE *file)
-{
-    if (write_short (count, file) == 0)
-	return 0;
-    if (fwrite (string, (int) sizeof (char), (int) count, file) != count)
-	return 0;
-    return 1;
-}
-
-int
-XauWriteAuth (FILE *auth_file, Xauth *auth)
-{
-    if (write_short (auth->family, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->number_length, auth->number, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->name_length, auth->name, auth_file) == 0)
-	return 0;
-    if (write_counted_string (auth->data_length, auth->data, auth_file) == 0)
-	return 0;
-    return 1;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+

+static int

+write_short (unsigned short s, FILE *file)

+{

+    unsigned char   file_short[2];

+

+    file_short[0] = (s & (unsigned)0xff00) >> 8;

+    file_short[1] = s & 0xff;

+    if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)

+	return 0;

+    return 1;

+}

+

+static int

+write_counted_string (unsigned short count, char *string, FILE *file)

+{

+    if (write_short (count, file) == 0)

+	return 0;

+    if (fwrite (string, (int) sizeof (char), (int) count, file) != count)

+	return 0;

+    return 1;

+}

+

+int

+XauWriteAuth (FILE *auth_file, Xauth *auth)

+{

+    if (write_short (auth->family, auth_file) == 0)

+	return 0;

+    if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)

+	return 0;

+    if (write_counted_string (auth->number_length, auth->number, auth_file) == 0)

+	return 0;

+    if (write_counted_string (auth->name_length, auth->name, auth_file) == 0)

+	return 0;

+    if (write_counted_string (auth->data_length, auth->data, auth_file) == 0)

+	return 0;

+    return 1;

+}

diff --git a/libXau/Autest.c b/libXau/Autest.c
index 12b8cbf25..966e0d13f 100644
--- a/libXau/Autest.c
+++ b/libXau/Autest.c
@@ -1,76 +1,74 @@
-/* $Xorg: Autest.c,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.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xauth.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main (int argc, char **argv)
-{
-    Xauth   test_data;
-    char    *name = "XAU-TEST-1";
-    char    *data = "Do not begin the test until instructed to do so.";
-    char    *file = NULL;
-    int	    state = 0;
-    FILE    *output;
-
-    while (*++argv) {
-	if (!strcmp (*argv, "-file"))
-	    file = *++argv;
-	else if (state == 0) {
-	    name = *argv;
-	    ++state;
-	} else if (state == 1) {
-	    data = *argv;
-	    ++state;
-	}
-    }
-    test_data.family = 0;
-    test_data.address_length = 0;
-    test_data.address = "";
-    test_data.number_length = 0;
-    test_data.number = "";
-    test_data.name_length = strlen (name);
-    test_data.name = name;
-    test_data.data_length = strlen (data);
-    test_data.data = data;
-    if (!file) {
-	output = tmpfile();
-    } else {
-	output = fopen (file, "w");
-    }
-    if (output) {
-	state = XauWriteAuth (output, &test_data);
-	fclose (output);
-    }
-    return (state = 1) ? 0 : 1;
-}
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xauth.h>

+#include <stdio.h>

+#include <stdlib.h>

+

+int

+main (int argc, char **argv)

+{

+    Xauth   test_data;

+    char    *name = "XAU-TEST-1";

+    char    *data = "Do not begin the test until instructed to do so.";

+    char    *file = NULL;

+    int	    state = 0;

+    FILE    *output;

+

+    while (*++argv) {

+	if (!strcmp (*argv, "-file"))

+	    file = *++argv;

+	else if (state == 0) {

+	    name = *argv;

+	    ++state;

+	} else if (state == 1) {

+	    data = *argv;

+	    ++state;

+	}

+    }

+    test_data.family = 0;

+    test_data.address_length = 0;

+    test_data.address = "";

+    test_data.number_length = 0;

+    test_data.number = "";

+    test_data.name_length = strlen (name);

+    test_data.name = name;

+    test_data.data_length = strlen (data);

+    test_data.data = data;

+    if (!file) {

+	output = tmpfile();

+    } else {

+	output = fopen (file, "w");

+    }

+    if (output) {

+	state = XauWriteAuth (output, &test_data);

+	fclose (output);

+    }

+    return (state = 1) ? 0 : 1;

+}

diff --git a/libXau/include/X11/Xauth.h b/libXau/include/X11/Xauth.h
index ace975d84..ec8375a35 100644
--- a/libXau/include/X11/Xauth.h
+++ b/libXau/include/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/libXau/man/Xau.man b/libXau/man/Xau.man
index 0688f49ef..12deda077 100644
--- a/libXau/man/Xau.man
+++ b/libXau/man/Xau.man
@@ -1,6 +1,3 @@
-.\" $Xorg: Xau.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $

-.\" $XdotOrg$

-.\"

 .\" Copyright (c) 1994  X Consortium

 .\"

 .\" Permission is hereby granted, free of charge, to any person obtaining a

@@ -26,8 +23,6 @@
 .\" dealing in this Software without prior written authorization from the

 .\" X Consortium.

 .\"

-.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.2 2001/01/27 18:20:19 dawes Exp $

-.\"

 .TH Xau __libmansuffix__ __xorgversion__

 .SH NAME

 Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,

diff --git a/libXext/include/X11/extensions/MITMisc.h b/libXext/include/X11/extensions/MITMisc.h
index 5b9713e09..c6b7fefc1 100644
--- a/libXext/include/X11/extensions/MITMisc.h
+++ b/libXext/include/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/libXext/include/X11/extensions/XEVI.h b/libXext/include/X11/extensions/XEVI.h
index 5fb53c4bb..49132d1de 100644
--- a/libXext/include/X11/extensions/XEVI.h
+++ b/libXext/include/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/libXext/include/X11/extensions/XLbx.h b/libXext/include/X11/extensions/XLbx.h
index 54d9dd93c..94153343a 100644
--- a/libXext/include/X11/extensions/XLbx.h
+++ b/libXext/include/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/libXext/include/X11/extensions/XShm.h b/libXext/include/X11/extensions/XShm.h
index b2d77ba59..daeef3e32 100644
--- a/libXext/include/X11/extensions/XShm.h
+++ b/libXext/include/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/libXext/include/X11/extensions/Xag.h b/libXext/include/X11/extensions/Xag.h
index eb2e2c458..dfc2e7036 100644
--- a/libXext/include/X11/extensions/Xag.h
+++ b/libXext/include/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/libXext/include/X11/extensions/Xcup.h b/libXext/include/X11/extensions/Xcup.h
index 1a909c7af..8d69575b1 100644
--- a/libXext/include/X11/extensions/Xcup.h
+++ b/libXext/include/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/libXext/include/X11/extensions/Xdbe.h b/libXext/include/X11/extensions/Xdbe.h
index 390738d78..5ac72aa82 100644
--- a/libXext/include/X11/extensions/Xdbe.h
+++ b/libXext/include/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/libXext/include/X11/extensions/Xext.h b/libXext/include/X11/extensions/Xext.h
index 92dc423c3..c7c5723e2 100644
--- a/libXext/include/X11/extensions/Xext.h
+++ b/libXext/include/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/libXext/include/X11/extensions/dpms.h b/libXext/include/X11/extensions/dpms.h
index 037c44652..b57007bda 100644
--- a/libXext/include/X11/extensions/dpms.h
+++ b/libXext/include/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/libXext/include/X11/extensions/extutil.h b/libXext/include/X11/extensions/extutil.h
index 825d81e93..dd05a6580 100644
--- a/libXext/include/X11/extensions/extutil.h
+++ b/libXext/include/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/libXext/include/X11/extensions/multibuf.h b/libXext/include/X11/extensions/multibuf.h
index 2b1a8f607..d2f805ee7 100644
--- a/libXext/include/X11/extensions/multibuf.h
+++ b/libXext/include/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/libXext/include/X11/extensions/security.h b/libXext/include/X11/extensions/security.h
index be7a86203..90abc07ee 100644
--- a/libXext/include/X11/extensions/security.h
+++ b/libXext/include/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/libXext/include/X11/extensions/shape.h b/libXext/include/X11/extensions/shape.h
index 7992f7a5a..e2f62d0bc 100644
--- a/libXext/include/X11/extensions/shape.h
+++ b/libXext/include/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/libXext/include/X11/extensions/sync.h b/libXext/include/X11/extensions/sync.h
index 9d8c88545..460bf56ca 100644
--- a/libXext/include/X11/extensions/sync.h
+++ b/libXext/include/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/libXext/include/X11/extensions/xtestext1.h b/libXext/include/X11/extensions/xtestext1.h
index 55dcf7873..d6fae784e 100644
--- a/libXext/include/X11/extensions/xtestext1.h
+++ b/libXext/include/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 */

diff --git a/libXext/man/DBE.man b/libXext/man/DBE.man
index e8263cef3..6199d4917 100644
--- a/libXext/man/DBE.man
+++ b/libXext/man/DBE.man
@@ -1,317 +1,313 @@
-.\" $Xorg: DBE.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/DBE.man,v 3.4 2001/01/27 18:20:19 dawes Exp $
-.\"
-.TH DBE __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-DBE - Double Buffer Extension
-.SH SYNOPSIS
-The Double Buffer Extension (DBE) provides a standard way to utilize
-double-buffering within the framework of the X Window System.
-Double-buffering uses two buffers, called front and back, which hold images.
-The front buffer is visible to the user; the back buffer is not.  Successive
-frames of an animation are rendered into the back buffer while the previously
-rendered frame is displayed in the front buffer.  When a new frame is ready,
-the back and front buffers swap roles, making the new frame visible.  Ideally, 
-this exchange appears to happen instantaneously to the user, with no visual
-artifacts.  Thus, only completely rendered images are presented to the user, 
-and remain visible during the entire time it takes to render a new frame.  The
-result is a flicker-free animation.
-.SH DESCRIPTION
-.B Concepts
-.RS
-Normal windows are created using
-.B XCreateWindow()
-or
-.B XCreateSimpleWindow(),
-which allocate a set of window attributes and, for InputOutput windows, a front
-buffer, into which an image can be drawn.  The contents of this buffer will be 
-displayed when the window is visible.
-
-This extension enables applications to use double-buffering with a window.
-This involves creating a second buffer, called a back buffer, and associating
-one or more back buffer names
-.I (XIDs)
-with the window, for use when referring 
-to (i.e., drawing to or reading from) the window's back buffer.
-The back buffer name is a drawable of type
-.I XdbeBackBuffer.
-
-DBE provides a relative double-buffering model.  One XID, the window,
-always refers to the front buffer.  One or more other XIDs, the back buffer
-names, always refer to the back buffer.  After a buffer swap, the window 
-continues to refer to the (new) front buffer, and the back buffer name
-continues to refer to the (new) back buffer.  Thus, applications and toolkits
-that want to just render to the back buffer always use the back buffer name
-for all drawing requests to the window.  Portions of an application that want
-to render to the front buffer always use the window XID for all drawing 
-requests to the window.
-
-Multiple clients and toolkits can all use double-buffering on the same window.
-DBE does not provide a request for querying whether a window has 
-double-buffering support, and if so, what the back buffer name is.  Given the 
-asynchronous nature of the X Window System, this would cause race
-conditions.  Instead, DBE allows multiple back buffer names to exist for the 
-same window; they all refer to the same physical back buffer.  The first time a 
-back buffer name is allocated for a window, the window becomes
-double-buffered and the back buffer name is associated with the window.
-Subsequently, the window already is a double-buffered window, and nothing
-about the window changes when a new back buffer name is allocated, except
-that the new back buffer name is associated with the window.  The window
-remains double-buffered until either the window is destroyed, or until all of
-the back buffer names for the window are deallocated.
-
-In general, both the front and back buffers ae treated the same.  In 
-particular, here are some important characteristics:
-
-.RS
-Only one buffer per window can be visible at a time (the front buffer).
-
-Both buffers associated with a window have the same visual type, depth,
-width, height, and shape as the window.
-
-Both buffers associated with a window are "visible" (or "obscured") in
-the same way.  When an Expose event is generated for a window, this 
-event is considered to apply to both buffers equally.  When a 
-double-buffered window is exposed, both buffers are tiled with the 
-window background.
-Even though the back buffer is not visible, terms such as obscure apply to the 
-back buffer as well as to the front buffer.
-
-It is acceptable at any time to pass an
-.I XdbeBackBuffer
-in any function that expects a drawable.
-This enables an application to draw directly into
-.I XdbeBackBuffer
-in the same fashion as it would draw into any other drawable.
-
-It is an error (Window) to pass an
-.I XdbeBackBuffer
-in a function that expects a Window.
-
-An
-.I XdbeBackBuffer
-will never be sent in a reply, event, or error where a Window is specified.
-
-If backing-store and save-under applies to a double-buffered
-window, it applies to both buffers equally.
-
-If the
-.B XClearArea()
-or
-.B XClearWindow()
-function is executed on a
-double-buffered window, the same area in both the front and back buffers
-is cleared.
-.RE
-
-The effect of passing a window to a function that accepts a drawable
-is unchanged by this extension.  The window and front buffer are synonymous
-with each other.  This includes obeying the
-.B XGetImage()
-and
-.B XGetSubImage()
-semantics and the subwindow-mode semantics if a graphics context is
-involved.  Regardless of whether the window was explicitly passed in an
-.B XGetImage()
-or
-.B XGetSubImage()
-call, or implicitly referenced (i.e., one of
-the window's ancestors was passed in the function), the front (i.e. visible)
-buffer is always referenced.
-Thus, DBE-naive screen dump clients will always get the front buffer.
-.B XGetImage()
-and
-.B XGetSubImage()
-on a back
-buffer return undefined image contents for any obscured regions of the back
-buffer that fall within the image.
-
-Drawing to a back buffer always uses the clip region that would be used to 
-draw to the front buffer with a GC subwindow-mode of ClipByChildren.  If an 
-ancestor of a double-buffered window is drawn to with a GC having a
-subwindow-mode of IncludeInferiors, the effect on the double-buffered
-window's back buffer depends on the depth of the double-buffered window
-and the ancestor.  If the depths are the same, the contents of the back buffer
-of the double-buffered window are not changed.  If the depths are different,
-the contents of the back buffer of the double-buffered window are undefined 
-for the pixels that the IncludeInferiors drawing touched.
-
-DBE adds no new events.  DBE does not extend the semantics of any existing
-events with the exception of adding a new drawable type called
-.I XdbeBackBuffer.
-
-If events, replies, or errors that contain a drawable
-(e.g., GraphicsExpose) are generated in response to a request, the
-drawable returned will be the one specified in the request.
-
-DBE advertises which visuals support double buffering.
-
-DBE does not include any timing or synchronization facilities.  Applications
-that need such facilities (e.g., to maintain a constant frame rate) should
-investigate the Synchronization Extension, an X Consortium standard.
-.RE
-
-.B Window Management Operations
-
-.RS
-The basic philosophy of DBE is that both buffers are treated the same by
-X window management operations.
-
-When a double-buffered window is destroyed,
-both buffers associated with the window are destroyed, and all back buffer
-names associated with the window are freed.
-
-If the size of a double-buffered window changes, both 
-buffers assume the new size.  If the window's size increases, the effect on the 
-buffers depends on whether the implementation honors bit gravity for buffers.
-If bit gravity is implemented, then the contents of both buffers are moved in 
-accordance with the window's bit gravity,
-and the remaining areas are tiled with the window background.  If 
-bit gravity is not implemented, then the entire unobscured region of both 
-buffers is tiled with the window background.  In either case, Expose events are
-generated for the region that is tiled with the window background.
-
-If the
-.B XGetGeometry()
-function is executed on an
-.I XdbeBackBuffer,
-the returned x, y, and border-width will be zero.
-
-If the Shape extension
-.B ShapeRectangles, ShapeMask, ShapeCombine,
-or
-.B ShapeOffset
-request is executed on a double-buffered window, both 
-buffers are reshaped to match the new window shape.  The region difference
-D = new shape - old shape is tiled with the window background in both 
-buffers, and Expose events are generated for D.
-.RE
-
-.B Complex Swap Actions
-
-.RS
-DBE has no explicit knowledge of ancillary buffers (e.g. depth buffers or 
-alpha buffers), and only has a limited set of defined swap actions.  Some
-applications may need a richer set of swap actions than DBE provides.  Some 
-DBE implementations have knowledge of ancillary buffers, and/or can provide 
-a rich set of swap actions. Instead of continually extending DBE to increase
-its set of swap actions, DBE provides a flexible "idiom" mechanism.  If an 
-applications's needs are served by the defined swap actions, it should use
-them; otherwise, it should use the following method of expressing a complex
-swap action as an idiom.  Following this policy will ensure the best possible
-performance across a wide variety of implementations.
-
-As suggested by the term "idiom," a complex swap action should be expressed 
-as a group/series of requests.  Taken together, this group of requests may be 
-combined into an atomic operation by the implementation, in order to 
-maximize performance.  The set of idioms actually recognized for optimization
-is implementation dependent.  To help with idiom expression and 
-interpretation, an idiom must be surrounded by two function calls:  
-.B XdbeBeginIdiom()
-and
-.B XdbeEndIdiom().
-Unless this begin-end pair
-surrounds the idiom, it may not be recognized by a given implementation, and 
-performance will suffer.
-
-For example, if an application wants to swap buffers for two windows, and use
-X to clear only certain planes of the back buffers, the application would
-make the following calls as a group, and in the following order:
-
-.RS
-.B XdbeBeginIdiom().
-
-.B XdbeSwapBuffers()
-with XIDs for two windows, each of which uses a swap action of Untouched.
-
-.B XFillRectangle()
-to the back buffer of one window.
-
-.B XFillRectangle()
-to the back buffer of the other window.
-
-.B XdbeEndIdiom().
-.RE
-
-The
-.B XdbeBeginIdiom()
-and
-.B XdbeEndIdiom()
-functions do not perform any
-actions themselves.  They are treated as markers by implementations that can 
-combine certain groups/series of requests as idioms, and are ignored by other
-implementations or for non-recognized groups/series of requests.  If these
-function calls are made out of order, or are mismatched, no errors are sent,
-and the functions are executed as usual, though performance may suffer.
-
-.B XdbeSwapBuffers()
-need not be included in an idiom.  For
-example, if a swap action of Copied is desired, but only some of the planes
-should be copied,
-.B XCopyArea()
-may be used instead of 
-.B XdbeSwapBuffers().
-If
-.B XdbeSwapBuffers()
-is included in an idiom, it should immediately follow the
-.B XdbeBeginIdiom()
-call.  Also, when the 
-.B XdbeSwapBuffers()
-is included in an idiom, that request's swap action will 
-still be valid, and if the swap action might overlap with another request, then 
-the final result of the idiom must be as if the separate requests were executed
-serially.  For example, if the specified swap action is Untouched, and if a 
-.B XFillRectangle()
-using a client clip rectangle is done to the window's back
-buffer after the
-.B XdbeSwapBuffers()
-call, then the contents of the new 
-back buffer (after the idiom) will be the same as if the idiom was not
-recognized by the implementation.
-
-It is highly recommended that API providers define, and application 
-developers use, "convenience" functions that allow client applications to call
-one procedure that encapsulates common idioms.  These functions will
-generate the
-.B XdbeBeginIdiom(),
-idiom, and 
-.B XdbeEndIdiom()
-calls.  Usage of these functions will ensure best possible
-performance across a wide variety of implementations.
-.SH SEE ALSO
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH DBE __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+DBE - Double Buffer Extension

+.SH SYNOPSIS

+The Double Buffer Extension (DBE) provides a standard way to utilize

+double-buffering within the framework of the X Window System.

+Double-buffering uses two buffers, called front and back, which hold images.

+The front buffer is visible to the user; the back buffer is not.  Successive

+frames of an animation are rendered into the back buffer while the previously

+rendered frame is displayed in the front buffer.  When a new frame is ready,

+the back and front buffers swap roles, making the new frame visible.  Ideally, 

+this exchange appears to happen instantaneously to the user, with no visual

+artifacts.  Thus, only completely rendered images are presented to the user, 

+and remain visible during the entire time it takes to render a new frame.  The

+result is a flicker-free animation.

+.SH DESCRIPTION

+.B Concepts

+.RS

+Normal windows are created using

+.B XCreateWindow()

+or

+.B XCreateSimpleWindow(),

+which allocate a set of window attributes and, for InputOutput windows, a front

+buffer, into which an image can be drawn.  The contents of this buffer will be 

+displayed when the window is visible.

+

+This extension enables applications to use double-buffering with a window.

+This involves creating a second buffer, called a back buffer, and associating

+one or more back buffer names

+.I (XIDs)

+with the window, for use when referring 

+to (i.e., drawing to or reading from) the window's back buffer.

+The back buffer name is a drawable of type

+.I XdbeBackBuffer.

+

+DBE provides a relative double-buffering model.  One XID, the window,

+always refers to the front buffer.  One or more other XIDs, the back buffer

+names, always refer to the back buffer.  After a buffer swap, the window 

+continues to refer to the (new) front buffer, and the back buffer name

+continues to refer to the (new) back buffer.  Thus, applications and toolkits

+that want to just render to the back buffer always use the back buffer name

+for all drawing requests to the window.  Portions of an application that want

+to render to the front buffer always use the window XID for all drawing 

+requests to the window.

+

+Multiple clients and toolkits can all use double-buffering on the same window.

+DBE does not provide a request for querying whether a window has 

+double-buffering support, and if so, what the back buffer name is.  Given the 

+asynchronous nature of the X Window System, this would cause race

+conditions.  Instead, DBE allows multiple back buffer names to exist for the 

+same window; they all refer to the same physical back buffer.  The first time a 

+back buffer name is allocated for a window, the window becomes

+double-buffered and the back buffer name is associated with the window.

+Subsequently, the window already is a double-buffered window, and nothing

+about the window changes when a new back buffer name is allocated, except

+that the new back buffer name is associated with the window.  The window

+remains double-buffered until either the window is destroyed, or until all of

+the back buffer names for the window are deallocated.

+

+In general, both the front and back buffers ae treated the same.  In 

+particular, here are some important characteristics:

+

+.RS

+Only one buffer per window can be visible at a time (the front buffer).

+

+Both buffers associated with a window have the same visual type, depth,

+width, height, and shape as the window.

+

+Both buffers associated with a window are "visible" (or "obscured") in

+the same way.  When an Expose event is generated for a window, this 

+event is considered to apply to both buffers equally.  When a 

+double-buffered window is exposed, both buffers are tiled with the 

+window background.

+Even though the back buffer is not visible, terms such as obscure apply to the 

+back buffer as well as to the front buffer.

+

+It is acceptable at any time to pass an

+.I XdbeBackBuffer

+in any function that expects a drawable.

+This enables an application to draw directly into

+.I XdbeBackBuffer

+in the same fashion as it would draw into any other drawable.

+

+It is an error (Window) to pass an

+.I XdbeBackBuffer

+in a function that expects a Window.

+

+An

+.I XdbeBackBuffer

+will never be sent in a reply, event, or error where a Window is specified.

+

+If backing-store and save-under applies to a double-buffered

+window, it applies to both buffers equally.

+

+If the

+.B XClearArea()

+or

+.B XClearWindow()

+function is executed on a

+double-buffered window, the same area in both the front and back buffers

+is cleared.

+.RE

+

+The effect of passing a window to a function that accepts a drawable

+is unchanged by this extension.  The window and front buffer are synonymous

+with each other.  This includes obeying the

+.B XGetImage()

+and

+.B XGetSubImage()

+semantics and the subwindow-mode semantics if a graphics context is

+involved.  Regardless of whether the window was explicitly passed in an

+.B XGetImage()

+or

+.B XGetSubImage()

+call, or implicitly referenced (i.e., one of

+the window's ancestors was passed in the function), the front (i.e. visible)

+buffer is always referenced.

+Thus, DBE-naive screen dump clients will always get the front buffer.

+.B XGetImage()

+and

+.B XGetSubImage()

+on a back

+buffer return undefined image contents for any obscured regions of the back

+buffer that fall within the image.

+

+Drawing to a back buffer always uses the clip region that would be used to 

+draw to the front buffer with a GC subwindow-mode of ClipByChildren.  If an 

+ancestor of a double-buffered window is drawn to with a GC having a

+subwindow-mode of IncludeInferiors, the effect on the double-buffered

+window's back buffer depends on the depth of the double-buffered window

+and the ancestor.  If the depths are the same, the contents of the back buffer

+of the double-buffered window are not changed.  If the depths are different,

+the contents of the back buffer of the double-buffered window are undefined 

+for the pixels that the IncludeInferiors drawing touched.

+

+DBE adds no new events.  DBE does not extend the semantics of any existing

+events with the exception of adding a new drawable type called

+.I XdbeBackBuffer.

+

+If events, replies, or errors that contain a drawable

+(e.g., GraphicsExpose) are generated in response to a request, the

+drawable returned will be the one specified in the request.

+

+DBE advertises which visuals support double buffering.

+

+DBE does not include any timing or synchronization facilities.  Applications

+that need such facilities (e.g., to maintain a constant frame rate) should

+investigate the Synchronization Extension, an X Consortium standard.

+.RE

+

+.B Window Management Operations

+

+.RS

+The basic philosophy of DBE is that both buffers are treated the same by

+X window management operations.

+

+When a double-buffered window is destroyed,

+both buffers associated with the window are destroyed, and all back buffer

+names associated with the window are freed.

+

+If the size of a double-buffered window changes, both 

+buffers assume the new size.  If the window's size increases, the effect on the 

+buffers depends on whether the implementation honors bit gravity for buffers.

+If bit gravity is implemented, then the contents of both buffers are moved in 

+accordance with the window's bit gravity,

+and the remaining areas are tiled with the window background.  If 

+bit gravity is not implemented, then the entire unobscured region of both 

+buffers is tiled with the window background.  In either case, Expose events are

+generated for the region that is tiled with the window background.

+

+If the

+.B XGetGeometry()

+function is executed on an

+.I XdbeBackBuffer,

+the returned x, y, and border-width will be zero.

+

+If the Shape extension

+.B ShapeRectangles, ShapeMask, ShapeCombine,

+or

+.B ShapeOffset

+request is executed on a double-buffered window, both 

+buffers are reshaped to match the new window shape.  The region difference

+D = new shape - old shape is tiled with the window background in both 

+buffers, and Expose events are generated for D.

+.RE

+

+.B Complex Swap Actions

+

+.RS

+DBE has no explicit knowledge of ancillary buffers (e.g. depth buffers or 

+alpha buffers), and only has a limited set of defined swap actions.  Some

+applications may need a richer set of swap actions than DBE provides.  Some 

+DBE implementations have knowledge of ancillary buffers, and/or can provide 

+a rich set of swap actions. Instead of continually extending DBE to increase

+its set of swap actions, DBE provides a flexible "idiom" mechanism.  If an 

+applications's needs are served by the defined swap actions, it should use

+them; otherwise, it should use the following method of expressing a complex

+swap action as an idiom.  Following this policy will ensure the best possible

+performance across a wide variety of implementations.

+

+As suggested by the term "idiom," a complex swap action should be expressed 

+as a group/series of requests.  Taken together, this group of requests may be 

+combined into an atomic operation by the implementation, in order to 

+maximize performance.  The set of idioms actually recognized for optimization

+is implementation dependent.  To help with idiom expression and 

+interpretation, an idiom must be surrounded by two function calls:  

+.B XdbeBeginIdiom()

+and

+.B XdbeEndIdiom().

+Unless this begin-end pair

+surrounds the idiom, it may not be recognized by a given implementation, and 

+performance will suffer.

+

+For example, if an application wants to swap buffers for two windows, and use

+X to clear only certain planes of the back buffers, the application would

+make the following calls as a group, and in the following order:

+

+.RS

+.B XdbeBeginIdiom().

+

+.B XdbeSwapBuffers()

+with XIDs for two windows, each of which uses a swap action of Untouched.

+

+.B XFillRectangle()

+to the back buffer of one window.

+

+.B XFillRectangle()

+to the back buffer of the other window.

+

+.B XdbeEndIdiom().

+.RE

+

+The

+.B XdbeBeginIdiom()

+and

+.B XdbeEndIdiom()

+functions do not perform any

+actions themselves.  They are treated as markers by implementations that can 

+combine certain groups/series of requests as idioms, and are ignored by other

+implementations or for non-recognized groups/series of requests.  If these

+function calls are made out of order, or are mismatched, no errors are sent,

+and the functions are executed as usual, though performance may suffer.

+

+.B XdbeSwapBuffers()

+need not be included in an idiom.  For

+example, if a swap action of Copied is desired, but only some of the planes

+should be copied,

+.B XCopyArea()

+may be used instead of 

+.B XdbeSwapBuffers().

+If

+.B XdbeSwapBuffers()

+is included in an idiom, it should immediately follow the

+.B XdbeBeginIdiom()

+call.  Also, when the 

+.B XdbeSwapBuffers()

+is included in an idiom, that request's swap action will 

+still be valid, and if the swap action might overlap with another request, then 

+the final result of the idiom must be as if the separate requests were executed

+serially.  For example, if the specified swap action is Untouched, and if a 

+.B XFillRectangle()

+using a client clip rectangle is done to the window's back

+buffer after the

+.B XdbeSwapBuffers()

+call, then the contents of the new 

+back buffer (after the idiom) will be the same as if the idiom was not

+recognized by the implementation.

+

+It is highly recommended that API providers define, and application 

+developers use, "convenience" functions that allow client applications to call

+one procedure that encapsulates common idioms.  These functions will

+generate the

+.B XdbeBeginIdiom(),

+idiom, and 

+.B XdbeEndIdiom()

+calls.  Usage of these functions will ensure best possible

+performance across a wide variety of implementations.

+.SH SEE ALSO

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/DPMSCapable.man b/libXext/man/DPMSCapable.man
index 27aa2bbcf..b2563b9b0 100644
--- a/libXext/man/DPMSCapable.man
+++ b/libXext/man/DPMSCapable.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

@@ -31,8 +29,6 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 .\" DEALINGS IN THE SOFTWARE.

 .\"

-.\" X Window System is a trademark of The Open Group.

-.\" 

 .TH DPMSCapable __libmansuffix__ __xorgversion__ "X FUNCTIONS"

 .SH NAME

 DPMSCapable \- returns the DPMS capability of the X server

diff --git a/libXext/man/DPMSDisable.man b/libXext/man/DPMSDisable.man
index 1af004b70..be0a7ed81 100644
--- a/libXext/man/DPMSDisable.man
+++ b/libXext/man/DPMSDisable.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

@@ -31,8 +29,6 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 .\" DEALINGS IN THE SOFTWARE.

 .\"

-.\" X Window System is a trademark of The Open Group.

-.\" 

 .TH DPMSDisable __libmansuffix__ __xorgversion__ "X FUNCTIONS"

 .SH NAME

 DPMSDisable \- disables DPMS on the specified display

diff --git a/libXext/man/DPMSEnable.man b/libXext/man/DPMSEnable.man
index 6483f71c6..ec4d9edf2 100644
--- a/libXext/man/DPMSEnable.man
+++ b/libXext/man/DPMSEnable.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/DPMSForceLevel.man b/libXext/man/DPMSForceLevel.man
index 2c0c95b36..293218857 100644
--- a/libXext/man/DPMSForceLevel.man
+++ b/libXext/man/DPMSForceLevel.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/DPMSGetTimeouts.man b/libXext/man/DPMSGetTimeouts.man
index e21df1136..7f225238f 100644
--- a/libXext/man/DPMSGetTimeouts.man
+++ b/libXext/man/DPMSGetTimeouts.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/DPMSGetVersion.man b/libXext/man/DPMSGetVersion.man
index 5183892a8..ef4a9b05c 100644
--- a/libXext/man/DPMSGetVersion.man
+++ b/libXext/man/DPMSGetVersion.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/DPMSInfo.man b/libXext/man/DPMSInfo.man
index daa3d0957..c0d780559 100644
--- a/libXext/man/DPMSInfo.man
+++ b/libXext/man/DPMSInfo.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/DPMSQueryExtension.man b/libXext/man/DPMSQueryExtension.man
index 08cbf7228..815f18a3e 100644
--- a/libXext/man/DPMSQueryExtension.man
+++ b/libXext/man/DPMSQueryExtension.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/DPMSSetTimeouts.man b/libXext/man/DPMSSetTimeouts.man
index 7b8935127..53606cfec 100644
--- a/libXext/man/DPMSSetTimeouts.man
+++ b/libXext/man/DPMSSetTimeouts.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co Digital Equipment Corporation, 1996

 .\" 

 .\" Permission to use, copy, modify, distribute, and sell this

diff --git a/libXext/man/XShape.man b/libXext/man/XShape.man
index 0f16ce93c..e40369143 100644
--- a/libXext/man/XShape.man
+++ b/libXext/man/XShape.man
@@ -1,179 +1,174 @@
-.\" $Xorg: XShape.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $
-.\"
-.\" Copyright (c) 1989, 1994  X Consortium
-.\" 
-.\" 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 furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM 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 X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.\"
-.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
-.\" $XdotOrg$
-.\"
-.de ZN
-.ie t \fB\^\\$1\^\fR\\$2
-.el \fI\^\\$1\^\fP\\$2
-..
-.TH XSHAPE __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XShapeQueryExtension, XShapeQueryVersion, XShapeCombineRegion, XShapeCombineRectangles, XShapeCombineMask, XShapeCombineShape, XShapeOffsetShape, XShapeQueryExtents, XShapeSelectInput, XShapeInputSelected, XShapeGetRectangles \- X nonrectangular shape functions
-.SH SYNTAX
-.nf
-.LP
-\&#include <X11/extensions/shape.h>
-.LP
-Bool XShapeQueryExtension (
-	Display *dpy, 
-	int *event_basep, 
-	int *error_basep);
-.LP
-Status XShapeQueryVersion (
-	Display *dpy, 
-	int *major_versionp, 
-	int *minor_versionp);
-.LP
-void XShapeCombineRegion (
-	Display *dpy, 
-	Window dest, 
-	int destKind, 
-	int xOff, 
-	int yOff, 
-	struct _XRegion *r, 
-	int op);
-.LP
-void XShapeCombineRectangles (
-	Display *dpy, 
-	XID dest, 
-	int destKind, 
-	int xOff, 
-	int yOff, 
-	XRectangle *rects, 
-	int n_rects, 
-	int op, 
-	int ordering);
-.LP
-void XShapeCombineMask (
-	Display *dpy, 
-	XID dest, 
-	int destKind, 
-	int xOff, 
-	int yOff, 
-	Pixmap src, 
-	int op);
-.LP
-void XShapeCombineShape (
-	Display *dpy, 
-	XID dest, 
-	int destKind, 
-	int xOff, 
-	int yOff, 
-	Pixmap src, 
-	int srcKind, 
-	int op);
-.LP
-void XShapeOffsetShape (
-	Display *dpy, 
-	XID dest, 
-	int destKind, 
-	int xOff, 
-	int yOff);
-.LP
-Status XShapeQueryExtents (
-	Display *dpy, 
-	Window window, 
-	int *bShaped, 
-	int *xbs, 
-	int *ybs, 
-	unsigned int *wbs, 
-	unsigned int *hbs, 
-	int *cShaped, 
-	int *xcs, 
-	int *ycs, 
-	unsigned int *wcs, 
-	unsigned int *hcs);
-.LP
-void XShapeSelectInput (
-	Display *dpy, 
-	Window window, 
-	unsigned longmask);
-.LP
-unsigned long XShapeInputSelected (
-	Display *dpy, 
-	Window window);
-.LP
-XRectangle *XShapeGetRectangles (
-	Display *dpy, 
-	Window window, 
-	int kind, 
-	int *count, 
-	int *ordering);
-.fi
-.SH STRUCTURES
-.nf
-.LP
-.ta 3i
-typedef struct {
-    int type;	/\&* of event */
-    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 */
-    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;
-.fi
-.SH DESCRIPTION
-The \fIX11 Nonrectangular Window Shape Extension\fP adds nonrectangular
-windows to the X Window System.
-.SH PREDEFINED VALUES
-Operations:
-.in +.5i
-.nf
-.ZN ShapeSet
-.ZN ShapeUnion
-.ZN ShapeIntersect
-.ZN ShapeSubtract
-.ZN ShapeInvert
-.in -.5i
-.fi
-.sp
-Shape Kinds:
-.in +.5i
-.nf
-.ZN ShapeBounding
-.ZN ShapeClip
-.in -.5i
-.fi
-.sp
-Event defines:
-.in +.5i
-.nf
-.ZN ShapeNotifyMask
-.ZN ShapeNotify
-.in -.5i
-.fi
-.SH BUGS
-This manual pages needs a lot more work.
-.SH SEE ALSO
-\fIX11 Nonrectangular Window Shape Extension\fP
+.\" Copyright (c) 1989, 1994  X Consortium

+.\" 

+.\" 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 furnished to do so, subject to the following conditions:

+.\" 

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

+.\" all copies or substantial portions of the Software.

+.\" 

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

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

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

+.\" THE X CONSORTIUM 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 X Consortium shall not 

+.\" be used in advertising or otherwise to promote the sale, use or other 

+.\" dealing in this Software without prior written authorization from the 

+.\" X Consortium.

+.\"

+.de ZN

+.ie t \fB\^\\$1\^\fR\\$2

+.el \fI\^\\$1\^\fP\\$2

+..

+.TH XSHAPE __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XShapeQueryExtension, XShapeQueryVersion, XShapeCombineRegion, XShapeCombineRectangles, XShapeCombineMask, XShapeCombineShape, XShapeOffsetShape, XShapeQueryExtents, XShapeSelectInput, XShapeInputSelected, XShapeGetRectangles \- X nonrectangular shape functions

+.SH SYNTAX

+.nf

+.LP

+\&#include <X11/extensions/shape.h>

+.LP

+Bool XShapeQueryExtension (

+	Display *dpy, 

+	int *event_basep, 

+	int *error_basep);

+.LP

+Status XShapeQueryVersion (

+	Display *dpy, 

+	int *major_versionp, 

+	int *minor_versionp);

+.LP

+void XShapeCombineRegion (

+	Display *dpy, 

+	Window dest, 

+	int destKind, 

+	int xOff, 

+	int yOff, 

+	struct _XRegion *r, 

+	int op);

+.LP

+void XShapeCombineRectangles (

+	Display *dpy, 

+	XID dest, 

+	int destKind, 

+	int xOff, 

+	int yOff, 

+	XRectangle *rects, 

+	int n_rects, 

+	int op, 

+	int ordering);

+.LP

+void XShapeCombineMask (

+	Display *dpy, 

+	XID dest, 

+	int destKind, 

+	int xOff, 

+	int yOff, 

+	Pixmap src, 

+	int op);

+.LP

+void XShapeCombineShape (

+	Display *dpy, 

+	XID dest, 

+	int destKind, 

+	int xOff, 

+	int yOff, 

+	Pixmap src, 

+	int srcKind, 

+	int op);

+.LP

+void XShapeOffsetShape (

+	Display *dpy, 

+	XID dest, 

+	int destKind, 

+	int xOff, 

+	int yOff);

+.LP

+Status XShapeQueryExtents (

+	Display *dpy, 

+	Window window, 

+	int *bShaped, 

+	int *xbs, 

+	int *ybs, 

+	unsigned int *wbs, 

+	unsigned int *hbs, 

+	int *cShaped, 

+	int *xcs, 

+	int *ycs, 

+	unsigned int *wcs, 

+	unsigned int *hcs);

+.LP

+void XShapeSelectInput (

+	Display *dpy, 

+	Window window, 

+	unsigned longmask);

+.LP

+unsigned long XShapeInputSelected (

+	Display *dpy, 

+	Window window);

+.LP

+XRectangle *XShapeGetRectangles (

+	Display *dpy, 

+	Window window, 

+	int kind, 

+	int *count, 

+	int *ordering);

+.fi

+.SH STRUCTURES

+.nf

+.LP

+.ta 3i

+typedef struct {

+    int type;	/\&* of event */

+    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 */

+    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;

+.fi

+.SH DESCRIPTION

+The \fIX11 Nonrectangular Window Shape Extension\fP adds nonrectangular

+windows to the X Window System.

+.SH PREDEFINED VALUES

+Operations:

+.in +.5i

+.nf

+.ZN ShapeSet

+.ZN ShapeUnion

+.ZN ShapeIntersect

+.ZN ShapeSubtract

+.ZN ShapeInvert

+.in -.5i

+.fi

+.sp

+Shape Kinds:

+.in +.5i

+.nf

+.ZN ShapeBounding

+.ZN ShapeClip

+.in -.5i

+.fi

+.sp

+Event defines:

+.in +.5i

+.nf

+.ZN ShapeNotifyMask

+.ZN ShapeNotify

+.in -.5i

+.fi

+.SH BUGS

+This manual pages needs a lot more work.

+.SH SEE ALSO

+\fIX11 Nonrectangular Window Shape Extension\fP

diff --git a/libXext/man/XcupGetReservedColormapEntries.man b/libXext/man/XcupGetReservedColormapEntries.man
index 395be929d..acd834a4b 100644
--- a/libXext/man/XcupGetReservedColormapEntries.man
+++ b/libXext/man/XcupGetReservedColormapEntries.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

 .\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

 .\"

diff --git a/libXext/man/XcupQueryVersion.man b/libXext/man/XcupQueryVersion.man
index e5f55c632..43141fc56 100644
--- a/libXext/man/XcupQueryVersion.man
+++ b/libXext/man/XcupQueryVersion.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

 .\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

 .\"

diff --git a/libXext/man/XcupStoreColors.man b/libXext/man/XcupStoreColors.man
index 2c1764787..e08b4be67 100644
--- a/libXext/man/XcupStoreColors.man
+++ b/libXext/man/XcupStoreColors.man
@@ -1,5 +1,3 @@
-.\" $XdotOrg: $

-.\" 

 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

 .\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

 .\"

diff --git a/libXext/man/XdbeAllocateBackBufferName.man b/libXext/man/XdbeAllocateBackBufferName.man
index adb9afe02..720491eaa 100644
--- a/libXext/man/XdbeAllocateBackBufferName.man
+++ b/libXext/man/XdbeAllocateBackBufferName.man
@@ -1,71 +1,67 @@
-.\" $Xorg: XdbeAllo.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeAllo.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH XdbeAllocateBackBufferName __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeAllocateBackBufferName - allocates a DBE buffer.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-XdbeBackBuffer XdbeAllocateBackBufferName(
-    Display        *dpy,
-    Window         window, 
-    XdbeSwapAction swap_action)
-.SH DESCRIPTION
-This function returns a drawable ID used to refer to the back buffer of the 
-specified window.  The swap_action is a hint to indicate the swap action that 
-will likely be used in subsequent calls to
-.B XdbeSwapBuffers().
-The actual swap
-action used in calls to
-.B XdbeSwapBuffers()
-does not have to be the same as the 
-swap_action passed to this function, though clients are encouraged to provide
-accurate information whenever possible.
-.SH ERRORS
-.IP BadAlloc
-.IP BadIDChoice
-.IP BadMatch
-The specified window is not an InputOutput window or its visual does not
-support DBE.
-.IP BadValue
-An invalid swap action was specified.
-.IP BadWindow
-An invalid window was specified.
-.SH SEE ALSO
-DBE,
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeAllocateBackBufferName __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeAllocateBackBufferName - allocates a DBE buffer.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+XdbeBackBuffer XdbeAllocateBackBufferName(

+    Display        *dpy,

+    Window         window, 

+    XdbeSwapAction swap_action)

+.SH DESCRIPTION

+This function returns a drawable ID used to refer to the back buffer of the 

+specified window.  The swap_action is a hint to indicate the swap action that 

+will likely be used in subsequent calls to

+.B XdbeSwapBuffers().

+The actual swap

+action used in calls to

+.B XdbeSwapBuffers()

+does not have to be the same as the 

+swap_action passed to this function, though clients are encouraged to provide

+accurate information whenever possible.

+.SH ERRORS

+.IP BadAlloc

+.IP BadIDChoice

+.IP BadMatch

+The specified window is not an InputOutput window or its visual does not

+support DBE.

+.IP BadValue

+An invalid swap action was specified.

+.IP BadWindow

+An invalid window was specified.

+.SH SEE ALSO

+DBE,

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeBeginIdiom.man b/libXext/man/XdbeBeginIdiom.man
index 0f1aebfe2..c58e7666c 100644
--- a/libXext/man/XdbeBeginIdiom.man
+++ b/libXext/man/XdbeBeginIdiom.man
@@ -1,50 +1,46 @@
-.\" $Xorg: XdbeBegi.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH DBE __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeBeginIdiom - marks the beginning of a DBE idiom sequence.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-Status XdbeBeginIdiom(
-    Display *dpy)
-.SH DESCRIPTION
-This function marks the beginning of an idiom sequence.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH DBE __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeBeginIdiom - marks the beginning of a DBE idiom sequence.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+Status XdbeBeginIdiom(

+    Display *dpy)

+.SH DESCRIPTION

+This function marks the beginning of an idiom sequence.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeDeallocateBackBufferName.man b/libXext/man/XdbeDeallocateBackBufferName.man
index 3350be141..0cd2b0291 100644
--- a/libXext/man/XdbeDeallocateBackBufferName.man
+++ b/libXext/man/XdbeDeallocateBackBufferName.man
@@ -1,57 +1,53 @@
-.\" $Xorg: XdbeDeal.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeDeal.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH XdbeDeallocateBackBufferName __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeDeallocateBackBufferName - frees a DBE buffer.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-Status XdbeDeallocateBackBufferName(
-    Display        *dpy,
-    XdbeBackBuffer buffer)
-.SH DESCRIPTION
-This function frees a drawable ID, buffer, that was obtained via
-.B XdbeAllocateBackBufferName().
-The buffer must be a valid name for the back
-buffer of a window, or a protocol error results.
-.SH ERRORS
-.IP BadBuffer
-The specified buffer is not associated with a window.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeDeallocateBackBufferName __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeDeallocateBackBufferName - frees a DBE buffer.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+Status XdbeDeallocateBackBufferName(

+    Display        *dpy,

+    XdbeBackBuffer buffer)

+.SH DESCRIPTION

+This function frees a drawable ID, buffer, that was obtained via

+.B XdbeAllocateBackBufferName().

+The buffer must be a valid name for the back

+buffer of a window, or a protocol error results.

+.SH ERRORS

+.IP BadBuffer

+The specified buffer is not associated with a window.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeEndIdiom.man b/libXext/man/XdbeEndIdiom.man
index 0b6aadcf0..ac651f5fe 100644
--- a/libXext/man/XdbeEndIdiom.man
+++ b/libXext/man/XdbeEndIdiom.man
@@ -1,50 +1,46 @@
-.\" $Xorg: XdbeEndI.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeEndI.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH XdbeEndIdiom __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeEndIdiom - marks the end of a DBE idiom sequence.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-Status XdbeEndIdiom(
-    Display *dpy)
-.SH DESCRIPTION
-This function marks the end of an idiom sequence.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeEndIdiom __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeEndIdiom - marks the end of a DBE idiom sequence.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+Status XdbeEndIdiom(

+    Display *dpy)

+.SH DESCRIPTION

+This function marks the end of an idiom sequence.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeFreeVisualInfo.man b/libXext/man/XdbeFreeVisualInfo.man
index f8a37e29c..36a6effab 100644
--- a/libXext/man/XdbeFreeVisualInfo.man
+++ b/libXext/man/XdbeFreeVisualInfo.man
@@ -1,52 +1,48 @@
-.\" $Xorg: XdbeFree.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeFree.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH XdbeFreeVisualInfo __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeFreeVisualInfo - frees information returned by
-.B XdbeGetVisualInfo().
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-void XdbeFreeVisualInfo(
-    XdbeScreenVisualInfo *visual_info)
-.SH DESCRIPTION
-This function frees the list of XdbeScreenVisualInfo returned by the function
-.B XdbeGetVisualInfo().
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeFreeVisualInfo __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeFreeVisualInfo - frees information returned by

+.B XdbeGetVisualInfo().

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+void XdbeFreeVisualInfo(

+    XdbeScreenVisualInfo *visual_info)

+.SH DESCRIPTION

+This function frees the list of XdbeScreenVisualInfo returned by the function

+.B XdbeGetVisualInfo().

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeGetBackBufferAttributes.man b/libXext/man/XdbeGetBackBufferAttributes.man
index 3880bae49..c51c0de22 100644
--- a/libXext/man/XdbeGetBackBufferAttributes.man
+++ b/libXext/man/XdbeGetBackBufferAttributes.man
@@ -1,69 +1,65 @@
-.\" $Xorg: XdbeGetB.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetB.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH XdbeGetBackBufferAttributes __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeGetBackBufferAttributes - returns attributes of a DBE buffer.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
-    Display        *dpy,
-    XdbeBackBuffer buffer)
-.SH DESCRIPTION
-This function returns the attributes associated with the specified buffer.
-
-The
-.I XdbeBackBufferAttributes
-structure has the following fields:
-
-.RS
-Window     window     window that buffer belongs to
-.RE
-    
-If buffer is not a valid
-.I XdbeBackBuffer,
-window returns None.
-
-The returned
-.I XdbeBackBufferAttributes
-structure can be freed with the 
-Xlib function
-.B Xfree().
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeGetBackBufferAttributes __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeGetBackBufferAttributes - returns attributes of a DBE buffer.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(

+    Display        *dpy,

+    XdbeBackBuffer buffer)

+.SH DESCRIPTION

+This function returns the attributes associated with the specified buffer.

+

+The

+.I XdbeBackBufferAttributes

+structure has the following fields:

+

+.RS

+Window     window     window that buffer belongs to

+.RE

+    

+If buffer is not a valid

+.I XdbeBackBuffer,

+window returns None.

+

+The returned

+.I XdbeBackBufferAttributes

+structure can be freed with the 

+Xlib function

+.B Xfree().

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeGetVisualInfo.man b/libXext/man/XdbeGetVisualInfo.man
index 45ef7e884..338805caa 100644
--- a/libXext/man/XdbeGetVisualInfo.man
+++ b/libXext/man/XdbeGetVisualInfo.man
@@ -1,129 +1,125 @@
-.\" $Xorg: XdbeGetV.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetV.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
-.\"
-.TH XdbeGetVisualInfo __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeGetVisualInfo - Get dbe Visual Informations
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-XdbeScreenVisualInfo *XdbeGetVisualInfo(
-    Display  *dpy,
-    Drawable *screen_specifiers,
-    int      *num_screens)
-.SH DESCRIPTION
-This function returns information about which visuals support double
-buffering.  The argument
-.I num_screens
-specifies how many elements there are 
-in the
-.I screen_specifiers
-list.  Each drawable in
-.I screen_specifiers
-designates a 
-screen for which the supported visuals are being requested.  If
-.I num_screens
-is zero, information for all screens is requested.  In this case, upon return
-from this function,
-.I num_screens
-will be set to the number of screens that were
-found.  If an error occurs, this function returns NULL, else it returns a
-pointer to a list of
-.I XdbeScreenVisualInfo
-structures of length
-.I num_screens.
-The nth
-element in the returned list corresponds to the nth drawable in the 
-.I screen_specifiers
-list, unless
-.I num_screens
-was passed in with the value zero,
-in which case the nth element in the returned list corresponds to the nth screen
-of the server, starting with screen zero.  The
-.I XdbeScreenVisualInfo
-structure has the following fields:
-
-     int            count
-     XdbeVisualInfo *visinfo
-
-.I count
-specifies the number of items in
-.I visinfo.
-.I visinfo
-specifies a list of visuals, depths, and performance hints for this screen.
-
-The
-.I XdbeVisualInfo
-structure has the following fields:
-
-     VisualID visual
-     int      depth
-     int      perflevel
-
-.I visual
-specifies one visual ID that supports double-buffering.
-.I depth
-specifies the depth of the visual.
-.I perflevel
-is a performance hint.
-
-The only operation defined on a
-.I perflevel
-is comparison to a
-.I perflevel
-of another visual on the same screen.  The visual having the higher
-.I perflevel
-is likely to have better double-buffering graphics performance than the visual
-having the lower
-.I perflevel.
-Nothing can be deduced from the following: the magnitude of the difference
-of two
-.I perflevels,
-a
-.I perflevel
-value in isolation, or comparing
-.I perflevels
-from different servers.
-
-.SH ERRORS
-.IP BadDrawable
-One or more values passed in
-.I screen_specifiers
-is not a valid drawable.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeQueryExtension(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeGetVisualInfo __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeGetVisualInfo - Get dbe Visual Informations

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+XdbeScreenVisualInfo *XdbeGetVisualInfo(

+    Display  *dpy,

+    Drawable *screen_specifiers,

+    int      *num_screens)

+.SH DESCRIPTION

+This function returns information about which visuals support double

+buffering.  The argument

+.I num_screens

+specifies how many elements there are 

+in the

+.I screen_specifiers

+list.  Each drawable in

+.I screen_specifiers

+designates a 

+screen for which the supported visuals are being requested.  If

+.I num_screens

+is zero, information for all screens is requested.  In this case, upon return

+from this function,

+.I num_screens

+will be set to the number of screens that were

+found.  If an error occurs, this function returns NULL, else it returns a

+pointer to a list of

+.I XdbeScreenVisualInfo

+structures of length

+.I num_screens.

+The nth

+element in the returned list corresponds to the nth drawable in the 

+.I screen_specifiers

+list, unless

+.I num_screens

+was passed in with the value zero,

+in which case the nth element in the returned list corresponds to the nth screen

+of the server, starting with screen zero.  The

+.I XdbeScreenVisualInfo

+structure has the following fields:

+

+     int            count

+     XdbeVisualInfo *visinfo

+

+.I count

+specifies the number of items in

+.I visinfo.

+.I visinfo

+specifies a list of visuals, depths, and performance hints for this screen.

+

+The

+.I XdbeVisualInfo

+structure has the following fields:

+

+     VisualID visual

+     int      depth

+     int      perflevel

+

+.I visual

+specifies one visual ID that supports double-buffering.

+.I depth

+specifies the depth of the visual.

+.I perflevel

+is a performance hint.

+

+The only operation defined on a

+.I perflevel

+is comparison to a

+.I perflevel

+of another visual on the same screen.  The visual having the higher

+.I perflevel

+is likely to have better double-buffering graphics performance than the visual

+having the lower

+.I perflevel.

+Nothing can be deduced from the following: the magnitude of the difference

+of two

+.I perflevels,

+a

+.I perflevel

+value in isolation, or comparing

+.I perflevels

+from different servers.

+

+.SH ERRORS

+.IP BadDrawable

+One or more values passed in

+.I screen_specifiers

+is not a valid drawable.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeQueryExtension(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeQueryExtension.man b/libXext/man/XdbeQueryExtension.man
index 4e07f4885..6065584e8 100644
--- a/libXext/man/XdbeQueryExtension.man
+++ b/libXext/man/XdbeQueryExtension.man
@@ -1,65 +1,61 @@
-.\" $Xorg: XdbeQuer.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeQuer.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
-.\"
-.TH XdbeQueryExtension __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeQueryExtension - returns the version of DBE supported by the server.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-Status XdbeQueryExtension(
-    Display *dpy,
-    int     *major_version_return,
-    int     *minor_version_return)
-.SH DESCRIPTION
-Sets
-.I major_version_return
-and
-.I minor_version_return
-to the major and minor
-DBE protocol version supported by the server.  If the DBE library is 
-compatible with the version returned by the server, this function returns
-non-zero.  If
-.I dpy
-does not support the DBE extension, or if there was an error
-during communication with the server, or if the server and library protocol
-versions are incompatible, this function returns zero.  No other Xdbe functions
-may be called before this function.  If a client violates this rule, the
-effects of all subsequent Xdbe calls that it makes are undefined.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeSwapBuffers().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeQueryExtension __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeQueryExtension - returns the version of DBE supported by the server.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+Status XdbeQueryExtension(

+    Display *dpy,

+    int     *major_version_return,

+    int     *minor_version_return)

+.SH DESCRIPTION

+Sets

+.I major_version_return

+and

+.I minor_version_return

+to the major and minor

+DBE protocol version supported by the server.  If the DBE library is 

+compatible with the version returned by the server, this function returns

+non-zero.  If

+.I dpy

+does not support the DBE extension, or if there was an error

+during communication with the server, or if the server and library protocol

+versions are incompatible, this function returns zero.  No other Xdbe functions

+may be called before this function.  If a client violates this rule, the

+effects of all subsequent Xdbe calls that it makes are undefined.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeSwapBuffers().

+

diff --git a/libXext/man/XdbeSwapBuffers.man b/libXext/man/XdbeSwapBuffers.man
index 248c24706..b414add7f 100644
--- a/libXext/man/XdbeSwapBuffers.man
+++ b/libXext/man/XdbeSwapBuffers.man
@@ -1,100 +1,96 @@
-.\" $Xorg: XdbeSwap.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $
-.\"
-.\" Copyright (c) 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 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 
-.\" dealing in this Software without prior written authorization from the 
-.\" Hewlett-Packard Company.
-.\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeSwap.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
-.\"
-.TH XdbeSwapBuffers __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XdbeSwapBuffers - swaps front and back DBE buffers.
-.SH SYNOPSIS
-\&#include <X11/extensions/Xdbe.h>
-
-Status XdbeSwapBuffers(
-    Display      *dpy,
-    XdbeSwapInfo *swap_info,
-    int          num_windows)
-.SH DESCRIPTION
-This function swaps the front and back buffers for a list of windows.  The
-argument
-.I num_windows
-specifies how many windows are to have their buffers
-swapped; it is the number of elements in the
-.I swap_info
-array.  The argument
-.I swap_info
-specifies the information needed per window to do the swap.
-
-The
-.I XdbeSwapInfo
-structure has the following fields:
-
-     Window            swap_window
-     XdbeSwapAction    swap_action
-
-.I swap_window
-specifies the window for which to swap buffers.
-.I swap_action
-specifies the swap action to use for this
-.I swap_window.
-
-.I swap_action
-determines what will happen to the new back buffer of the
-.I swap_window
-it is paired with in the list in addition to making the old back buffer
-become visible.  The defined actions are as follows:
-
-.IP XdbeUndefined
-The contents of the new back buffer become undefined.  This may be the most
-efficient action since it allows the implementation to discard the contents of
-the buffer if it needs to.
-.IP XdbeBackground
-The unobscured region of the new back buffer will be tiled with the
-window background.  The background action allows devices to use a fast clear
-capability during a swap.
-.IP XdbeUntouched
-The unobscured region of the new back buffer will be unmodified by the swap.
-.IP XdbeCopied
-The unobscured region of the new back buffer will be the contents of the old
-back buffer
-.SH ERRORS
-.IP BadMatch
-A non-double-buffered window was specified or a window was specified twice.
-.IP BadWindow
-An invalid window was specified.
-.IP BadValue
-An invalid swap action was specified.
-.SH SEE ALSO
-DBE,
-.I XdbeAllocateBackBufferName(),
-.I XdbeBeginIdiom(),
-.I XdbeDeallocateBackBufferName(),
-.I XdbeEndIdiom(),
-.I XdbeFreeVisualInfo(),
-.I XdbeGetBackBufferAttributes(),
-.I XdbeGetVisualInfo(),
-.I XdbeQueryExtension().
-
+.\" Copyright (c) 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 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 

+.\" dealing in this Software without prior written authorization from the 

+.\" Hewlett-Packard Company.

+.\"

+.TH XdbeSwapBuffers __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XdbeSwapBuffers - swaps front and back DBE buffers.

+.SH SYNOPSIS

+\&#include <X11/extensions/Xdbe.h>

+

+Status XdbeSwapBuffers(

+    Display      *dpy,

+    XdbeSwapInfo *swap_info,

+    int          num_windows)

+.SH DESCRIPTION

+This function swaps the front and back buffers for a list of windows.  The

+argument

+.I num_windows

+specifies how many windows are to have their buffers

+swapped; it is the number of elements in the

+.I swap_info

+array.  The argument

+.I swap_info

+specifies the information needed per window to do the swap.

+

+The

+.I XdbeSwapInfo

+structure has the following fields:

+

+     Window            swap_window

+     XdbeSwapAction    swap_action

+

+.I swap_window

+specifies the window for which to swap buffers.

+.I swap_action

+specifies the swap action to use for this

+.I swap_window.

+

+.I swap_action

+determines what will happen to the new back buffer of the

+.I swap_window

+it is paired with in the list in addition to making the old back buffer

+become visible.  The defined actions are as follows:

+

+.IP XdbeUndefined

+The contents of the new back buffer become undefined.  This may be the most

+efficient action since it allows the implementation to discard the contents of

+the buffer if it needs to.

+.IP XdbeBackground

+The unobscured region of the new back buffer will be tiled with the

+window background.  The background action allows devices to use a fast clear

+capability during a swap.

+.IP XdbeUntouched

+The unobscured region of the new back buffer will be unmodified by the swap.

+.IP XdbeCopied

+The unobscured region of the new back buffer will be the contents of the old

+back buffer

+.SH ERRORS

+.IP BadMatch

+A non-double-buffered window was specified or a window was specified twice.

+.IP BadWindow

+An invalid window was specified.

+.IP BadValue

+An invalid swap action was specified.

+.SH SEE ALSO

+DBE,

+.I XdbeAllocateBackBufferName(),

+.I XdbeBeginIdiom(),

+.I XdbeDeallocateBackBufferName(),

+.I XdbeEndIdiom(),

+.I XdbeFreeVisualInfo(),

+.I XdbeGetBackBufferAttributes(),

+.I XdbeGetVisualInfo(),

+.I XdbeQueryExtension().

+

diff --git a/libXext/man/Xevi.man b/libXext/man/Xevi.man
index 5270f7674..86c8eca33 100644
--- a/libXext/man/Xevi.man
+++ b/libXext/man/Xevi.man
@@ -1,165 +1,161 @@
-.\" $Xorg: Xevi.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $
-.\"
-.\" Copyright (c) 1997  Silicon Graphics, Inc.
-.\" 
-.\" 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 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 
-.\" SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc. shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from
-.\" Silicon Graphics, Inc.
-.\"
-.\" $XFree86: xc/doc/man/Xext/Xevi.man,v 1.2 2001/01/27 18:20:19 dawes Exp $
-.\"
-.TH XEVI __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XeviQueryExtension, XeviQueryVersion, XeviGetVisualInfo - X Extended Visual Information functions
-.SH SYNOPSIS
-\&#include <X11/extensions/XEVI.h>
-
-Bool
-XeviQueryExtension (Display *dpy);
-.LP
-Bool
-XeviQueryVersion (Display *dpy, 
-    int *major_version_return,
-    int *minor_version_return);
-.LP
-int
-XeviGetVisualInfo (Display *dpy, VisualID *visual,
-    int n_visual, ExtendedVisualInfo ** evi_return,
-    int * n_info_return);
-.fi
-.SH DESCRIPTION
-The
-X11 Extended Visual Information extension (EVI) allows a client to determine
-information about core X visuals beyond what the core protocol provides.
-
-The EVI application programming library contains the interfaces described below.
-With the exception of
-.BR XeviQueryExtension,
-if any of these routines are
-called with a display that does not support the extension, the
-ExtensionErrorHandler (which can be set with
-.BR XSetExtensionErrorHandler
-and functions the same way as
-.BR XSetErrorHandler )
-will be called and the function will then return.
-.PP
-.BR XeviQueryExtension
-returns 
-.BR True
-if the Extended Visual Information extension is available on the given display.
-A client must call
-.BR XeviQueryExtension
-before calling any other EVI
-function in order to negotiate a compatible protocol version; otherwise
-the client will get undefined behavior (EVI may or may not work).
-.PP
-.BR XeviQueryVersion
-returns
-.BR True
-if the request succeeded; the values of the major and minor protocol
-version supported by the server are returned in
-.I major_version_return
-and
-.I minor_version_return.
-.PP
-.BR XeviGetVisualInfo
-returns a list of ExtendedVisualInfo structures that describe
-visual information beyond that supported by the core protocol. This includes 
-layer information relevant for systems supporting overlays and/or underlay
-planes, and information that allows applications better to determine the level
-of hardware support for multiple colormaps. XeviGetVisualInfo returns 
-.BR Success 
-if successful, or an X error otherwise.
-If the argument
-.I visual
-is NULL, then information for all visuals of all 
-screens is returned. Otherwise, it's a pointer to a list of visuals for which
-extended visual information is desired.
-.I n_visual
-is the number of elements in the array visual.
-.I evi_return
-returns a pointer to a list of ExtendedVisualInfo. When done, the client
-should free the list using XFree\.
-.I n_info_return
-returns the number of elements in the array evi_return.
-.LP
-The
-.BR ExtendedVisualInfo
-structure has the following fields:
-.in +.5i
-.nf
-.ta 1.6i
-VisualID	\fIcore_visual_id\fR    
-int 	\fIscreen\fR	    	
-int 	\fIlevel\fR 	    	
-unsigned int	\fItransparency_type\fR 
-unsigned int	\fItransparency_value\fR 
-unsigned int	\fImin_hw_colormaps\fR
-unsigned int	\fImax_hw_colormaps\fR
-unsigned int	\fInum_colormap_conflicts\fR
-VisualID *  	\fIcolormap_conflicts\fR
-.fi
-.LP
-The combination of 
-.I core_visual_id
-and
-.I screen
-number uniquely specify the visual being described.
-.LP
-.I level
-returns the level number for the visual, 0 for normal planes, > 0 for
-overlays, < 0 for underlays.
-.LP
-.I
-transparency_type
-returns the type of transparency supported by the visual. XEVI_TRANSPARENCY_NONE if
-there are no transparent pixels, XEVI_TRANSPARENCY_PIXEL if the visual supports
-a transparent pixel, XEVI_TRANSPARENCY_MASK if the visual supports transparent
-plane(s).
-.LP
-.I transparency_value
-returns the pixel/plane value to set for transparency if transparency_type isn't
-XEVI_TRANSPARENCY_NONE.
-.LP
-.I min_hw_colormaps
-and
-.I max_hw_colormaps
-return the minimum and maximum number of hardware colormaps backing up the
-visual. 
-.LP
-.I num_colormap_conflicts
-returns the number of elements in 
-.I colormap_conflicts.
-This array returns a list of visuals that may cause conflicts in the use of the
-hardware colormap. For example, if a 12-bit hardware colormap is overloaded to
-support 8-bit colormaps, the corresponding 8-bit visuals would conflict with the
-12-bit visuals.
-
-.SH ERRORS
-.BR XeviGetVisualInfo
-will return
-.I BadValue
-if passed an illegal visual ID,
-.I BadAccess
-if the X server does not respond,
-.I BadAlloc
-if there is a memory allocation failure.
+.\" Copyright (c) 1997  Silicon Graphics, Inc.

+.\" 

+.\" 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 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 

+.\" SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc. shall not 

+.\" be used in advertising or otherwise to promote the sale, use or other 

+.\" dealing in this Software without prior written authorization from

+.\" Silicon Graphics, Inc.

+.\"

+.TH XEVI __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XeviQueryExtension, XeviQueryVersion, XeviGetVisualInfo - X Extended Visual Information functions

+.SH SYNOPSIS

+\&#include <X11/extensions/XEVI.h>

+

+Bool

+XeviQueryExtension (Display *dpy);

+.LP

+Bool

+XeviQueryVersion (Display *dpy, 

+    int *major_version_return,

+    int *minor_version_return);

+.LP

+int

+XeviGetVisualInfo (Display *dpy, VisualID *visual,

+    int n_visual, ExtendedVisualInfo ** evi_return,

+    int * n_info_return);

+.fi

+.SH DESCRIPTION

+The

+X11 Extended Visual Information extension (EVI) allows a client to determine

+information about core X visuals beyond what the core protocol provides.

+

+The EVI application programming library contains the interfaces described below.

+With the exception of

+.BR XeviQueryExtension,

+if any of these routines are

+called with a display that does not support the extension, the

+ExtensionErrorHandler (which can be set with

+.BR XSetExtensionErrorHandler

+and functions the same way as

+.BR XSetErrorHandler )

+will be called and the function will then return.

+.PP

+.BR XeviQueryExtension

+returns 

+.BR True

+if the Extended Visual Information extension is available on the given display.

+A client must call

+.BR XeviQueryExtension

+before calling any other EVI

+function in order to negotiate a compatible protocol version; otherwise

+the client will get undefined behavior (EVI may or may not work).

+.PP

+.BR XeviQueryVersion

+returns

+.BR True

+if the request succeeded; the values of the major and minor protocol

+version supported by the server are returned in

+.I major_version_return

+and

+.I minor_version_return.

+.PP

+.BR XeviGetVisualInfo

+returns a list of ExtendedVisualInfo structures that describe

+visual information beyond that supported by the core protocol. This includes 

+layer information relevant for systems supporting overlays and/or underlay

+planes, and information that allows applications better to determine the level

+of hardware support for multiple colormaps. XeviGetVisualInfo returns 

+.BR Success 

+if successful, or an X error otherwise.

+If the argument

+.I visual

+is NULL, then information for all visuals of all 

+screens is returned. Otherwise, it's a pointer to a list of visuals for which

+extended visual information is desired.

+.I n_visual

+is the number of elements in the array visual.

+.I evi_return

+returns a pointer to a list of ExtendedVisualInfo. When done, the client

+should free the list using XFree\.

+.I n_info_return

+returns the number of elements in the array evi_return.

+.LP

+The

+.BR ExtendedVisualInfo

+structure has the following fields:

+.in +.5i

+.nf

+.ta 1.6i

+VisualID	\fIcore_visual_id\fR    

+int 	\fIscreen\fR	    	

+int 	\fIlevel\fR 	    	

+unsigned int	\fItransparency_type\fR 

+unsigned int	\fItransparency_value\fR 

+unsigned int	\fImin_hw_colormaps\fR

+unsigned int	\fImax_hw_colormaps\fR

+unsigned int	\fInum_colormap_conflicts\fR

+VisualID *  	\fIcolormap_conflicts\fR

+.fi

+.LP

+The combination of 

+.I core_visual_id

+and

+.I screen

+number uniquely specify the visual being described.

+.LP

+.I level

+returns the level number for the visual, 0 for normal planes, > 0 for

+overlays, < 0 for underlays.

+.LP

+.I

+transparency_type

+returns the type of transparency supported by the visual. XEVI_TRANSPARENCY_NONE if

+there are no transparent pixels, XEVI_TRANSPARENCY_PIXEL if the visual supports

+a transparent pixel, XEVI_TRANSPARENCY_MASK if the visual supports transparent

+plane(s).

+.LP

+.I transparency_value

+returns the pixel/plane value to set for transparency if transparency_type isn't

+XEVI_TRANSPARENCY_NONE.

+.LP

+.I min_hw_colormaps

+and

+.I max_hw_colormaps

+return the minimum and maximum number of hardware colormaps backing up the

+visual. 

+.LP

+.I num_colormap_conflicts

+returns the number of elements in 

+.I colormap_conflicts.

+This array returns a list of visuals that may cause conflicts in the use of the

+hardware colormap. For example, if a 12-bit hardware colormap is overloaded to

+support 8-bit colormaps, the corresponding 8-bit visuals would conflict with the

+12-bit visuals.

+

+.SH ERRORS

+.BR XeviGetVisualInfo

+will return

+.I BadValue

+if passed an illegal visual ID,

+.I BadAccess

+if the X server does not respond,

+.I BadAlloc

+if there is a memory allocation failure.

diff --git a/libXext/man/Xmbuf.man b/libXext/man/Xmbuf.man
index adca2a1c3..2d399ef78 100644
--- a/libXext/man/Xmbuf.man
+++ b/libXext/man/Xmbuf.man
@@ -1,348 +1,343 @@
-.\" $Xorg: Xmbuf.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $
-.\" Copyright (c) 1989, 1994  X Consortium
-.\" 
-.\" 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 furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM 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 X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.\"
-.\" Copyright 1989, Digital Equipment Corporation.
-.\" Permission to use, copy, modify, distribute, and sell this documentation 
-.\" for any purpose and without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\" Digital Equipment Corporation makes no representations
-.\" about the suitability for any purpose of the information in
-.\" this document.  This documentation is provided "as is"
-.\" without express or implied warranty.
-.\" 
-.\"
-.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
-.\" $XdotOrg$
-.\"
-.de ZN
-.ie t \fB\^\\$1\^\fR\\$2
-.el \fI\^\\$1\^\fP\\$2
-..
-.TH XMBUF __libmansuffix__ __xorgversion__ "X FUNCTIONS"
-.SH NAME
-XmbufQueryExtension, XmbufGetVersion, XmbufCreateBuffers, XmbufDestroyBuffers, XmbufDisplayBuffers, XmbufGetWindowAttributes, XmbufChangeWindowAttributes, XmbufGetBufferAttributes, XmbufChangeBufferAttributes, XmbufGetScreenInfo, XmbufCreateStereoWindow - X multibuffering functions
-.SH SYNTAX
-.nf
-.LP
-\&#include <X11/extensions/multibuf.h>
-.LP
-Bool XmbufQueryExtension(
-    Display *dpy,
-    Display *dpy,
-    int *event_base_return,
-    int *error_base_return);
-.LP
-Status XmbufGetVersion(
-    Display *dpy,
-    int *major_version_return,
-    int *minor_version_return);
-.LP
-int XmbufCreateBuffers(
-    Display *dpy,
-    Window window,
-    int count,
-    int update_action,
-    int update_hint,
-    Multibuffer *buffers_update);
-.LP
-void XmbufDestroyBuffers(
-    Display *dpy,
-    Window window);
-.LP
-void XmbufDisplayBuffers(
-    Display *dpy,
-    int count,
-    Multibuffer *buffers,
-    int min_delay,
-    int max_delay);
-.LP
-Status XmbufGetWindowAttributes(
-    Display *dpy,
-    Window window,
-    XmbufWindowAttributes *attributes);
-.LP
-void XmbufChangeWindowAttributes(
-    Display *dpy,
-    Window window,
-    unsigned long valuemask,
-    XmbufSetWindowAttributes *attributes);
-.LP
-Status XmbufGetBufferAttributes(
-    Display *dpy,
-    Multibuffer buffer,
-    XmbufBufferAttributes *attributes);
-.LP
-void XmbufChangeBufferAttributes(
-    Display *dpy,
-    Multibuffer buffer,
-    unsigned long valuemask,
-    XmbufSetBufferAttributes *attributes);
-.LP
-Status XmbufGetScreenInfo(
-    Display *dpy,
-    Drawable drawable,
-    int *nmono_return,
-    XmbufBufferInfo **mono_info_return,
-    int *nstereo_return,
-    XmbufBufferInfo **stereo_info_return);
-.LP
-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,                 /\&* InputOutput, InputOnly*/
-    Visual *visual,
-    unsigned long valuemask,
-    XSetWindowAttributes *attributes,
-    Multibuffer *left_return,
-    Multibuffer *right_return);
-.fi
-.SH STRUCTURES
-.nf
-.ta 3i
-\fIEvents:\fP
-typedef struct {
-    int type;	/\&* of event */
-    unsigned long serial;	/\&* # of last request processed by server */
-    int send_event;	/\&* true if this came from a SendEvent request */
-    Display *display;	/\&* Display the event was read from */
-    Multibuffer buffer;	/\&* buffer of event */
-    int state;	/\&* see Clobbered constants above */
-} XmbufClobberNotifyEvent;
-.LP
-typedef struct {
-    int type;	/\&* of event */
-    unsigned long serial;	/\&* # of last request processed by server */
-    int send_event;	/\&* true if this came from a SendEvent request */
-    Display *display;	/\&* Display the event was read from */
-    Multibuffer buffer;	/\&* buffer of event */
-} XmbufUpdateNotifyEvent;
-.LP
-\fIPer-window attributes that can be got:\fP
-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;
-.LP
-\fIPer-window attributes that can be set:\fP
-typedef struct {
-    int update_hint;	/\&* Frequent, Intermittent, Static */
-} XmbufSetWindowAttributes;
-.LP
-\fIPer-buffer attributes that can be got:\fP
-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;
-.LP
-\fIPer-buffer attributes that can be set:\fP
-typedef struct {
-    unsigned long event_mask;	/\&* events that have been selected */
-} XmbufSetBufferAttributes;
-.LP
-\fIPer-screen buffer info (there will be lists of them):\fP
-typedef struct {
-    VisualID visualid;	/\&* visual usable at this depth */
-    int max_buffers;	/\&* most buffers for this visual */
-    int depth;	/\&* depth of buffers to be created */
-} XmbufBufferInfo;
-.fi
-.SH DESCRIPTION
-The application programming library for the
-\fIX11 Double-Buffering, Multi-Buffering, and Stereo Extension\fP
-contains the interfaces described below.
-With the exception of
-.ZN XmbufQueryExtension ,
-if any of these routines are
-called with a display that does not support the extension, the
-ExtensionErrorHandler (which can be set with
-.ZN XSetExtensionErrorHandler
-and functions the same way as
-.ZN XSetErrorHandler )
-will be called and the function will then return.
-.PP
-.ZN XmbufQueryExtension
-returns 
-.ZN True
-if the multibuffering/stereo 
-extension is available on the
-given display.  If the extension exists, the value of the first event
-code (which should be added to the event type constants
-.ZN MultibufferClobberNotify
-and 
-.ZN MultibufferUpdateNotify
-to get the actual
-values) is stored into event_base_return and the value of the first
-error code (which should be added to the error type constant
-.ZN MultibufferBadBuffer
-to get the actual value) is stored into error_base_return.
-.PP
-.ZN XmbufGetVersion
-gets the major and minor version numbers of the extension.  
-The return
-value is zero if an error occurs or non-zero if no error happens.
-.PP
-.ZN XmbufCreateBuffers
-requests that "count" buffers be 
-created with the given update_action
-and update_hint and be associated with the indicated window.  The
-number of buffers created is returned (zero if an error occurred)
-and buffers_update is filled in with that many Multibuffer identifiers.
-.PP
-.ZN XmbufDestroyBuffers
-destroys the buffers associated 
-with the given window.
-.PP
-.ZN XmbufDisplayBuffers
-displays the indicated buffers their
-appropriate windows within
-max_delay milliseconds after min_delay milliseconds have passed.
-No two buffers may be associated with the same window or else a Match
-error is generated.
-.PP
-.ZN XmbufGetWindowAttributes
-gets the multibuffering attributes that apply 
-to all buffers associated
-with the given window.
-The list of buffers returns may be freed with 
-.ZN XFree .
-Returns non-zero on success and zero if an error occurs.
-.PP
-.ZN XmbufChangeWindowAttributes
-sets the multibuffering attributes 
-that apply to all buffers associated
-with the given window.  This is currently limited to the update_hint.
-.PP
-.ZN XmbufGetBufferAttributes
-gets the attributes for the indicated buffer.
-Returns non-zero on
-success and zero if an error occurs.
-.PP
-.ZN XmbufChangeBufferAttributes
-sets the attributes for the indicated buffer.
-This is currently limited to the event_mask.
-.PP
-.ZN XmbufGetScreenInfo
-gets the parameters controlling how
-mono and stereo windows may be
-created on the screen of the given drawable.  The numbers of sets of
-visual and depths are returned in nmono_return and nstereo_return.  If
-nmono_return is greater than zero, then mono_info_return is set to the
-address of an array of 
-.ZN XmbufBufferInfo
-structures describing the
-various visuals and depths that may be used.  Otherwise,
-mono_info_return is set to NULL.  Similarly, stereo_info_return is set
-according to nstereo_return.  The storage returned in mono_info_return
-and stereo_info_return may be released by 
-.ZN XFree .
-If no errors are
-encounted, non-zero will be returned.
-.PP
-.ZN XmbufCreateStereoWindow
-creates a stereo window in the same way that 
-.ZN XCreateWindow
-creates a mono window.  The buffer ids for the left and right buffers are
-returned in left_return and right_return, respectively.  If an
-extension error handler that returns is installed, 
-.ZN None
-will be returned if the extension is not available on this display.
-.SH PREDEFINED VALUES
-.sp
-Update_action field:
-.in +.5i
-.nf
-.ZN MultibufferUpdateActionUndefined	
-.ZN MultibufferUpdateActionBackground
-.ZN MultibufferUpdateActionUntouched
-.ZN MultibufferUpdateActionCopied
-.in -.5i
-.fi
-.sp
-Update_hint field:
-.in +.5i
-.nf
-.ZN MultibufferUpdateHintFrequent		
-.ZN MultibufferUpdateHintIntermittent
-.ZN MultibufferUpdateHintStatic	
-.in -.5i
-.sp
-.fi
-Valuemask fields:
-.in +.5i
-.nf
-.ZN MultibufferWindowUpdateHint
-.ZN MultibufferBufferEventMask
-.in -.5i
-.fi
-.sp
-Mono vs. stereo and left vs. right:
-.in +.5i
-.nf
-.ZN MultibufferModeMono	
-.ZN MultibufferModeStereo
-.ZN MultibufferSideMono
-.ZN MultibufferSideLeft
-.ZN MultibufferSideRight		
-.in -.5i
-.fi
-.sp
-Clobber state:
-.in +.5i
-.nf
-.ZN MultibufferUnclobbered	
-.ZN MultibufferPartiallyClobbered
-.ZN MultibufferFullyClobbered	
-.in -.5i
-.fi
-.sp
-Event stuff:
-.in +.5i
-.nf
-.ZN MultibufferClobberNotifyMask
-.ZN MultibufferUpdateNotifyMask
-.ZN MultibufferClobberNotify
-.ZN MultibufferUpdateNotify
-.ZN MultibufferNumberEvents
-.ZN MultibufferBadBuffer
-.ZN MultibufferNumberErrors
-.in -.5i
-.fi
-.SH BUGS
-This manual page needs more work.
-.SH SEE ALSO
-\fIExtending X for Double Buffering, Multi-Buffering, and Stereo\fP
+.\" Copyright (c) 1989, 1994  X Consortium

+.\" 

+.\" 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 furnished to do so, subject to the following conditions:

+.\" 

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

+.\" all copies or substantial portions of the Software.

+.\" 

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

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

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

+.\" THE X CONSORTIUM 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 X Consortium shall not 

+.\" be used in advertising or otherwise to promote the sale, use or other 

+.\" dealing in this Software without prior written authorization from the 

+.\" X Consortium.

+.\"

+.\" Copyright 1989, Digital Equipment Corporation.

+.\" Permission to use, copy, modify, distribute, and sell this documentation 

+.\" for any purpose and without fee is hereby granted, provided that the above

+.\" copyright notice and this permission notice appear in all copies.

+.\" Digital Equipment Corporation makes no representations

+.\" about the suitability for any purpose of the information in

+.\" this document.  This documentation is provided "as is"

+.\" without express or implied warranty.

+.\"

+.de ZN

+.ie t \fB\^\\$1\^\fR\\$2

+.el \fI\^\\$1\^\fP\\$2

+..

+.TH XMBUF __libmansuffix__ __xorgversion__ "X FUNCTIONS"

+.SH NAME

+XmbufQueryExtension, XmbufGetVersion, XmbufCreateBuffers, XmbufDestroyBuffers, XmbufDisplayBuffers, XmbufGetWindowAttributes, XmbufChangeWindowAttributes, XmbufGetBufferAttributes, XmbufChangeBufferAttributes, XmbufGetScreenInfo, XmbufCreateStereoWindow - X multibuffering functions

+.SH SYNTAX

+.nf

+.LP

+\&#include <X11/extensions/multibuf.h>

+.LP

+Bool XmbufQueryExtension(

+    Display *dpy,

+    Display *dpy,

+    int *event_base_return,

+    int *error_base_return);

+.LP

+Status XmbufGetVersion(

+    Display *dpy,

+    int *major_version_return,

+    int *minor_version_return);

+.LP

+int XmbufCreateBuffers(

+    Display *dpy,

+    Window window,

+    int count,

+    int update_action,

+    int update_hint,

+    Multibuffer *buffers_update);

+.LP

+void XmbufDestroyBuffers(

+    Display *dpy,

+    Window window);

+.LP

+void XmbufDisplayBuffers(

+    Display *dpy,

+    int count,

+    Multibuffer *buffers,

+    int min_delay,

+    int max_delay);

+.LP

+Status XmbufGetWindowAttributes(

+    Display *dpy,

+    Window window,

+    XmbufWindowAttributes *attributes);

+.LP

+void XmbufChangeWindowAttributes(

+    Display *dpy,

+    Window window,

+    unsigned long valuemask,

+    XmbufSetWindowAttributes *attributes);

+.LP

+Status XmbufGetBufferAttributes(

+    Display *dpy,

+    Multibuffer buffer,

+    XmbufBufferAttributes *attributes);

+.LP

+void XmbufChangeBufferAttributes(

+    Display *dpy,

+    Multibuffer buffer,

+    unsigned long valuemask,

+    XmbufSetBufferAttributes *attributes);

+.LP

+Status XmbufGetScreenInfo(

+    Display *dpy,

+    Drawable drawable,

+    int *nmono_return,

+    XmbufBufferInfo **mono_info_return,

+    int *nstereo_return,

+    XmbufBufferInfo **stereo_info_return);

+.LP

+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,                 /\&* InputOutput, InputOnly*/

+    Visual *visual,

+    unsigned long valuemask,

+    XSetWindowAttributes *attributes,

+    Multibuffer *left_return,

+    Multibuffer *right_return);

+.fi

+.SH STRUCTURES

+.nf

+.ta 3i

+\fIEvents:\fP

+typedef struct {

+    int type;	/\&* of event */

+    unsigned long serial;	/\&* # of last request processed by server */

+    int send_event;	/\&* true if this came from a SendEvent request */

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

+    Multibuffer buffer;	/\&* buffer of event */

+    int state;	/\&* see Clobbered constants above */

+} XmbufClobberNotifyEvent;

+.LP

+typedef struct {

+    int type;	/\&* of event */

+    unsigned long serial;	/\&* # of last request processed by server */

+    int send_event;	/\&* true if this came from a SendEvent request */

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

+    Multibuffer buffer;	/\&* buffer of event */

+} XmbufUpdateNotifyEvent;

+.LP

+\fIPer-window attributes that can be got:\fP

+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;

+.LP

+\fIPer-window attributes that can be set:\fP

+typedef struct {

+    int update_hint;	/\&* Frequent, Intermittent, Static */

+} XmbufSetWindowAttributes;

+.LP

+\fIPer-buffer attributes that can be got:\fP

+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;

+.LP

+\fIPer-buffer attributes that can be set:\fP

+typedef struct {

+    unsigned long event_mask;	/\&* events that have been selected */

+} XmbufSetBufferAttributes;

+.LP

+\fIPer-screen buffer info (there will be lists of them):\fP

+typedef struct {

+    VisualID visualid;	/\&* visual usable at this depth */

+    int max_buffers;	/\&* most buffers for this visual */

+    int depth;	/\&* depth of buffers to be created */

+} XmbufBufferInfo;

+.fi

+.SH DESCRIPTION

+The application programming library for the

+\fIX11 Double-Buffering, Multi-Buffering, and Stereo Extension\fP

+contains the interfaces described below.

+With the exception of

+.ZN XmbufQueryExtension ,

+if any of these routines are

+called with a display that does not support the extension, the

+ExtensionErrorHandler (which can be set with

+.ZN XSetExtensionErrorHandler

+and functions the same way as

+.ZN XSetErrorHandler )

+will be called and the function will then return.

+.PP

+.ZN XmbufQueryExtension

+returns 

+.ZN True

+if the multibuffering/stereo 

+extension is available on the

+given display.  If the extension exists, the value of the first event

+code (which should be added to the event type constants

+.ZN MultibufferClobberNotify

+and 

+.ZN MultibufferUpdateNotify

+to get the actual

+values) is stored into event_base_return and the value of the first

+error code (which should be added to the error type constant

+.ZN MultibufferBadBuffer

+to get the actual value) is stored into error_base_return.

+.PP

+.ZN XmbufGetVersion

+gets the major and minor version numbers of the extension.  

+The return

+value is zero if an error occurs or non-zero if no error happens.

+.PP

+.ZN XmbufCreateBuffers

+requests that "count" buffers be 

+created with the given update_action

+and update_hint and be associated with the indicated window.  The

+number of buffers created is returned (zero if an error occurred)

+and buffers_update is filled in with that many Multibuffer identifiers.

+.PP

+.ZN XmbufDestroyBuffers

+destroys the buffers associated 

+with the given window.

+.PP

+.ZN XmbufDisplayBuffers

+displays the indicated buffers their

+appropriate windows within

+max_delay milliseconds after min_delay milliseconds have passed.

+No two buffers may be associated with the same window or else a Match

+error is generated.

+.PP

+.ZN XmbufGetWindowAttributes

+gets the multibuffering attributes that apply 

+to all buffers associated

+with the given window.

+The list of buffers returns may be freed with 

+.ZN XFree .

+Returns non-zero on success and zero if an error occurs.

+.PP

+.ZN XmbufChangeWindowAttributes

+sets the multibuffering attributes 

+that apply to all buffers associated

+with the given window.  This is currently limited to the update_hint.

+.PP

+.ZN XmbufGetBufferAttributes

+gets the attributes for the indicated buffer.

+Returns non-zero on

+success and zero if an error occurs.

+.PP

+.ZN XmbufChangeBufferAttributes

+sets the attributes for the indicated buffer.

+This is currently limited to the event_mask.

+.PP

+.ZN XmbufGetScreenInfo

+gets the parameters controlling how

+mono and stereo windows may be

+created on the screen of the given drawable.  The numbers of sets of

+visual and depths are returned in nmono_return and nstereo_return.  If

+nmono_return is greater than zero, then mono_info_return is set to the

+address of an array of 

+.ZN XmbufBufferInfo

+structures describing the

+various visuals and depths that may be used.  Otherwise,

+mono_info_return is set to NULL.  Similarly, stereo_info_return is set

+according to nstereo_return.  The storage returned in mono_info_return

+and stereo_info_return may be released by 

+.ZN XFree .

+If no errors are

+encounted, non-zero will be returned.

+.PP

+.ZN XmbufCreateStereoWindow

+creates a stereo window in the same way that 

+.ZN XCreateWindow

+creates a mono window.  The buffer ids for the left and right buffers are

+returned in left_return and right_return, respectively.  If an

+extension error handler that returns is installed, 

+.ZN None

+will be returned if the extension is not available on this display.

+.SH PREDEFINED VALUES

+.sp

+Update_action field:

+.in +.5i

+.nf

+.ZN MultibufferUpdateActionUndefined	

+.ZN MultibufferUpdateActionBackground

+.ZN MultibufferUpdateActionUntouched

+.ZN MultibufferUpdateActionCopied

+.in -.5i

+.fi

+.sp

+Update_hint field:

+.in +.5i

+.nf

+.ZN MultibufferUpdateHintFrequent		

+.ZN MultibufferUpdateHintIntermittent

+.ZN MultibufferUpdateHintStatic	

+.in -.5i

+.sp

+.fi

+Valuemask fields:

+.in +.5i

+.nf

+.ZN MultibufferWindowUpdateHint

+.ZN MultibufferBufferEventMask

+.in -.5i

+.fi

+.sp

+Mono vs. stereo and left vs. right:

+.in +.5i

+.nf

+.ZN MultibufferModeMono	

+.ZN MultibufferModeStereo

+.ZN MultibufferSideMono

+.ZN MultibufferSideLeft

+.ZN MultibufferSideRight		

+.in -.5i

+.fi

+.sp

+Clobber state:

+.in +.5i

+.nf

+.ZN MultibufferUnclobbered	

+.ZN MultibufferPartiallyClobbered

+.ZN MultibufferFullyClobbered	

+.in -.5i

+.fi

+.sp

+Event stuff:

+.in +.5i

+.nf

+.ZN MultibufferClobberNotifyMask

+.ZN MultibufferUpdateNotifyMask

+.ZN MultibufferClobberNotify

+.ZN MultibufferUpdateNotify

+.ZN MultibufferNumberEvents

+.ZN MultibufferBadBuffer

+.ZN MultibufferNumberErrors

+.in -.5i

+.fi

+.SH BUGS

+This manual page needs more work.

+.SH SEE ALSO

+\fIExtending X for Double Buffering, Multi-Buffering, and Stereo\fP

diff --git a/libXext/specs/dbelib.tex b/libXext/specs/dbelib.tex
index a1b526b6f..e9793bc32 100644
--- a/libXext/specs/dbelib.tex
+++ b/libXext/specs/dbelib.tex
@@ -1,4 +1,3 @@
-% $Xorg: dbelib.tex,v 1.3 2000/08/17 19:42:31 cpqbld Exp $

 % edited for DP edits and code consistency w/ core protocol/xlib 3/30/96

 % split into separate library and protocol documentos 4/15/96

 \documentstyle{article}

diff --git a/libXext/specs/synclib.tex b/libXext/specs/synclib.tex
index a8e573006..0775eb9fd 100644
--- a/libXext/specs/synclib.tex
+++ b/libXext/specs/synclib.tex
@@ -1,6 +1,3 @@
-% $Xorg: synclib.tex,v 1.3 2000/08/17 19:42:37 cpqbld Exp $

-% $XdotOrg: xc/doc/specs/Xext/synclib.tex,v 1.2 2004/04/23 18:42:18 eich Exp $

-%

 % Copyright 1991 by Olivetti Research Limited, Cambridge, England and

 % Digital Equipment Corporation, Maynard, Massachusetts.

 %

diff --git a/libXext/src/DPMS.c b/libXext/src/DPMS.c
index 02698aad7..c6d0adac6 100644
--- a/libXext/src/DPMS.c
+++ b/libXext/src/DPMS.c
@@ -1,4 +1,3 @@
-/* $Xorg: DPMS.c,v 1.3 2000/08/17 19:45:50 cpqbld 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/lib/Xext/DPMS.c,v 3.5 2002/10/16 00:37:27 dawes Exp $ */

 

 /*

  * HISTORY

diff --git a/libXext/src/MITMisc.c b/libXext/src/MITMisc.c
index 0304bf320..20d1157cb 100644
--- a/libXext/src/MITMisc.c
+++ b/libXext/src/MITMisc.c
@@ -1,5 +1,4 @@
 /*

- * $Xorg: MITMisc.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $

  *

 Copyright 1989, 1998  The Open Group

 

@@ -24,7 +23,6 @@ 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/Xext/MITMisc.c,v 1.3 2002/10/16 00:37:27 dawes Exp $ */

 

 /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */

 

diff --git a/libXext/src/XAppgroup.c b/libXext/src/XAppgroup.c
index c533fd25f..2d3edf35f 100644
--- a/libXext/src/XAppgroup.c
+++ b/libXext/src/XAppgroup.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.11 2002/10/16 02:19:22 dawes Exp $ */

 /*

 

 Copyright 1996, 1998  The Open Group

@@ -24,7 +23,6 @@ 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: XAppgroup.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/XEVI.c b/libXext/src/XEVI.c
index b4e5b77f4..caf988977 100644
--- a/libXext/src/XEVI.c
+++ b/libXext/src/XEVI.c
@@ -1,4 +1,3 @@
-/* $Xorg: XEVI.c,v 1.3 2000/08/17 19:45:51 cpqbld Exp $ */

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

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

 Permission to use, copy, modify, and distribute this

@@ -21,7 +20,6 @@ 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$ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/XLbx.c b/libXext/src/XLbx.c
index fc2873be9..0b7eb5827 100644
--- a/libXext/src/XLbx.c
+++ b/libXext/src/XLbx.c
@@ -1,6 +1,4 @@
 /*

- * $Xorg: XLbx.c,v 1.3 2000/08/17 19:45:51 cpqbld Exp $

- *

  * Copyright 1992 Network Computing Devices

  *

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

@@ -22,7 +20,6 @@
  *

  * Author:  Keith Packard, Network Computing Devices

  */

-/* $XFree86: xc/lib/Xext/XLbx.c,v 1.4 2002/10/16 00:37:27 dawes Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/XMultibuf.c b/libXext/src/XMultibuf.c
index 5c9cfc78c..67551443d 100644
--- a/libXext/src/XMultibuf.c
+++ b/libXext/src/XMultibuf.c
@@ -1,5 +1,4 @@
 /*

- * $Xorg: XMultibuf.c,v 1.6 2001/02/09 02:03:49 xorgcvs Exp $

  *

 Copyright 1989, 1998  The Open Group

 

@@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
  *

  * Authors:  Jim Fulton, MIT X Consortium

  */

-/* $XFree86: xc/lib/Xext/XMultibuf.c,v 1.5 2001/12/14 19:55:00 dawes Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/XSecurity.c b/libXext/src/XSecurity.c
index 478b06218..4ce7c4d01 100644
--- a/libXext/src/XSecurity.c
+++ b/libXext/src/XSecurity.c
@@ -1,311 +1,309 @@
-/* $Xorg: XSecurity.c,v 1.6 2001/02/09 02:03:49 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/lib/Xext/XSecurity.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xlibint.h>
-#include <stdio.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/securproto.h>
-#include <X11/extensions/security.h>
-
-static XExtensionInfo _Security_info_data;
-static XExtensionInfo *Security_info = &_Security_info_data;
-static char *Security_extension_name = SECURITY_EXTENSION_NAME;
-
-#define SecurityCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, Security_extension_name, val)
-#define SecuritySimpleCheckExtension(dpy,i) \
-  XextSimpleCheckExtension (dpy, i, Security_extension_name)
-
-#define SecurityGetReq(name,req,info) GetReq (name, req); \
-        req->reqType = info->codes->major_opcode; \
-        req->securityReqType = X_##name;
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-/*
- * find_display - locate the display info block
- */
-static int close_display(Display *dpy, XExtCodes *codes);
-static Bool wire_to_event(Display *dpy, XEvent *event, xEvent *wire);
-static Status event_to_wire(Display *dpy, XEvent *event, xEvent *wire);
-static char *error_string(Display *dpy, int code, XExtCodes *codes,
-			  char *buf, int n);
-
-static XExtensionHooks Security_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    close_display,                      /* close_display */
-    wire_to_event,                      /* wire_to_event */
-    event_to_wire,                      /* event_to_wire */
-    NULL,                               /* error */
-    error_string                        /* error_string */
-};
-
-static char    *security_error_list[] = {
-    "BadAuthorization",
-    "BadAuthorizationProtocol"
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, Security_info,
-				   Security_extension_name,
-				   &Security_extension_hooks,
-				   XSecurityNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, Security_info)
-
-static
-XEXT_GENERATE_ERROR_STRING(error_string, Security_extension_name,
-			   XSecurityNumberErrors, security_error_list)
-
-static Bool
-wire_to_event(Display *dpy, XEvent *event, xEvent *wire)
-{
-    XExtDisplayInfo *info = find_display(dpy);
-
-    SecurityCheckExtension (dpy, info, False);
-
-    switch ((wire->u.u.type & 0x7F) - info->codes->first_event)
-    {
-	case XSecurityAuthorizationRevoked:
-	{
-	    xSecurityAuthorizationRevokedEvent *rwire =
-		(xSecurityAuthorizationRevokedEvent *)wire;
-	    XSecurityAuthorizationRevokedEvent *revent =
-		(XSecurityAuthorizationRevokedEvent *)event;
-
-	  revent->type = rwire->type & 0x7F;
-	  revent->serial = _XSetLastRequestRead(dpy,
-						(xGenericReply *) wire);
-	  revent->send_event = (rwire->type & 0x80) != 0;
-	  revent->display = dpy;
-	  revent->auth_id = rwire->authId;
-	  return True;
-	}
-    }
-    return False;
-}
-
-static Status
-event_to_wire(Display *dpy, XEvent *event, xEvent *wire)
-{
-    XExtDisplayInfo *info = find_display(dpy);
-
-    SecurityCheckExtension(dpy, info, False);
-
-    switch ((event->type & 0x7F) - info->codes->first_event)
-    {
-	case XSecurityAuthorizationRevoked:
-	{
-	    xSecurityAuthorizationRevokedEvent *rwire =
-		(xSecurityAuthorizationRevokedEvent *)wire;
-	    XSecurityAuthorizationRevokedEvent *revent =
-		(XSecurityAuthorizationRevokedEvent *)event;
-	    rwire->type = revent->type | (revent->send_event ? 0x80 : 0);
-	    rwire->sequenceNumber = revent->serial & 0xFFFF;
-	    return True;
-	}
-    }
-    return False;
-}
-
-/*****************************************************************************
- *                                                                           *
- *		       Security public interfaces                            *
- *                                                                           *
- *****************************************************************************/
-
-Status XSecurityQueryExtension (
-    Display *dpy,
-    int *major_version_return,
-    int *minor_version_return)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xSecurityQueryVersionReply rep;
-    register xSecurityQueryVersionReq *req;
-
-    if (!XextHasExtension (info))
-        return (Status)0; /* failure */
-
-    LockDisplay (dpy);
-    SecurityGetReq (SecurityQueryVersion, req, info);
-    req->majorVersion = SECURITY_MAJOR_VERSION;
-    req->minorVersion = SECURITY_MINOR_VERSION;
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return (Status)0; /* failure */
-    }
-    *major_version_return = rep.majorVersion;
-    *minor_version_return = rep.minorVersion;
-    UnlockDisplay (dpy);
-
-    SyncHandle ();
-
-    if (*major_version_return != SECURITY_MAJOR_VERSION)
-        return (Status)0; /* failure */
-    else
-        return (Status)1; /* success */
-}
-
-Xauth *
-XSecurityAllocXauth(void)
-{
-    return Xcalloc(1, sizeof(Xauth));
-}
-
-void
-XSecurityFreeXauth(Xauth *auth)
-{
-    XFree(auth);
-}
-
-static int
-Ones(Mask mask)
-{
-    register Mask y;
-
-    y = (mask >> 1) &033333333333;
-    y = mask - y - ((y >>1) & 033333333333);
-    return (((y + (y >> 3)) & 030707070707) % 077);
-}
-
-Xauth *
-XSecurityGenerateAuthorization(
-    Display *dpy,
-    Xauth *auth_in,
-    unsigned long valuemask,
-    XSecurityAuthorizationAttributes *attributes,
-    XSecurityAuthorization *auth_id_return)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    register xSecurityGenerateAuthorizationReq *req;
-    xSecurityGenerateAuthorizationReply rep;
-    Xauth *auth_return;
-    unsigned long values[3];
-    unsigned long *value = values;
-    unsigned int nvalues;
-
-    *auth_id_return = 0;  /* in case we fail */
-
-    /* make sure extension is available */
-
-    SecurityCheckExtension (dpy, info, (Xauth *)NULL);
-
-    LockDisplay(dpy);
-    SecurityGetReq(SecurityGenerateAuthorization, req, info);
-
-    req->nbytesAuthProto = auth_in->name_length;
-    req->nbytesAuthData  = auth_in->data_length;
-
-    /* adjust length to account for auth name and data */
-    req->length += (auth_in->name_length + (unsigned)3) >> 2;
-    req->length += (auth_in->data_length + (unsigned)3) >> 2;
-
-    /* adjust length to account for list of values */
-    req->valueMask = valuemask & XSecurityAllAuthorizationAttributes;
-    nvalues = Ones(req->valueMask);
-    req->length += nvalues;
-
-    /* send auth name and data */
-    Data(dpy, auth_in->name, auth_in->name_length);
-    Data(dpy, auth_in->data, auth_in->data_length);
-
-    /* send values */
-    if (valuemask & XSecurityTimeout)	 *value++ = attributes->timeout;
-    if (valuemask & XSecurityTrustLevel) *value++ = attributes->trust_level;
-    if (valuemask & XSecurityGroup)	 *value++ = attributes->group;
-    if (valuemask & XSecurityEventMask)	 *value++ = attributes->event_mask;
-
-    nvalues <<= 2;
-    Data32(dpy, (long *)values, (long)nvalues);
-
-    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
-	UnlockDisplay (dpy);
-	SyncHandle ();
-	return (Xauth *)NULL;
-    }
-
-    *auth_id_return = rep.authId;
-
-    /* Allocate space for the Xauth struct and the auth name and data all
-     * in one hunk.  This lets XSecurityFreeXauth not have to care
-     * about whether the auth was allocated here or in
-     * XSecurityAllocXauth; in both cases, you just free one pointer.
-     */
-
-    if ((auth_return = (Xauth *)Xcalloc(1,
-		(sizeof(Xauth) + auth_in->name_length + rep.dataLength))))
-    {
-	auth_return->data_length = rep.dataLength;
-	auth_return->data = (char *)&auth_return[1];
-	_XReadPad(dpy, auth_return->data, (long)rep.dataLength);
-
-	auth_return->name_length = auth_in->name_length;
-	auth_return->name = auth_return->data + auth_return->data_length;
-	memcpy(auth_return->name, auth_in->name, auth_return->name_length);
-    }
-    else
-    {
-	_XEatData(dpy, (unsigned long) (rep.dataLength + 3) & ~3);
-    }
-
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return auth_return;
-
-} /* XSecurityGenerateAuthorization */
-
-Status
-XSecurityRevokeAuthorization(
-    Display *dpy,
-    XSecurityAuthorization auth_id)
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xSecurityRevokeAuthorizationReq *req;
-
-    SecurityCheckExtension (dpy, info, 0);
-    LockDisplay(dpy);
-    SecurityGetReq(SecurityRevokeAuthorization, req, info);
-    req->authId = auth_id;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return 1;
-} /* XSecurityRevokeAuthorization */
+/*

+

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xlibint.h>

+#include <stdio.h>

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

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

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

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

+

+static XExtensionInfo _Security_info_data;

+static XExtensionInfo *Security_info = &_Security_info_data;

+static char *Security_extension_name = SECURITY_EXTENSION_NAME;

+

+#define SecurityCheckExtension(dpy,i,val) \

+  XextCheckExtension (dpy, i, Security_extension_name, val)

+#define SecuritySimpleCheckExtension(dpy,i) \

+  XextSimpleCheckExtension (dpy, i, Security_extension_name)

+

+#define SecurityGetReq(name,req,info) GetReq (name, req); \

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

+        req->securityReqType = X_##name;

+

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

+ *                                                                           *

+ *			   private utility routines                          *

+ *                                                                           *

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

+

+/*

+ * find_display - locate the display info block

+ */

+static int close_display(Display *dpy, XExtCodes *codes);

+static Bool wire_to_event(Display *dpy, XEvent *event, xEvent *wire);

+static Status event_to_wire(Display *dpy, XEvent *event, xEvent *wire);

+static char *error_string(Display *dpy, int code, XExtCodes *codes,

+			  char *buf, int n);

+

+static XExtensionHooks Security_extension_hooks = {

+    NULL,                               /* create_gc */

+    NULL,                               /* copy_gc */

+    NULL,                               /* flush_gc */

+    NULL,                               /* free_gc */

+    NULL,                               /* create_font */

+    NULL,                               /* free_font */

+    close_display,                      /* close_display */

+    wire_to_event,                      /* wire_to_event */

+    event_to_wire,                      /* event_to_wire */

+    NULL,                               /* error */

+    error_string                        /* error_string */

+};

+

+static char    *security_error_list[] = {

+    "BadAuthorization",

+    "BadAuthorizationProtocol"

+};

+

+static XEXT_GENERATE_FIND_DISPLAY (find_display, Security_info,

+				   Security_extension_name,

+				   &Security_extension_hooks,

+				   XSecurityNumberEvents, NULL)

+

+static XEXT_GENERATE_CLOSE_DISPLAY (close_display, Security_info)

+

+static

+XEXT_GENERATE_ERROR_STRING(error_string, Security_extension_name,

+			   XSecurityNumberErrors, security_error_list)

+

+static Bool

+wire_to_event(Display *dpy, XEvent *event, xEvent *wire)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+

+    SecurityCheckExtension (dpy, info, False);

+

+    switch ((wire->u.u.type & 0x7F) - info->codes->first_event)

+    {

+	case XSecurityAuthorizationRevoked:

+	{

+	    xSecurityAuthorizationRevokedEvent *rwire =

+		(xSecurityAuthorizationRevokedEvent *)wire;

+	    XSecurityAuthorizationRevokedEvent *revent =

+		(XSecurityAuthorizationRevokedEvent *)event;

+

+	  revent->type = rwire->type & 0x7F;

+	  revent->serial = _XSetLastRequestRead(dpy,

+						(xGenericReply *) wire);

+	  revent->send_event = (rwire->type & 0x80) != 0;

+	  revent->display = dpy;

+	  revent->auth_id = rwire->authId;

+	  return True;

+	}

+    }

+    return False;

+}

+

+static Status

+event_to_wire(Display *dpy, XEvent *event, xEvent *wire)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+

+    SecurityCheckExtension(dpy, info, False);

+

+    switch ((event->type & 0x7F) - info->codes->first_event)

+    {

+	case XSecurityAuthorizationRevoked:

+	{

+	    xSecurityAuthorizationRevokedEvent *rwire =

+		(xSecurityAuthorizationRevokedEvent *)wire;

+	    XSecurityAuthorizationRevokedEvent *revent =

+		(XSecurityAuthorizationRevokedEvent *)event;

+	    rwire->type = revent->type | (revent->send_event ? 0x80 : 0);

+	    rwire->sequenceNumber = revent->serial & 0xFFFF;

+	    return True;

+	}

+    }

+    return False;

+}

+

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

+ *                                                                           *

+ *		       Security public interfaces                            *

+ *                                                                           *

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

+

+Status XSecurityQueryExtension (

+    Display *dpy,

+    int *major_version_return,

+    int *minor_version_return)

+{

+    XExtDisplayInfo *info = find_display (dpy);

+    xSecurityQueryVersionReply rep;

+    register xSecurityQueryVersionReq *req;

+

+    if (!XextHasExtension (info))

+        return (Status)0; /* failure */

+

+    LockDisplay (dpy);

+    SecurityGetReq (SecurityQueryVersion, req, info);

+    req->majorVersion = SECURITY_MAJOR_VERSION;

+    req->minorVersion = SECURITY_MINOR_VERSION;

+

+    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {

+	UnlockDisplay (dpy);

+	SyncHandle ();

+	return (Status)0; /* failure */

+    }

+    *major_version_return = rep.majorVersion;

+    *minor_version_return = rep.minorVersion;

+    UnlockDisplay (dpy);

+

+    SyncHandle ();

+

+    if (*major_version_return != SECURITY_MAJOR_VERSION)

+        return (Status)0; /* failure */

+    else

+        return (Status)1; /* success */

+}

+

+Xauth *

+XSecurityAllocXauth(void)

+{

+    return Xcalloc(1, sizeof(Xauth));

+}

+

+void

+XSecurityFreeXauth(Xauth *auth)

+{

+    XFree(auth);

+}

+

+static int

+Ones(Mask mask)

+{

+    register Mask y;

+

+    y = (mask >> 1) &033333333333;

+    y = mask - y - ((y >>1) & 033333333333);

+    return (((y + (y >> 3)) & 030707070707) % 077);

+}

+

+Xauth *

+XSecurityGenerateAuthorization(

+    Display *dpy,

+    Xauth *auth_in,

+    unsigned long valuemask,

+    XSecurityAuthorizationAttributes *attributes,

+    XSecurityAuthorization *auth_id_return)

+{

+    XExtDisplayInfo *info = find_display (dpy);

+    register xSecurityGenerateAuthorizationReq *req;

+    xSecurityGenerateAuthorizationReply rep;

+    Xauth *auth_return;

+    unsigned long values[3];

+    unsigned long *value = values;

+    unsigned int nvalues;

+

+    *auth_id_return = 0;  /* in case we fail */

+

+    /* make sure extension is available */

+

+    SecurityCheckExtension (dpy, info, (Xauth *)NULL);

+

+    LockDisplay(dpy);

+    SecurityGetReq(SecurityGenerateAuthorization, req, info);

+

+    req->nbytesAuthProto = auth_in->name_length;

+    req->nbytesAuthData  = auth_in->data_length;

+

+    /* adjust length to account for auth name and data */

+    req->length += (auth_in->name_length + (unsigned)3) >> 2;

+    req->length += (auth_in->data_length + (unsigned)3) >> 2;

+

+    /* adjust length to account for list of values */

+    req->valueMask = valuemask & XSecurityAllAuthorizationAttributes;

+    nvalues = Ones(req->valueMask);

+    req->length += nvalues;

+

+    /* send auth name and data */

+    Data(dpy, auth_in->name, auth_in->name_length);

+    Data(dpy, auth_in->data, auth_in->data_length);

+

+    /* send values */

+    if (valuemask & XSecurityTimeout)	 *value++ = attributes->timeout;

+    if (valuemask & XSecurityTrustLevel) *value++ = attributes->trust_level;

+    if (valuemask & XSecurityGroup)	 *value++ = attributes->group;

+    if (valuemask & XSecurityEventMask)	 *value++ = attributes->event_mask;

+

+    nvalues <<= 2;

+    Data32(dpy, (long *)values, (long)nvalues);

+

+    if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {

+	UnlockDisplay (dpy);

+	SyncHandle ();

+	return (Xauth *)NULL;

+    }

+

+    *auth_id_return = rep.authId;

+

+    /* Allocate space for the Xauth struct and the auth name and data all

+     * in one hunk.  This lets XSecurityFreeXauth not have to care

+     * about whether the auth was allocated here or in

+     * XSecurityAllocXauth; in both cases, you just free one pointer.

+     */

+

+    if ((auth_return = (Xauth *)Xcalloc(1,

+		(sizeof(Xauth) + auth_in->name_length + rep.dataLength))))

+    {

+	auth_return->data_length = rep.dataLength;

+	auth_return->data = (char *)&auth_return[1];

+	_XReadPad(dpy, auth_return->data, (long)rep.dataLength);

+

+	auth_return->name_length = auth_in->name_length;

+	auth_return->name = auth_return->data + auth_return->data_length;

+	memcpy(auth_return->name, auth_in->name, auth_return->name_length);

+    }

+    else

+    {

+	_XEatData(dpy, (unsigned long) (rep.dataLength + 3) & ~3);

+    }

+

+    UnlockDisplay (dpy);

+    SyncHandle ();

+    return auth_return;

+

+} /* XSecurityGenerateAuthorization */

+

+Status

+XSecurityRevokeAuthorization(

+    Display *dpy,

+    XSecurityAuthorization auth_id)

+{

+    XExtDisplayInfo *info = find_display (dpy);

+    xSecurityRevokeAuthorizationReq *req;

+

+    SecurityCheckExtension (dpy, info, 0);

+    LockDisplay(dpy);

+    SecurityGetReq(SecurityRevokeAuthorization, req, info);

+    req->authId = auth_id;

+    UnlockDisplay (dpy);

+    SyncHandle ();

+    return 1;

+} /* XSecurityRevokeAuthorization */

diff --git a/libXext/src/XShape.c b/libXext/src/XShape.c
index 2810a4dc1..f189a41b9 100644
--- a/libXext/src/XShape.c
+++ b/libXext/src/XShape.c
@@ -1,5 +1,4 @@
 /*

- * $Xorg: XShape.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $

  *

 Copyright 1989, 1998  The Open Group

 

@@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
  *

  * Author:  Keith Packard, MIT X Consortium

  */

-/* $XFree86: xc/lib/Xext/XShape.c,v 1.3 2002/10/16 00:37:27 dawes Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/XShm.c b/libXext/src/XShm.c
index 81d2b9db6..cffd30756 100644
--- a/libXext/src/XShm.c
+++ b/libXext/src/XShm.c
@@ -1,6 +1,4 @@
-/* $XdotOrg: $ */

 /*

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

  *

 Copyright 1989, 1998  The Open Group

 

@@ -26,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
  *

  * Author:  Bob Scheifler and Keith Packard, MIT X Consortium

  */

-/* $XFree86: xc/lib/Xext/XShm.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */

 

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

 

diff --git a/libXext/src/XSync.c b/libXext/src/XSync.c
index e7c0c3f78..250d10cd3 100644
--- a/libXext/src/XSync.c
+++ b/libXext/src/XSync.c
@@ -49,7 +49,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.

 

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

-/* $XFree86: xc/lib/Xext/XSync.c,v 1.7tsi Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/XTestExt1.c b/libXext/src/XTestExt1.c
index 7a73a8ae8..83a59a3d8 100644
--- a/libXext/src/XTestExt1.c
+++ b/libXext/src/XTestExt1.c
@@ -1,4 +1,3 @@
-/* $Xorg: XTestExt1.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ */

 /*

  *	File:  xtestext1lib.c

  *

@@ -51,7 +50,6 @@ Telephone and Telegraph Company or of the Regents of the
 University of California.

 

 */

-/* $XFree86: xc/lib/Xext/XTestExt1.c,v 1.3 2001/01/17 19:42:46 dawes Exp $ */

 

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

  * include files

diff --git a/libXext/src/Xcup.c b/libXext/src/Xcup.c
index 8d3cb70a2..d050ba0b6 100644
--- a/libXext/src/Xcup.c
+++ b/libXext/src/Xcup.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/Xext/Xcup.c,v 1.8 2002/10/16 02:19:22 dawes Exp $ */

 /*

 

 Copyright 1987, 1988, 1998  The Open Group

@@ -24,7 +23,6 @@ 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: Xcup.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/Xdbe.c b/libXext/src/Xdbe.c
index 5b8573e19..930b51f60 100644
--- a/libXext/src/Xdbe.c
+++ b/libXext/src/Xdbe.c
@@ -1,4 +1,3 @@
-/* $Xorg: Xdbe.c,v 1.4 2000/08/17 19:45:53 cpqbld Exp $ */

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

  * 

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

@@ -30,7 +29,6 @@
  *     Xlib DBE code

  *

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

-/* $XFree86: xc/lib/Xext/Xdbe.c,v 3.7 2002/10/16 02:19:22 dawes Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/extutil.c b/libXext/src/extutil.c
index 144af9072..8813c1154 100644
--- a/libXext/src/extutil.c
+++ b/libXext/src/extutil.c
@@ -1,5 +1,4 @@
 /*

- * $Xorg: extutil.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $

  *

 Copyright 1989, 1998  The Open Group

 

@@ -45,7 +44,6 @@ in this Software without prior written authorization from The Open Group.
  *         XSetExtensionErrorHandler	establish an extension error handler

  *         XMissingExtension		raise an error about missing ext

  */

-/* $XFree86: xc/lib/Xext/extutil.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */

 

 #ifdef HAVE_CONFIG_H

 #include <config.h>

diff --git a/libXext/src/globals.c b/libXext/src/globals.c
index c20dbacd4..a40492abe 100644
--- a/libXext/src/globals.c
+++ b/libXext/src/globals.c
@@ -1,89 +1,87 @@
-/* $Xorg: globals.c,v 1.4 2001/02/09 02:03:50 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/lib/Xext/globals.c,v 3.4 2001/07/29 05:01:12 tsi Exp $ */
-
-/*
- * This file should contain only those objects which must be predefined.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xlib.h>
-#include <X11/extensions/Xext.h>
-#include <stddef.h>			/* for definition of NULL */
-
-/*
- * If possible, it is useful to have the global data default to a null value.
- * Some shared library implementations are *much* happier if there isn't any
- * global initialized data.
- */
-#ifdef NULL_NOT_ZERO			/* then need to initialize */
-#define SetZero(t,var,z) t var = z
-#else 
-#define SetZero(t,var,z) t var
-#endif
-
-#ifdef ATTSHAREDLIB			/* then need extra variables */
-/*
- * If we need to define extra variables for each global
- */
-#if !defined(UNIXCPP) || defined(ANSICPP)
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
-  SetZero (long, _libX_##var##Flag, 0); \
-  SetZero (void *, _libX_##var##Ptr, NULL)
-#else /* else pcc concatenation */
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
-  SetZero (long, _libX_/**/var/**/Flag, 0); \
-  SetZero (void *, _libX_/**/var/**/Ptr, NULL)
-#endif /* concat ANSI C vs. pcc */
-
-#else /* else not ATTSHAREDLIB */
-/*
- * no extra crud
- */
-#define ZEROINIT(t,var,val) SetZero (t, var, val)
-
-#endif /* ATTSHAREDLIB */
-
-
-/*
- * Error handlers; used to be in XlibInt.c
- */
-ZEROINIT (XextErrorHandler, _XExtensionErrorFunction, NULL);
-
-/*
- * NOTE: any additional external definition NEED
- * to be inserted BELOW this point!!!
- */
-
-/*
- * NOTE: any additional external definition NEED
- * to be inserted ABOVE this point!!!
- */
-
+/*

+

+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 file should contain only those objects which must be predefined.

+ */

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/Xlib.h>

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

+#include <stddef.h>			/* for definition of NULL */

+

+/*

+ * If possible, it is useful to have the global data default to a null value.

+ * Some shared library implementations are *much* happier if there isn't any

+ * global initialized data.

+ */

+#ifdef NULL_NOT_ZERO			/* then need to initialize */

+#define SetZero(t,var,z) t var = z

+#else 

+#define SetZero(t,var,z) t var

+#endif

+

+#ifdef ATTSHAREDLIB			/* then need extra variables */

+/*

+ * If we need to define extra variables for each global

+ */

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

+#define ZEROINIT(t,var,val) SetZero(t,var,val); \

+  SetZero (long, _libX_##var##Flag, 0); \

+  SetZero (void *, _libX_##var##Ptr, NULL)

+#else /* else pcc concatenation */

+#define ZEROINIT(t,var,val) SetZero(t,var,val); \

+  SetZero (long, _libX_/**/var/**/Flag, 0); \

+  SetZero (void *, _libX_/**/var/**/Ptr, NULL)

+#endif /* concat ANSI C vs. pcc */

+

+#else /* else not ATTSHAREDLIB */

+/*

+ * no extra crud

+ */

+#define ZEROINIT(t,var,val) SetZero (t, var, val)

+

+#endif /* ATTSHAREDLIB */

+

+

+/*

+ * Error handlers; used to be in XlibInt.c

+ */

+ZEROINIT (XextErrorHandler, _XExtensionErrorFunction, NULL);

+

+/*

+ * NOTE: any additional external definition NEED

+ * to be inserted BELOW this point!!!

+ */

+

+/*

+ * NOTE: any additional external definition NEED

+ * to be inserted ABOVE this point!!!

+ */

+

diff --git a/libXinerama/src/Xinerama.c b/libXinerama/src/Xinerama.c
index cbb4b5238..ac5ecb7af 100644
--- a/libXinerama/src/Xinerama.c
+++ b/libXinerama/src/Xinerama.c
@@ -1,4 +1,3 @@
-/* $Xorg: XPanoramiX.c,v 1.4 2000/08/17 19:45:51 cpqbld Exp $ */

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

 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.

 Permission is hereby granted, free of charge, to any person obtaining a copy

@@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital

 Equipment Corporation.

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

-/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.2 2001/07/23 17:20:28 dawes Exp $ */

 

 #include <X11/Xlibint.h>

 #include <X11/Xutil.h>

diff --git a/xorg-server/hw/xfree86/modes/xf86EdidModes.c b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
index ecc1b110d..f8cd9a0ca 100644
--- a/xorg-server/hw/xfree86/modes/xf86EdidModes.c
+++ b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
@@ -484,8 +484,8 @@ DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks,
 	     (hsize == 1368 && vsize == 769))) {

 	    Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE);

 	    Mode->HDisplay = 1366;

-	    Mode->VSyncStart--;

-	    Mode->VSyncEnd--;

+	    Mode->HSyncStart--;

+	    Mode->HSyncEnd--;

 	} else if (hsize && vsize && refresh) {

 	    Mode = FindDMTMode(hsize, vsize, refresh, rb);

 

diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c
index 11b1f25eb..56ac5f6b7 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.c
+++ b/xorg-server/hw/xfree86/vbe/vbe.c
@@ -527,69 +527,9 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
     if (R16(pVbe->pInt10->ax) != 0x4f)

 	return NULL;

 

-    block = calloc(sizeof(VbeModeInfoBlock), 1);

-

-    block->ModeAttributes = *(CARD16*)pVbe->memory;

-    block->WinAAttributes = ((char*)pVbe->memory)[2];

-    block->WinBAttributes = ((char*)pVbe->memory)[3];

-    block->WinGranularity = *(CARD16*)(((char*)pVbe->memory) + 4);

-    block->WinSize = *(CARD16*)(((char*)pVbe->memory) + 6);

-    block->WinASegment = *(CARD16*)(((char*)pVbe->memory) + 8);

-    block->WinBSegment = *(CARD16*)(((char*)pVbe->memory) + 10);

-    block->WinFuncPtr = *(CARD32*)(((char*)pVbe->memory) + 12);

-    block->BytesPerScanline = *(CARD16*)(((char*)pVbe->memory) + 16);

-

-    /* mandatory information for VBE 1.2 and above */

-    block->XResolution = *(CARD16*)(((char*)pVbe->memory) + 18);

-    block->YResolution = *(CARD16*)(((char*)pVbe->memory) + 20);

-    block->XCharSize = ((char*)pVbe->memory)[22];

-    block->YCharSize = ((char*)pVbe->memory)[23];

-    block->NumberOfPlanes = ((char*)pVbe->memory)[24];

-    block->BitsPerPixel = ((char*)pVbe->memory)[25];

-    block->NumberOfBanks = ((char*)pVbe->memory)[26];

-    block->MemoryModel = ((char*)pVbe->memory)[27];

-    block->BankSize = ((char*)pVbe->memory)[28];

-    block->NumberOfImages = ((char*)pVbe->memory)[29];

-    block->Reserved = ((char*)pVbe->memory)[30];

-

-    /* Direct color fields (required for direct/6 and YUV/7 memory models) */

-    block->RedMaskSize = ((char*)pVbe->memory)[31];

-    block->RedFieldPosition = ((char*)pVbe->memory)[32];

-    block->GreenMaskSize = ((char*)pVbe->memory)[33];

-    block->GreenFieldPosition = ((char*)pVbe->memory)[34];

-    block->BlueMaskSize = ((char*)pVbe->memory)[35];

-    block->BlueFieldPosition = ((char*)pVbe->memory)[36];

-    block->RsvdMaskSize = ((char*)pVbe->memory)[37];

-    block->RsvdFieldPosition = ((char*)pVbe->memory)[38];

-    block->DirectColorModeInfo = ((char*)pVbe->memory)[39];

-

-    /* Mandatory information for VBE 2.0 and above */

-    if (pVbe->version >= 0x200) {

-	block->PhysBasePtr = *(CARD32*)(((char*)pVbe->memory) + 40);

-	block->Reserved32 = *(CARD32*)(((char*)pVbe->memory) + 44);

-	block->Reserved16 = *(CARD16*)(((char*)pVbe->memory) + 48);

-

-	/* Mandatory information for VBE 3.0 and above */

-	if (pVbe->version >= 0x300) {

-	    block->LinBytesPerScanLine = *(CARD16*)(((char*)pVbe->memory) + 50);

-	    block->BnkNumberOfImagePages = ((char*)pVbe->memory)[52];

-	    block->LinNumberOfImagePages = ((char*)pVbe->memory)[53];

-	    block->LinRedMaskSize = ((char*)pVbe->memory)[54];

-	    block->LinRedFieldPosition = ((char*)pVbe->memory)[55];

-	    block->LinGreenMaskSize = ((char*)pVbe->memory)[56];

-	    block->LinGreenFieldPosition = ((char*)pVbe->memory)[57];

-	    block->LinBlueMaskSize = ((char*)pVbe->memory)[58];

-	    block->LinBlueFieldPosition = ((char*)pVbe->memory)[59];

-	    block->LinRsvdMaskSize = ((char*)pVbe->memory)[60];

-	    block->LinRsvdFieldPosition = ((char*)pVbe->memory)[61];

-	    block->MaxPixelClock = *(CARD32*)(((char*)pVbe->memory) + 62);

-	    memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188);

-	}

-	else

-	memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206);

-    }

-    else

-	memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);

+    block = malloc(sizeof(VbeModeInfoBlock));

+    if (block)

+	memcpy(block, pVbe->memory, sizeof(*block));

 

     return block;

 }