Synchronised files

23 files changed, 2471 insertions, 2548 deletions

diff --git a/X11/Xmu/Atoms.h b/X11/Xmu/Atoms.h
index f7b4c8f7e..2292edb4a 100644
--- a/X11/Xmu/Atoms.h
+++ b/X11/Xmu/Atoms.h
@@ -1,126 +1,123 @@
-/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 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/Xmu/Atoms.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_ATOMS_H_
-#define _XMU_ATOMS_H_
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-typedef struct _AtomRec *AtomPtr;
-
-extern AtomPtr
-    _XA_ATOM_PAIR,
-    _XA_CHARACTER_POSITION,
-    _XA_CLASS,
-    _XA_CLIENT_WINDOW,
-    _XA_CLIPBOARD,
-    _XA_COMPOUND_TEXT,
-    _XA_DECNET_ADDRESS,
-    _XA_DELETE,
-    _XA_FILENAME,
-    _XA_HOSTNAME,
-    _XA_IP_ADDRESS,
-    _XA_LENGTH,
-    _XA_LIST_LENGTH,
-    _XA_NAME,
-    _XA_NET_ADDRESS,
-    _XA_NULL,
-    _XA_OWNER_OS,
-    _XA_SPAN,
-    _XA_TARGETS,
-    _XA_TEXT,
-    _XA_TIMESTAMP,
-    _XA_USER,
-    _XA_UTF8_STRING;
-
-#define XA_ATOM_PAIR(d)		XmuInternAtom(d, _XA_ATOM_PAIR)
-#define XA_CHARACTER_POSITION(d) XmuInternAtom(d, _XA_CHARACTER_POSITION)
-#define XA_CLASS(d)		XmuInternAtom(d, _XA_CLASS)
-#define XA_CLIENT_WINDOW(d)	XmuInternAtom(d, _XA_CLIENT_WINDOW)
-#define XA_CLIPBOARD(d)		XmuInternAtom(d, _XA_CLIPBOARD)
-#define XA_COMPOUND_TEXT(d)	XmuInternAtom(d, _XA_COMPOUND_TEXT)
-#define XA_DECNET_ADDRESS(d)	XmuInternAtom(d, _XA_DECNET_ADDRESS)
-#define XA_DELETE(d)		XmuInternAtom(d, _XA_DELETE)
-#define XA_FILENAME(d)		XmuInternAtom(d, _XA_FILENAME)
-#define XA_HOSTNAME(d)		XmuInternAtom(d, _XA_HOSTNAME)
-#define XA_IP_ADDRESS(d)	XmuInternAtom(d, _XA_IP_ADDRESS)
-#define XA_LENGTH(d)		XmuInternAtom(d, _XA_LENGTH)
-#define XA_LIST_LENGTH(d)	XmuInternAtom(d, _XA_LIST_LENGTH)
-#define XA_NAME(d)		XmuInternAtom(d, _XA_NAME)
-#define XA_NET_ADDRESS(d)	XmuInternAtom(d, _XA_NET_ADDRESS)
-#define XA_NULL(d)		XmuInternAtom(d, _XA_NULL)
-#define XA_OWNER_OS(d)		XmuInternAtom(d, _XA_OWNER_OS)
-#define XA_SPAN(d)		XmuInternAtom(d, _XA_SPAN)
-#define XA_TARGETS(d)		XmuInternAtom(d, _XA_TARGETS)
-#define XA_TEXT(d)		XmuInternAtom(d, _XA_TEXT)
-#define XA_TIMESTAMP(d)		XmuInternAtom(d, _XA_TIMESTAMP)
-#define XA_USER(d)		XmuInternAtom(d, _XA_USER)
-#define XA_UTF8_STRING(d)	XmuInternAtom(d, _XA_UTF8_STRING)
-
-_XFUNCPROTOBEGIN
-
-char *XmuGetAtomName
-(
- Display	*dpy,
- Atom		atom
- );
-
-Atom XmuInternAtom
-(
- Display	*dpy,
- AtomPtr	atom_ptr
- );
-
-void XmuInternStrings
-(
- Display	*dpy,
- String		*names,
- Cardinal    	count,
- Atom		*atoms_return
-);
-
-AtomPtr XmuMakeAtom
-(
- _Xconst char	*name
- );
-
-char *XmuNameOfAtom
-(
- AtomPtr	atom_ptr
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_ATOMS_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_ATOMS_H_

+#define _XMU_ATOMS_H_

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+typedef struct _AtomRec *AtomPtr;

+

+extern AtomPtr

+    _XA_ATOM_PAIR,

+    _XA_CHARACTER_POSITION,

+    _XA_CLASS,

+    _XA_CLIENT_WINDOW,

+    _XA_CLIPBOARD,

+    _XA_COMPOUND_TEXT,

+    _XA_DECNET_ADDRESS,

+    _XA_DELETE,

+    _XA_FILENAME,

+    _XA_HOSTNAME,

+    _XA_IP_ADDRESS,

+    _XA_LENGTH,

+    _XA_LIST_LENGTH,

+    _XA_NAME,

+    _XA_NET_ADDRESS,

+    _XA_NULL,

+    _XA_OWNER_OS,

+    _XA_SPAN,

+    _XA_TARGETS,

+    _XA_TEXT,

+    _XA_TIMESTAMP,

+    _XA_USER,

+    _XA_UTF8_STRING;

+

+#define XA_ATOM_PAIR(d)		XmuInternAtom(d, _XA_ATOM_PAIR)

+#define XA_CHARACTER_POSITION(d) XmuInternAtom(d, _XA_CHARACTER_POSITION)

+#define XA_CLASS(d)		XmuInternAtom(d, _XA_CLASS)

+#define XA_CLIENT_WINDOW(d)	XmuInternAtom(d, _XA_CLIENT_WINDOW)

+#define XA_CLIPBOARD(d)		XmuInternAtom(d, _XA_CLIPBOARD)

+#define XA_COMPOUND_TEXT(d)	XmuInternAtom(d, _XA_COMPOUND_TEXT)

+#define XA_DECNET_ADDRESS(d)	XmuInternAtom(d, _XA_DECNET_ADDRESS)

+#define XA_DELETE(d)		XmuInternAtom(d, _XA_DELETE)

+#define XA_FILENAME(d)		XmuInternAtom(d, _XA_FILENAME)

+#define XA_HOSTNAME(d)		XmuInternAtom(d, _XA_HOSTNAME)

+#define XA_IP_ADDRESS(d)	XmuInternAtom(d, _XA_IP_ADDRESS)

+#define XA_LENGTH(d)		XmuInternAtom(d, _XA_LENGTH)

+#define XA_LIST_LENGTH(d)	XmuInternAtom(d, _XA_LIST_LENGTH)

+#define XA_NAME(d)		XmuInternAtom(d, _XA_NAME)

+#define XA_NET_ADDRESS(d)	XmuInternAtom(d, _XA_NET_ADDRESS)

+#define XA_NULL(d)		XmuInternAtom(d, _XA_NULL)

+#define XA_OWNER_OS(d)		XmuInternAtom(d, _XA_OWNER_OS)

+#define XA_SPAN(d)		XmuInternAtom(d, _XA_SPAN)

+#define XA_TARGETS(d)		XmuInternAtom(d, _XA_TARGETS)

+#define XA_TEXT(d)		XmuInternAtom(d, _XA_TEXT)

+#define XA_TIMESTAMP(d)		XmuInternAtom(d, _XA_TIMESTAMP)

+#define XA_USER(d)		XmuInternAtom(d, _XA_USER)

+#define XA_UTF8_STRING(d)	XmuInternAtom(d, _XA_UTF8_STRING)

+

+_XFUNCPROTOBEGIN

+

+char *XmuGetAtomName

+(

+ Display	*dpy,

+ Atom		atom

+ );

+

+Atom XmuInternAtom

+(

+ Display	*dpy,

+ AtomPtr	atom_ptr

+ );

+

+void XmuInternStrings

+(

+ Display	*dpy,

+ String		*names,

+ Cardinal    	count,

+ Atom		*atoms_return

+);

+

+AtomPtr XmuMakeAtom

+(

+ _Xconst char	*name

+ );

+

+char *XmuNameOfAtom

+(

+ AtomPtr	atom_ptr

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_ATOMS_H_ */

diff --git a/X11/Xmu/CharSet.h b/X11/Xmu/CharSet.h
index 32cebfeda..8bf4b7b4c 100644
--- a/X11/Xmu/CharSet.h
+++ b/X11/Xmu/CharSet.h
@@ -1,77 +1,73 @@
-/* $Xorg: CharSet.h,v 1.4 2001/02/09 02:03:51 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/Xmu/CharSet.h,v 1.7 2001/01/17 19:42:53 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_CHARSET_H_
-#define _XMU_CHARSET_H_
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-void XmuCopyISOLatin1Lowered
-(
- char		*dst_return,
- _Xconst char	*src
- );
-
-void XmuCopyISOLatin1Uppered
-(
- char		*dst_return,
- _Xconst char	*src
- );
-
-int XmuCompareISOLatin1
-(
- _Xconst char	*first,
- _Xconst char	*second
- );
-
-void XmuNCopyISOLatin1Lowered
-(
- char		*dst_return,
- _Xconst char	*src,
- int		 size
- );
-
-void XmuNCopyISOLatin1Uppered
-(
- char		*dst_return,
- _Xconst char	*src,
- int		size
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_CHARSET_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_CHARSET_H_

+#define _XMU_CHARSET_H_

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+void XmuCopyISOLatin1Lowered

+(

+ char		*dst_return,

+ _Xconst char	*src

+ );

+

+void XmuCopyISOLatin1Uppered

+(

+ char		*dst_return,

+ _Xconst char	*src

+ );

+

+int XmuCompareISOLatin1

+(

+ _Xconst char	*first,

+ _Xconst char	*second

+ );

+

+void XmuNCopyISOLatin1Lowered

+(

+ char		*dst_return,

+ _Xconst char	*src,

+ int		 size

+ );

+

+void XmuNCopyISOLatin1Uppered

+(

+ char		*dst_return,

+ _Xconst char	*src,

+ int		size

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_CHARSET_H_ */

diff --git a/X11/Xmu/CloseHook.h b/X11/Xmu/CloseHook.h
index 1940a793b..cbe1857bb 100644
--- a/X11/Xmu/CloseHook.h
+++ b/X11/Xmu/CloseHook.h
@@ -1,73 +1,70 @@
-/* $Xorg: CloseHook.h,v 1.5 2001/02/09 02:03:51 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/Xmu/CloseHook.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_CLOSEHOOK_H_
-#define _XMU_CLOSEHOOK_H_
-
-#include <X11/Xlib.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xlibint.h>
-
-typedef XPointer CloseHook;
-
-typedef int (*XmuCloseHookProc)(Display *dpy, XPointer data);
-
-_XFUNCPROTOBEGIN
-
-CloseHook XmuAddCloseDisplayHook
-(
- Display		*dpy,
- XmuCloseHookProc	proc,
- XPointer		arg
- );
-
-Bool XmuLookupCloseDisplayHook
-(
- Display		*dpy,
- CloseHook		handle,
- XmuCloseHookProc	proc,
- XPointer		arg
- );
-
-Bool XmuRemoveCloseDisplayHook
-(
- Display		*dpy,
- CloseHook		handle,
- XmuCloseHookProc	proc,
- XPointer		arg
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_CLOSEHOOK_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_CLOSEHOOK_H_

+#define _XMU_CLOSEHOOK_H_

+

+#include <X11/Xlib.h>

+#include <X11/Xfuncproto.h>

+#include <X11/Xlibint.h>

+

+typedef XPointer CloseHook;

+

+typedef int (*XmuCloseHookProc)(Display *dpy, XPointer data);

+

+_XFUNCPROTOBEGIN

+

+CloseHook XmuAddCloseDisplayHook

+(

+ Display		*dpy,

+ XmuCloseHookProc	proc,

+ XPointer		arg

+ );

+

+Bool XmuLookupCloseDisplayHook

+(

+ Display		*dpy,

+ CloseHook		handle,

+ XmuCloseHookProc	proc,

+ XPointer		arg

+ );

+

+Bool XmuRemoveCloseDisplayHook

+(

+ Display		*dpy,

+ CloseHook		handle,

+ XmuCloseHookProc	proc,

+ XPointer		arg

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_CLOSEHOOK_H_ */

diff --git a/X11/Xmu/Converters.h b/X11/Xmu/Converters.h
index 11055d950..083fdebbf 100644
--- a/X11/Xmu/Converters.h
+++ b/X11/Xmu/Converters.h
@@ -1,281 +1,277 @@
-/* $Xorg: Converters.h,v 1.5 2001/02/09 02:03:51 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/Xmu/Converters.h,v 1.5 2001/01/17 19:42:53 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_STRCONVERT_H_
-#define _XMU_STRCONVERT_H_
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-void XmuCvtFunctionToCallback
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-#define XtNbackingStore "backingStore"
-#define XtCBackingStore "BackingStore"
-#define XtRBackingStore "BackingStore"
-#define XtEnotUseful "notUseful"
-#define XtEwhenMapped "whenMapped"
-#define XtEalways "always"
-#define XtEdefault "default"
-void XmuCvtStringToBackingStore
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-Boolean XmuCvtBackingStoreToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-void XmuCvtStringToCursor
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-#define XtRColorCursor "ColorCursor"
-#define XtNpointerColor "pointerColor"
-#define XtNpointerColorBackground "pointerColorBackground"
-Boolean XmuCvtStringToColorCursor
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-typedef int XtGravity;
-
-#ifndef XtRGravity
-#define XtRGravity "Gravity"
-#endif
-#define XtEForget "forget"
-#define XtENorthWest "northwest"
-#define XtENorth "north"
-#define XtENorthEast "northeast"
-#define XtEWest "west"
-#define XtECenter "center"
-#define XtEEast "east"
-#define XtESouthWest "southwest"
-#define XtESouth "south"
-#define XtESouthEast "southeast"
-#define XtEStatic "static"
-#define XtEUnmap "unmap"
-void XmuCvtStringToGravity
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-Boolean XmuCvtGravityToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-typedef enum {
-    XtJustifyLeft,       /* justify text to left side of button   */
-    XtJustifyCenter,     /* justify text in center of button      */
-    XtJustifyRight       /* justify text to right side of button  */
-} XtJustify;
-#ifndef XtRJustify
-#define XtRJustify "Justify"
-#endif
-#define XtEleft "left"
-#define XtEcenter "center"
-#define XtEright "right"
-#define XtEtop "top"
-#define XtEbottom "bottom"
-void XmuCvtStringToJustify
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-Boolean XmuCvtJustifyToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-#define XtRLong "Long"
-void XmuCvtStringToLong
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-Boolean XmuCvtLongToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-typedef enum {
-  XtorientHorizontal,
-  XtorientVertical
-} XtOrientation;
-void XmuCvtStringToOrientation
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-Boolean XmuCvtOrientationToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-void XmuCvtStringToBitmap
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-#define XtRShapeStyle "ShapeStyle"
-#define XtERectangle "Rectangle"
-#define XtEOval "Oval"
-#define XtEEllipse "Ellipse"
-#define XtERoundedRectangle "RoundedRectangle"
-
-#define XmuShapeRectangle 1
-#define XmuShapeOval 2
-#define XmuShapeEllipse 3
-#define XmuShapeRoundedRectangle 4
-
-Boolean XmuCvtStringToShapeStyle
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-Boolean XmuCvtShapeStyleToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal,
- XtPointer		*converter_data
- );
-
-Boolean XmuReshapeWidget
-(
- Widget			w,
- int			shape_style,
- int			corner_width,
- int			corner_height
- );
-
-void XmuCvtStringToWidget
-(
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValuePtr		fromVal,
- XrmValuePtr		toVal
- );
-
-Boolean XmuNewCvtStringToWidget
-(
- Display		*display,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValue		*fromVal,
- XrmValue		*toVal,
- XtPointer		*converter_data
- );
-
-Boolean XmuCvtWidgetToString
-(
- Display		*dpy,
- XrmValue		*args,
- Cardinal		*num_args,
- XrmValue		*fromVal,
- XrmValue		*toVal,
- XtPointer		*converter_data
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_STRCONVERT_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_STRCONVERT_H_

+#define _XMU_STRCONVERT_H_

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+void XmuCvtFunctionToCallback

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+#define XtNbackingStore "backingStore"

+#define XtCBackingStore "BackingStore"

+#define XtRBackingStore "BackingStore"

+#define XtEnotUseful "notUseful"

+#define XtEwhenMapped "whenMapped"

+#define XtEalways "always"

+#define XtEdefault "default"

+void XmuCvtStringToBackingStore

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+Boolean XmuCvtBackingStoreToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+void XmuCvtStringToCursor

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+#define XtRColorCursor "ColorCursor"

+#define XtNpointerColor "pointerColor"

+#define XtNpointerColorBackground "pointerColorBackground"

+Boolean XmuCvtStringToColorCursor

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+typedef int XtGravity;

+

+#ifndef XtRGravity

+#define XtRGravity "Gravity"

+#endif

+#define XtEForget "forget"

+#define XtENorthWest "northwest"

+#define XtENorth "north"

+#define XtENorthEast "northeast"

+#define XtEWest "west"

+#define XtECenter "center"

+#define XtEEast "east"

+#define XtESouthWest "southwest"

+#define XtESouth "south"

+#define XtESouthEast "southeast"

+#define XtEStatic "static"

+#define XtEUnmap "unmap"

+void XmuCvtStringToGravity

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+Boolean XmuCvtGravityToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+typedef enum {

+    XtJustifyLeft,       /* justify text to left side of button   */

+    XtJustifyCenter,     /* justify text in center of button      */

+    XtJustifyRight       /* justify text to right side of button  */

+} XtJustify;

+#ifndef XtRJustify

+#define XtRJustify "Justify"

+#endif

+#define XtEleft "left"

+#define XtEcenter "center"

+#define XtEright "right"

+#define XtEtop "top"

+#define XtEbottom "bottom"

+void XmuCvtStringToJustify

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+Boolean XmuCvtJustifyToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+#define XtRLong "Long"

+void XmuCvtStringToLong

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+Boolean XmuCvtLongToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+typedef enum {

+  XtorientHorizontal,

+  XtorientVertical

+} XtOrientation;

+void XmuCvtStringToOrientation

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+Boolean XmuCvtOrientationToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+void XmuCvtStringToBitmap

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+#define XtRShapeStyle "ShapeStyle"

+#define XtERectangle "Rectangle"

+#define XtEOval "Oval"

+#define XtEEllipse "Ellipse"

+#define XtERoundedRectangle "RoundedRectangle"

+

+#define XmuShapeRectangle 1

+#define XmuShapeOval 2

+#define XmuShapeEllipse 3

+#define XmuShapeRoundedRectangle 4

+

+Boolean XmuCvtStringToShapeStyle

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+Boolean XmuCvtShapeStyleToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal,

+ XtPointer		*converter_data

+ );

+

+Boolean XmuReshapeWidget

+(

+ Widget			w,

+ int			shape_style,

+ int			corner_width,

+ int			corner_height

+ );

+

+void XmuCvtStringToWidget

+(

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValuePtr		fromVal,

+ XrmValuePtr		toVal

+ );

+

+Boolean XmuNewCvtStringToWidget

+(

+ Display		*display,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValue		*fromVal,

+ XrmValue		*toVal,

+ XtPointer		*converter_data

+ );

+

+Boolean XmuCvtWidgetToString

+(

+ Display		*dpy,

+ XrmValue		*args,

+ Cardinal		*num_args,

+ XrmValue		*fromVal,

+ XrmValue		*toVal,

+ XtPointer		*converter_data

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_STRCONVERT_H_ */

diff --git a/X11/Xmu/CurUtil.h b/X11/Xmu/CurUtil.h
index 27ab18848..ce3d344c8 100644
--- a/X11/Xmu/CurUtil.h
+++ b/X11/Xmu/CurUtil.h
@@ -1,49 +1,46 @@
-/* $Xorg: CurUtil.h,v 1.4 2001/02/09 02:03:51 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/Xmu/CurUtil.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_CURUTIL_H_
-#define _XMU_CURUTIL_H_
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-int XmuCursorNameToIndex
-(
- _Xconst char	*name
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_CURUTIL_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_CURUTIL_H_

+#define _XMU_CURUTIL_H_

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+int XmuCursorNameToIndex

+(

+ _Xconst char	*name

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_CURUTIL_H_ */

diff --git a/X11/Xmu/CvtCache.h b/X11/Xmu/CvtCache.h
index d9b967ab7..8ebec3722 100644
--- a/X11/Xmu/CvtCache.h
+++ b/X11/Xmu/CvtCache.h
@@ -1,62 +1,59 @@
-/* $Xorg: CvtCache.h,v 1.4 2001/02/09 02:03:52 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/Xmu/CvtCache.h,v 1.6 2001/01/17 19:42:54 dawes Exp $ */
-
-/*
- *			       Public Interfaces
- * 
- * XmuCvtCache *XmuCvtCacheLookupDisplay (dpy)
- *     Display *dpy;
- */
-
-#ifndef _XMU_CVTCACHE_H_
-#define _XMU_CVTCACHE_H_
-
-#include <X11/Xmu/DisplayQue.h>
-#include <X11/Xfuncproto.h>
-
-typedef struct _XmuCvtCache {
-    struct {
-	char **bitmapFilePath;
-    } string_to_bitmap;
-    /* add other per-display data that needs to be cached */
-} XmuCvtCache;
-
-_XFUNCPROTOBEGIN
-
-XmuCvtCache *_XmuCCLookupDisplay
-(
- Display	*dpy
- );
-
-extern void _XmuStringToBitmapInitCache(XmuCvtCache *c);
-extern void _XmuStringToBitmapFreeCache(XmuCvtCache *c);
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_CVTCACHE_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.

+

+*/

+

+/*

+ *			       Public Interfaces

+ * 

+ * XmuCvtCache *XmuCvtCacheLookupDisplay (dpy)

+ *     Display *dpy;

+ */

+

+#ifndef _XMU_CVTCACHE_H_

+#define _XMU_CVTCACHE_H_

+

+#include <X11/Xmu/DisplayQue.h>

+#include <X11/Xfuncproto.h>

+

+typedef struct _XmuCvtCache {

+    struct {

+	char **bitmapFilePath;

+    } string_to_bitmap;

+    /* add other per-display data that needs to be cached */

+} XmuCvtCache;

+

+_XFUNCPROTOBEGIN

+

+XmuCvtCache *_XmuCCLookupDisplay

+(

+ Display	*dpy

+ );

+

+extern void _XmuStringToBitmapInitCache(XmuCvtCache *c);

+extern void _XmuStringToBitmapFreeCache(XmuCvtCache *c);

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_CVTCACHE_H_ */

diff --git a/X11/Xmu/DisplayQue.h b/X11/Xmu/DisplayQue.h
index 9f9013c1e..099844f59 100644
--- a/X11/Xmu/DisplayQue.h
+++ b/X11/Xmu/DisplayQue.h
@@ -1,155 +1,152 @@
-/* $Xorg: DisplayQue.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */
-
-#ifndef _XMU_DISPLAYQUE_H_
-#define _XMU_DISPLAYQUE_H_
-
-#include <X11/Xmu/CloseHook.h>
-#include <X11/Xfuncproto.h>
-
-/*
- *			      Public Entry Points
- * 
- * 
- * XmuDisplayQueue *XmuDQCreate (closefunc, freefunc, data)
- *     XmuCloseDisplayQueueProc closefunc;
- *     XmuFreeDisplayQueueProc freefunc;
- *     XPointer data;
- * 
- *         Creates and returns a queue into which displays may be placed.  When
- *         the display is closed, the closefunc (if non-NULL) is upcalled with
- *         as follows:
- *
- *                 (*closefunc) (queue, entry)
- *
- *         The freeproc, if non-NULL, is called whenever the last display is
- *         closed, notifying the creator that display queue may be released
- *         using XmuDQDestroy.
- *
- *
- * Bool XmuDQDestroy (q, docallbacks)
- *     XmuDisplayQueue *q;
- *     Bool docallbacks;
- * 
- *         Releases all memory for the indicated display queue.  If docallbacks
- *         is true, then the closefunc (if non-NULL) is called for each 
- *         display.
- * 
- * 
- * XmuDisplayQueueEntry *XmuDQLookupDisplay (q, dpy)
- *     XmuDisplayQueue *q;
- *     Display *dpy;
- *
- *         Returns the queue entry for the specified display or NULL if the
- *         display is not in the queue.
- *
- * 
- * XmuDisplayQueueEntry *XmuDQAddDisplay (q, dpy, data)
- *     XmuDisplayQueue *q;
- *     Display *dpy;
- *     XPointer data;
- *
- *         Adds the indicated display to the end of the queue or NULL if it
- *         is unable to allocate memory.  The data field may be used by the
- *         caller to attach arbitrary data to this display in this queue.  The
- *         caller should use XmuDQLookupDisplay to make sure that the display
- *         hasn't already been added.
- * 
- * 
- * Bool XmuDQRemoveDisplay (q, dpy)
- *     XmuDisplayQueue *q;
- *     Display *dpy;
- *
- *         Removes the specified display from the given queue.  If the 
- *         indicated display is not found on this queue, False is returned,
- *         otherwise True is returned.
- */
-
-typedef struct _XmuDisplayQueue XmuDisplayQueue;
-typedef struct _XmuDisplayQueueEntry XmuDisplayQueueEntry;
-
-typedef int (*XmuCloseDisplayQueueProc)(XmuDisplayQueue *queue,
-					XmuDisplayQueueEntry *entry);
-
-typedef int (*XmuFreeDisplayQueueProc)(XmuDisplayQueue *queue);
-
-struct _XmuDisplayQueueEntry {
-    struct _XmuDisplayQueueEntry *prev, *next;
-    Display *display;
-    CloseHook closehook;
-    XPointer data;
-};
-
-struct _XmuDisplayQueue {
-    int nentries;
-    XmuDisplayQueueEntry *head, *tail;
-    XmuCloseDisplayQueueProc closefunc;
-    XmuFreeDisplayQueueProc freefunc;
-    XPointer data;
-};
-
-_XFUNCPROTOBEGIN
-
-XmuDisplayQueue *XmuDQCreate
-(
- XmuCloseDisplayQueueProc	closefunc,
- XmuFreeDisplayQueueProc	freefunc,
- XPointer			data
- );
-
-Bool XmuDQDestroy
-(
- XmuDisplayQueue		*q,
- Bool				docallbacks
- );
-
-XmuDisplayQueueEntry *XmuDQLookupDisplay
-(
- XmuDisplayQueue		*q,
- Display			*dpy
- );
-
-XmuDisplayQueueEntry *XmuDQAddDisplay
-(
- XmuDisplayQueue		*q,
- Display			*dpy,
- XPointer			data
- );
-
-Bool XmuDQRemoveDisplay
-(
- XmuDisplayQueue		*q,
- Display			*dpy
- );
-
-_XFUNCPROTOEND
-
-#define XmuDQNDisplays(q) ((q)->nentries)
-
-#endif /* _XMU_DISPLAYQUE_H_ */
+/*

+

+Copyright 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+*/

+

+#ifndef _XMU_DISPLAYQUE_H_

+#define _XMU_DISPLAYQUE_H_

+

+#include <X11/Xmu/CloseHook.h>

+#include <X11/Xfuncproto.h>

+

+/*

+ *			      Public Entry Points

+ * 

+ * 

+ * XmuDisplayQueue *XmuDQCreate (closefunc, freefunc, data)

+ *     XmuCloseDisplayQueueProc closefunc;

+ *     XmuFreeDisplayQueueProc freefunc;

+ *     XPointer data;

+ * 

+ *         Creates and returns a queue into which displays may be placed.  When

+ *         the display is closed, the closefunc (if non-NULL) is upcalled with

+ *         as follows:

+ *

+ *                 (*closefunc) (queue, entry)

+ *

+ *         The freeproc, if non-NULL, is called whenever the last display is

+ *         closed, notifying the creator that display queue may be released

+ *         using XmuDQDestroy.

+ *

+ *

+ * Bool XmuDQDestroy (q, docallbacks)

+ *     XmuDisplayQueue *q;

+ *     Bool docallbacks;

+ * 

+ *         Releases all memory for the indicated display queue.  If docallbacks

+ *         is true, then the closefunc (if non-NULL) is called for each 

+ *         display.

+ * 

+ * 

+ * XmuDisplayQueueEntry *XmuDQLookupDisplay (q, dpy)

+ *     XmuDisplayQueue *q;

+ *     Display *dpy;

+ *

+ *         Returns the queue entry for the specified display or NULL if the

+ *         display is not in the queue.

+ *

+ * 

+ * XmuDisplayQueueEntry *XmuDQAddDisplay (q, dpy, data)

+ *     XmuDisplayQueue *q;

+ *     Display *dpy;

+ *     XPointer data;

+ *

+ *         Adds the indicated display to the end of the queue or NULL if it

+ *         is unable to allocate memory.  The data field may be used by the

+ *         caller to attach arbitrary data to this display in this queue.  The

+ *         caller should use XmuDQLookupDisplay to make sure that the display

+ *         hasn't already been added.

+ * 

+ * 

+ * Bool XmuDQRemoveDisplay (q, dpy)

+ *     XmuDisplayQueue *q;

+ *     Display *dpy;

+ *

+ *         Removes the specified display from the given queue.  If the 

+ *         indicated display is not found on this queue, False is returned,

+ *         otherwise True is returned.

+ */

+

+typedef struct _XmuDisplayQueue XmuDisplayQueue;

+typedef struct _XmuDisplayQueueEntry XmuDisplayQueueEntry;

+

+typedef int (*XmuCloseDisplayQueueProc)(XmuDisplayQueue *queue,

+					XmuDisplayQueueEntry *entry);

+

+typedef int (*XmuFreeDisplayQueueProc)(XmuDisplayQueue *queue);

+

+struct _XmuDisplayQueueEntry {

+    struct _XmuDisplayQueueEntry *prev, *next;

+    Display *display;

+    CloseHook closehook;

+    XPointer data;

+};

+

+struct _XmuDisplayQueue {

+    int nentries;

+    XmuDisplayQueueEntry *head, *tail;

+    XmuCloseDisplayQueueProc closefunc;

+    XmuFreeDisplayQueueProc freefunc;

+    XPointer data;

+};

+

+_XFUNCPROTOBEGIN

+

+XmuDisplayQueue *XmuDQCreate

+(

+ XmuCloseDisplayQueueProc	closefunc,

+ XmuFreeDisplayQueueProc	freefunc,

+ XPointer			data

+ );

+

+Bool XmuDQDestroy

+(

+ XmuDisplayQueue		*q,

+ Bool				docallbacks

+ );

+

+XmuDisplayQueueEntry *XmuDQLookupDisplay

+(

+ XmuDisplayQueue		*q,

+ Display			*dpy

+ );

+

+XmuDisplayQueueEntry *XmuDQAddDisplay

+(

+ XmuDisplayQueue		*q,

+ Display			*dpy,

+ XPointer			data

+ );

+

+Bool XmuDQRemoveDisplay

+(

+ XmuDisplayQueue		*q,

+ Display			*dpy

+ );

+

+_XFUNCPROTOEND

+

+#define XmuDQNDisplays(q) ((q)->nentries)

+

+#endif /* _XMU_DISPLAYQUE_H_ */

diff --git a/X11/Xmu/Drawing.h b/X11/Xmu/Drawing.h
index 9ffed3bab..a99b4c1c4 100644
--- a/X11/Xmu/Drawing.h
+++ b/X11/Xmu/Drawing.h
@@ -1,161 +1,158 @@
-/* $Xorg: Drawing.h,v 1.5 2001/02/09 02:03:52 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/Xmu/Drawing.h,v 1.6 2001/12/14 19:55:42 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_DRAWING_H_
-#define _XMU_DRAWING_H_
-
-#include <X11/Xlib.h>
-#include <X11/Xfuncproto.h>
-
-#include <stdio.h>
-#if ! defined(_XtIntrinsic_h) && ! defined(PIXEL_ALREADY_TYPEDEFED)
-typedef unsigned long Pixel;
-#endif
-
-_XFUNCPROTOBEGIN
-
-void XmuDrawRoundedRectangle
-(
- Display		*dpy,
- Drawable	 	draw,
- GC 			gc,
- int			x,
- int			y,
- int			w,
- int			h,
- int			ew,
- int			eh
- );
-
-void XmuFillRoundedRectangle
-(
- Display		*dpy,
- Drawable 		draw,
- GC 			gc,
- int			x,
- int			y,
- int			w,
- int			h,
- int			ew,
- int			eh
- );
-
-void XmuDrawLogo
-(
- Display		*dpy,
- Drawable 		drawable,
- GC			gcFore,
- GC			gcBack,
- int			x,
- int			y,
- unsigned int		width,
- unsigned int		height
- );
-
-Pixmap XmuCreatePixmapFromBitmap
-(
- Display		*dpy,
- Drawable 		d,
- Pixmap 		bitmap,
- unsigned int		width,
- unsigned int		height,
- unsigned int		depth,
- unsigned long		fore,
- unsigned long		back
-);
-
-Pixmap XmuCreateStippledPixmap
-(
- Screen			*screen,
- Pixel			fore,
- Pixel			back,
- unsigned int		depth
- );
-
-void XmuReleaseStippledPixmap
-(
- Screen			*screen,
- Pixmap 		pixmap
- );
-
-Pixmap XmuLocateBitmapFile
-(
- Screen			*screen,
- _Xconst char		*name,
- char			*srcname_return,
- int 			srcnamelen,
- int			*width_return,
- int			*height_return,
- int			*xhot_return,
- int			*yhot_return
- );
-
-Pixmap XmuLocatePixmapFile
-(
- Screen			*screen,
- _Xconst char		*name,
- unsigned long		fore,
- unsigned long		back,
- unsigned int		depth,
- char			*srcname_return,
- int 			srcnamelen,
- int			*width_return,
- int			*height_return,
- int			*xhot_return,
- int			*yhot_return
- );
-
-int XmuReadBitmapData
-(
- FILE			*fstream,
- unsigned int		*width_return,
- unsigned int		*height_return,
- unsigned char		**datap_return,
- int			*xhot_return,
- int			*yhot_return
-);
-
-int XmuReadBitmapDataFromFile
-(
- _Xconst char		*filename,
- unsigned int		*width_return,
- unsigned int		*height_return,
- unsigned char		**datap_return,
- int			*xhot_return,
- int			*yhot_return
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_DRAWING_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_DRAWING_H_

+#define _XMU_DRAWING_H_

+

+#include <X11/Xlib.h>

+#include <X11/Xfuncproto.h>

+

+#include <stdio.h>

+#if ! defined(_XtIntrinsic_h) && ! defined(PIXEL_ALREADY_TYPEDEFED)

+typedef unsigned long Pixel;

+#endif

+

+_XFUNCPROTOBEGIN

+

+void XmuDrawRoundedRectangle

+(

+ Display		*dpy,

+ Drawable	 	draw,

+ GC 			gc,

+ int			x,

+ int			y,

+ int			w,

+ int			h,

+ int			ew,

+ int			eh

+ );

+

+void XmuFillRoundedRectangle

+(

+ Display		*dpy,

+ Drawable 		draw,

+ GC 			gc,

+ int			x,

+ int			y,

+ int			w,

+ int			h,

+ int			ew,

+ int			eh

+ );

+

+void XmuDrawLogo

+(

+ Display		*dpy,

+ Drawable 		drawable,

+ GC			gcFore,

+ GC			gcBack,

+ int			x,

+ int			y,

+ unsigned int		width,

+ unsigned int		height

+ );

+

+Pixmap XmuCreatePixmapFromBitmap

+(

+ Display		*dpy,

+ Drawable 		d,

+ Pixmap 		bitmap,

+ unsigned int		width,

+ unsigned int		height,

+ unsigned int		depth,

+ unsigned long		fore,

+ unsigned long		back

+);

+

+Pixmap XmuCreateStippledPixmap

+(

+ Screen			*screen,

+ Pixel			fore,

+ Pixel			back,

+ unsigned int		depth

+ );

+

+void XmuReleaseStippledPixmap

+(

+ Screen			*screen,

+ Pixmap 		pixmap

+ );

+

+Pixmap XmuLocateBitmapFile

+(

+ Screen			*screen,

+ _Xconst char		*name,

+ char			*srcname_return,

+ int 			srcnamelen,

+ int			*width_return,

+ int			*height_return,

+ int			*xhot_return,

+ int			*yhot_return

+ );

+

+Pixmap XmuLocatePixmapFile

+(

+ Screen			*screen,

+ _Xconst char		*name,

+ unsigned long		fore,

+ unsigned long		back,

+ unsigned int		depth,

+ char			*srcname_return,

+ int 			srcnamelen,

+ int			*width_return,

+ int			*height_return,

+ int			*xhot_return,

+ int			*yhot_return

+ );

+

+int XmuReadBitmapData

+(

+ FILE			*fstream,

+ unsigned int		*width_return,

+ unsigned int		*height_return,

+ unsigned char		**datap_return,

+ int			*xhot_return,

+ int			*yhot_return

+);

+

+int XmuReadBitmapDataFromFile

+(

+ _Xconst char		*filename,

+ unsigned int		*width_return,

+ unsigned int		*height_return,

+ unsigned char		**datap_return,

+ int			*xhot_return,

+ int			*yhot_return

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_DRAWING_H_ */

diff --git a/X11/Xmu/Editres.h b/X11/Xmu/Editres.h
index 2a3f3e250..52aa239a9 100644
--- a/X11/Xmu/Editres.h
+++ b/X11/Xmu/Editres.h
@@ -1,42 +1,39 @@
-/* $Xorg: Editres.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
-/*
-
-Copyright 1991, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xmu/Editres.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-void _XEditResCheckMessages
-(
- Widget			w,
- XtPointer		data,
- XEvent			*event,
- Boolean		*cont
-);
-
-_XFUNCPROTOEND
+/*

+

+Copyright 1991, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+*/

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+void _XEditResCheckMessages

+(

+ Widget			w,

+ XtPointer		data,

+ XEvent			*event,

+ Boolean		*cont

+);

+

+_XFUNCPROTOEND

diff --git a/X11/Xmu/EditresP.h b/X11/Xmu/EditresP.h
index 886205bf2..0f1dd1260 100644
--- a/X11/Xmu/EditresP.h
+++ b/X11/Xmu/EditresP.h
@@ -1,409 +1,406 @@
-/* $Xorg: EditresP.h,v 1.4 2001/02/09 02:03:52 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/Xmu/EditresP.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
-
-/*
- * Author:  Chris D. Peterson, MIT X Consortium
- */
-
-/************************************************************
-
-		The Editres Protocol
-
-
-  The Client message sent to the application is:
-
-  ATOM = "ResEditor" 		--- RES_EDITOR_NAME
-
-  FORMAT = 32                   --- RES_EDIT_SEND_EVENT_FORMAT
-
-  l[0] = timestamp
-  l[1] = command atom name
-  l[2] = ident of command
-  l[3] = protocol version number to use
-
-
-
-  The binary protocol has the following format:
-
-	Card8:		8-bit unsingned integer
-	Card16:		16-bit unsingned integer
-	Card32:		32-bit unsingned integer
-	Int16:		16-bit signed integer
-	Window:		32-bit value
-	Widget:		32-bit value
-	String8:        ListOfCard8
-	
-	[a][b][c] represent an exclusive list of choices.
-
-	All widgets are passed as a list of widgets, containing the 
-	full instance heirarch of this widget.  The hierarchy is ordered
-	from parent to child.  Thus the first element of each list is
-	the root of the widget tree (this makes verifying that the widget
-	still exists, MUCH faster).
-
-	ListOfFoo comprises a list of things in the following format:
-	
-	number:			Card16
-	<number> things:	????
-	
-  This is a synchronous protocol, every request MUST be followed by a
-  reply.  
-
-  Request:
-
-	Serial Number:	Card8
-	Op Code:	Card8 -	{ SendWidgetTree = 0,
-				  SetValues = 1,
-				  GetResources = 2,
-				  GetGeometry = 3,
-				  FindChild = 4,
-				  GetValues = 5 }
-	Length:		Card32
-	Data:		
-
-   Reply:
-
-	Serial Number:	Card8
-	Type:		Card8 - { Formatted = 0,
-	                          Unformatted = 1,
-				  ProtocolMismatch = 2
-				}
-	Length:		Card32
-
-
-   Byte Order:
-
-	All Fields are MSB -> LSB
-
-    Data:
-
-    	Formatted:
-
-        	The data contains the reply information for the request as
-		specified below if the reply type is "Formatted".  The return
-		values for the other reply types are shown below.
-
-        Unformatted:
-
-		Message:	String8
-
-	ProtocolMismatch:
-
-		RequestedVersion:   	Card8
-
-------------------------------------------------------------
-
-   SendWidgetTree:
-
-	--->
-
-	Number of Entries:	Card16
-	Entry:
-		widget:		ListOfWidgets
-		name:		String8
-		class:		String8
-		window:		Card32
-         	toolkit:        String8
-
-	Send Widget Tree returns the toolkit type, and a fuly specified list
-        of widgets for each widget in the tree.  This is enough information
-        to completely reconstruct the entire widget heirarchy.
-
-	The window return value contains the Xid of the window currently 
-	used by this widget.  If the widget is unrealized then 0 is returned,
-	and if widget is a non-windowed object a value of 2 is returned.
-
-   SetValues:
-
-	name:	String8
-	type:	String8
-	value:  String8
-	Number of Entries:	Card16
-	Entry:
-		widget:		ListOfWidgets
-
-	--->
-
-	Number of Entries:	Card16
-	Entry:
-		widget:		ListOfWidgets
-		message:	String8
-
-	SetValues will allow the same resource to be set on a number of 
-	widgets.  This function will return an error message if the SetValues
-	request caused an Xt error.
-	
-  GetValues:
-
-        names:                ListOfString8       
-        widget:               Widget
-
-        --->
-	novalues:             ListOfCard16
-	values:               ListOfString8
-                   
-        GetValues will allow a number of resource values to be read 
-        on a particular widget.  The request specifies the names of
-	the resources wanted and the widget id these resources are
-	from.  The reply returns a list of indices from the requests
-	name list of resources for which a value can not be returned.
-	It also returns a list of returned values, in the order of the
-        requests names list, skipping those indices present in novalues.
-
-   GetResources:
-
-	Number of Entries:	Card16
-	Entry
-		widget:		ListOfWidgets:
-
-	---->
-
-	Number of Entries:	Card16
-	Entry
-		Widget:			ListOfWidgets:
-		Error:			Bool
-
-		[ Message:		String 8 ]
-		[ Number of Resources:	Card16
-		Resource:
-			Kind:	{normal, constraint}
-			Name:	String8
-			Class:	String8	
-			Type:	String8 ]
-
-	GetResource retrieves the kind, name, class and type for every 
-	widget passed to it.  If an error occured with the resource fetch
-	Error will be set to True for the given widget and a message
-	is returned rather than the resource info.
-
-  GetGeometry:
-
-	Number of Entries:	Card16
-	Entry
-		Widget:		ListOfWidgets:
-
-	---->
-
-	Number of Entries:	Card16
-	Entry
-		Widget:			ListOfWidgets:
-		Error:			Bool
-
-		[ message:		String 8 ]
-		[ mapped:       Boolean
-		  X: 		Int16
-		  Y:  		Int16
-		  Width: 	Card16
-	      	  Height:	Card16
-		  BorderWidth:	Card16 ]
-
-	GetGeometry retreives the mapping state, x, y, width, height
-	and border width for each widget specified.  If an error occured 
-	with the geometry fetch "Error" will be set to True for the given 
-	widget and a message is returned rather than the geometry info.  
-	X an Y corrospond to the root coordinates of the upper left corner
-	of the widget (outside the window border).
-	
-  FindChild:
-
-	Widget:		ListOfWidgets
-	X:		Int16
-	Y:		Int16
-	
-	--->
-
-	Widget:		ListOfWidgets
-
-	Find Child returns a descendent of the widget specified that 
-	is at the root coordinates specified.
-
-	NOTE:
-
-	The returned widget is undefined if the point is contained in
-	two or more mapped widgets, or in two overlapping Rect objs.
-
-  GetValues:
-
-        names:                ListOfString8       
-        widget:               Widget
-
-        --->
-	
-	values:               ListOfString8
-
-        GetValues will allow a number of resource values to be read 
-        on a particular widget.  Currently only InterViews 3.0.1 Styles 
-	and their attributes are supported.  In addition, the current
-	user interface  only supports the return of 1 resource.  The ability
-	to specify and return multiple resources is defined for future editres
-	interfaces where some or all of a widgets resource values are returned
-	and displayed at once. 
-
-
-************************************************************/
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-#define XER_NBBY 8		/* number of bits in a byte */
-#define BYTE_MASK 255
-
-#define HEADER_SIZE 6
-
-#define EDITRES_IS_OBJECT 2
-#define EDITRES_IS_UNREALIZED 0
-
-/*
- * Format for atoms
- */
-#define EDITRES_FORMAT             8
-#define EDITRES_SEND_EVENT_FORMAT 32
-
-/*
- * Atoms
- */
-#define EDITRES_NAME         "Editres"
-#define EDITRES_COMMAND_ATOM "EditresCommand"
-#define EDITRES_COMM_ATOM    "EditresComm"
-#define EDITRES_CLIENT_VALUE "EditresClientVal"
-#define EDITRES_PROTOCOL_ATOM "EditresProtocol"
-
-typedef enum {
-  SendWidgetTree = 0,
-	       SetValues      = 1,
-	       GetResources   = 2,
-	       GetGeometry    = 3, 
-	       FindChild      = 4,
-	       GetValues      = 5
-} EditresCommand;
-
-typedef enum {
-  NormalResource     = 0,
-  ConstraintResource = 1
-} ResourceType;
-
-/*
- * The type of a resource identifier
- */
-typedef unsigned char ResIdent;
-
-typedef enum {
-  PartialSuccess   = 0,
-  Failure	   = 1,
-  ProtocolMismatch = 2
-} EditResError;
-
-typedef struct _WidgetInfo {
-    unsigned short num_widgets;
-  unsigned long *ids;
-    Widget real_widget;
-} WidgetInfo;
-
-typedef struct _ProtocolStream {
-    unsigned long size, alloc;
-    unsigned char *real_top, *top, *current;
-} ProtocolStream;
-
-/************************************************************
- * Function definitions for reading and writing protocol requests
- ************************************************************/
-_XFUNCPROTOBEGIN
-
-void _XEditResPutString8
-(
- ProtocolStream		*stream,
- char			*str
- );
-
-void _XEditResPut8
-(
- ProtocolStream		*stream,
- unsigned int		value
- );
-
-void _XEditResPut16
-(
- ProtocolStream		*stream,
- unsigned int		value
- );
-
-void _XEditResPut32
-(
- ProtocolStream		*stream,
- unsigned long		value
- );
-
-void _XEditResPutWidgetInfo
-(
- ProtocolStream		*stream,
- WidgetInfo		*info
- );
-
-void _XEditResResetStream
-(
- ProtocolStream		*stream
- );
-
-Bool _XEditResGet8
-(
- ProtocolStream		*stream,
- unsigned char		*value
- );
-
-Bool _XEditResGet16
-(
- ProtocolStream		*stream,
- unsigned short		*value
- );
-
-Bool _XEditResGetSigned16
-(
- ProtocolStream		*stream,
- short			*value
- );
-
-Bool _XEditResGet32
-(
- ProtocolStream		*stream,
- unsigned long		*value
- );
-
-Bool _XEditResGetString8
-(
- ProtocolStream		*stream,
- char			**str
- );
-
-Bool _XEditResGetWidgetInfo
-(
- ProtocolStream		*stream,
- WidgetInfo		*info
- );
-
-_XFUNCPROTOEND
+/*

+

+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:  Chris D. Peterson, MIT X Consortium

+ */

+

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

+

+		The Editres Protocol

+

+

+  The Client message sent to the application is:

+

+  ATOM = "ResEditor" 		--- RES_EDITOR_NAME

+

+  FORMAT = 32                   --- RES_EDIT_SEND_EVENT_FORMAT

+

+  l[0] = timestamp

+  l[1] = command atom name

+  l[2] = ident of command

+  l[3] = protocol version number to use

+

+

+

+  The binary protocol has the following format:

+

+	Card8:		8-bit unsingned integer

+	Card16:		16-bit unsingned integer

+	Card32:		32-bit unsingned integer

+	Int16:		16-bit signed integer

+	Window:		32-bit value

+	Widget:		32-bit value

+	String8:        ListOfCard8

+	

+	[a][b][c] represent an exclusive list of choices.

+

+	All widgets are passed as a list of widgets, containing the 

+	full instance heirarch of this widget.  The hierarchy is ordered

+	from parent to child.  Thus the first element of each list is

+	the root of the widget tree (this makes verifying that the widget

+	still exists, MUCH faster).

+

+	ListOfFoo comprises a list of things in the following format:

+	

+	number:			Card16

+	<number> things:	????

+	

+  This is a synchronous protocol, every request MUST be followed by a

+  reply.  

+

+  Request:

+

+	Serial Number:	Card8

+	Op Code:	Card8 -	{ SendWidgetTree = 0,

+				  SetValues = 1,

+				  GetResources = 2,

+				  GetGeometry = 3,

+				  FindChild = 4,

+				  GetValues = 5 }

+	Length:		Card32

+	Data:		

+

+   Reply:

+

+	Serial Number:	Card8

+	Type:		Card8 - { Formatted = 0,

+	                          Unformatted = 1,

+				  ProtocolMismatch = 2

+				}

+	Length:		Card32

+

+

+   Byte Order:

+

+	All Fields are MSB -> LSB

+

+    Data:

+

+    	Formatted:

+

+        	The data contains the reply information for the request as

+		specified below if the reply type is "Formatted".  The return

+		values for the other reply types are shown below.

+

+        Unformatted:

+

+		Message:	String8

+

+	ProtocolMismatch:

+

+		RequestedVersion:   	Card8

+

+------------------------------------------------------------

+

+   SendWidgetTree:

+

+	--->

+

+	Number of Entries:	Card16

+	Entry:

+		widget:		ListOfWidgets

+		name:		String8

+		class:		String8

+		window:		Card32

+         	toolkit:        String8

+

+	Send Widget Tree returns the toolkit type, and a fuly specified list

+        of widgets for each widget in the tree.  This is enough information

+        to completely reconstruct the entire widget heirarchy.

+

+	The window return value contains the Xid of the window currently 

+	used by this widget.  If the widget is unrealized then 0 is returned,

+	and if widget is a non-windowed object a value of 2 is returned.

+

+   SetValues:

+

+	name:	String8

+	type:	String8

+	value:  String8

+	Number of Entries:	Card16

+	Entry:

+		widget:		ListOfWidgets

+

+	--->

+

+	Number of Entries:	Card16

+	Entry:

+		widget:		ListOfWidgets

+		message:	String8

+

+	SetValues will allow the same resource to be set on a number of 

+	widgets.  This function will return an error message if the SetValues

+	request caused an Xt error.

+	

+  GetValues:

+

+        names:                ListOfString8       

+        widget:               Widget

+

+        --->

+	novalues:             ListOfCard16

+	values:               ListOfString8

+                   

+        GetValues will allow a number of resource values to be read 

+        on a particular widget.  The request specifies the names of

+	the resources wanted and the widget id these resources are

+	from.  The reply returns a list of indices from the requests

+	name list of resources for which a value can not be returned.

+	It also returns a list of returned values, in the order of the

+        requests names list, skipping those indices present in novalues.

+

+   GetResources:

+

+	Number of Entries:	Card16

+	Entry

+		widget:		ListOfWidgets:

+

+	---->

+

+	Number of Entries:	Card16

+	Entry

+		Widget:			ListOfWidgets:

+		Error:			Bool

+

+		[ Message:		String 8 ]

+		[ Number of Resources:	Card16

+		Resource:

+			Kind:	{normal, constraint}

+			Name:	String8

+			Class:	String8	

+			Type:	String8 ]

+

+	GetResource retrieves the kind, name, class and type for every 

+	widget passed to it.  If an error occured with the resource fetch

+	Error will be set to True for the given widget and a message

+	is returned rather than the resource info.

+

+  GetGeometry:

+

+	Number of Entries:	Card16

+	Entry

+		Widget:		ListOfWidgets:

+

+	---->

+

+	Number of Entries:	Card16

+	Entry

+		Widget:			ListOfWidgets:

+		Error:			Bool

+

+		[ message:		String 8 ]

+		[ mapped:       Boolean

+		  X: 		Int16

+		  Y:  		Int16

+		  Width: 	Card16

+	      	  Height:	Card16

+		  BorderWidth:	Card16 ]

+

+	GetGeometry retreives the mapping state, x, y, width, height

+	and border width for each widget specified.  If an error occured 

+	with the geometry fetch "Error" will be set to True for the given 

+	widget and a message is returned rather than the geometry info.  

+	X an Y corrospond to the root coordinates of the upper left corner

+	of the widget (outside the window border).

+	

+  FindChild:

+

+	Widget:		ListOfWidgets

+	X:		Int16

+	Y:		Int16

+	

+	--->

+

+	Widget:		ListOfWidgets

+

+	Find Child returns a descendent of the widget specified that 

+	is at the root coordinates specified.

+

+	NOTE:

+

+	The returned widget is undefined if the point is contained in

+	two or more mapped widgets, or in two overlapping Rect objs.

+

+  GetValues:

+

+        names:                ListOfString8       

+        widget:               Widget

+

+        --->

+	

+	values:               ListOfString8

+

+        GetValues will allow a number of resource values to be read 

+        on a particular widget.  Currently only InterViews 3.0.1 Styles 

+	and their attributes are supported.  In addition, the current

+	user interface  only supports the return of 1 resource.  The ability

+	to specify and return multiple resources is defined for future editres

+	interfaces where some or all of a widgets resource values are returned

+	and displayed at once. 

+

+

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

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+#define XER_NBBY 8		/* number of bits in a byte */

+#define BYTE_MASK 255

+

+#define HEADER_SIZE 6

+

+#define EDITRES_IS_OBJECT 2

+#define EDITRES_IS_UNREALIZED 0

+

+/*

+ * Format for atoms

+ */

+#define EDITRES_FORMAT             8

+#define EDITRES_SEND_EVENT_FORMAT 32

+

+/*

+ * Atoms

+ */

+#define EDITRES_NAME         "Editres"

+#define EDITRES_COMMAND_ATOM "EditresCommand"

+#define EDITRES_COMM_ATOM    "EditresComm"

+#define EDITRES_CLIENT_VALUE "EditresClientVal"

+#define EDITRES_PROTOCOL_ATOM "EditresProtocol"

+

+typedef enum {

+  SendWidgetTree = 0,

+	       SetValues      = 1,

+	       GetResources   = 2,

+	       GetGeometry    = 3, 

+	       FindChild      = 4,

+	       GetValues      = 5

+} EditresCommand;

+

+typedef enum {

+  NormalResource     = 0,

+  ConstraintResource = 1

+} ResourceType;

+

+/*

+ * The type of a resource identifier

+ */

+typedef unsigned char ResIdent;

+

+typedef enum {

+  PartialSuccess   = 0,

+  Failure	   = 1,

+  ProtocolMismatch = 2

+} EditResError;

+

+typedef struct _WidgetInfo {

+    unsigned short num_widgets;

+  unsigned long *ids;

+    Widget real_widget;

+} WidgetInfo;

+

+typedef struct _ProtocolStream {

+    unsigned long size, alloc;

+    unsigned char *real_top, *top, *current;

+} ProtocolStream;

+

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

+ * Function definitions for reading and writing protocol requests

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

+_XFUNCPROTOBEGIN

+

+void _XEditResPutString8

+(

+ ProtocolStream		*stream,

+ char			*str

+ );

+

+void _XEditResPut8

+(

+ ProtocolStream		*stream,

+ unsigned int		value

+ );

+

+void _XEditResPut16

+(

+ ProtocolStream		*stream,

+ unsigned int		value

+ );

+

+void _XEditResPut32

+(

+ ProtocolStream		*stream,

+ unsigned long		value

+ );

+

+void _XEditResPutWidgetInfo

+(

+ ProtocolStream		*stream,

+ WidgetInfo		*info

+ );

+

+void _XEditResResetStream

+(

+ ProtocolStream		*stream

+ );

+

+Bool _XEditResGet8

+(

+ ProtocolStream		*stream,

+ unsigned char		*value

+ );

+

+Bool _XEditResGet16

+(

+ ProtocolStream		*stream,

+ unsigned short		*value

+ );

+

+Bool _XEditResGetSigned16

+(

+ ProtocolStream		*stream,

+ short			*value

+ );

+

+Bool _XEditResGet32

+(

+ ProtocolStream		*stream,

+ unsigned long		*value

+ );

+

+Bool _XEditResGetString8

+(

+ ProtocolStream		*stream,

+ char			**str

+ );

+

+Bool _XEditResGetWidgetInfo

+(

+ ProtocolStream		*stream,

+ WidgetInfo		*info

+ );

+

+_XFUNCPROTOEND

diff --git a/X11/Xmu/Error.h b/X11/Xmu/Error.h
index f992930ec..f0f26f0d4 100644
--- a/X11/Xmu/Error.h
+++ b/X11/Xmu/Error.h
@@ -1,59 +1,56 @@
-/* $Xorg: Error.h,v 1.5 2001/02/09 02:03:52 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/Xmu/Error.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_ERROR_H_
-#define _XMU_ERROR_H_
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-int XmuPrintDefaultErrorMessage
-(
- Display		*dpy,
- XErrorEvent		*event,
- FILE			*fp
- );
-
-int XmuSimpleErrorHandler
-(
- Display		*dpy,
- XErrorEvent		*errorp
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_ERROR_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_ERROR_H_

+#define _XMU_ERROR_H_

+

+#include <stdio.h>

+#include <X11/Xlib.h>

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+int XmuPrintDefaultErrorMessage

+(

+ Display		*dpy,

+ XErrorEvent		*event,

+ FILE			*fp

+ );

+

+int XmuSimpleErrorHandler

+(

+ Display		*dpy,

+ XErrorEvent		*errorp

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_ERROR_H_ */

diff --git a/X11/Xmu/ExtAgent.h b/X11/Xmu/ExtAgent.h
index b0caf3699..1bdf269ff 100644
--- a/X11/Xmu/ExtAgent.h
+++ b/X11/Xmu/ExtAgent.h
@@ -1,44 +1,41 @@
-/* $Xorg: ExtAgent.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994,1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-extern void XmuRegisterExternalAgent
-(
- Widget		w,
- XtPointer	data,
- XEvent		*event,
- Boolean	*cont
- );
-
-_XFUNCPROTOEND
-
+/*

+

+Copyright 1994,1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+*/

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+extern void XmuRegisterExternalAgent

+(

+ Widget		w,

+ XtPointer	data,

+ XEvent		*event,

+ Boolean	*cont

+ );

+

+_XFUNCPROTOEND

+

diff --git a/X11/Xmu/Initer.h b/X11/Xmu/Initer.h
index 5e870af8c..a952ce8f0 100644
--- a/X11/Xmu/Initer.h
+++ b/X11/Xmu/Initer.h
@@ -1,58 +1,55 @@
-/* $Xorg: Initer.h,v 1.5 2001/02/09 02:03:52 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/Xmu/Initer.h,v 1.5 2001/01/17 19:42:56 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_INITER_H_
-#define _XMU_INITER_H_
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-typedef void (*XmuInitializerProc)(XtAppContext app_context, XPointer data);
-
-_XFUNCPROTOBEGIN
-
-void XmuCallInitializers
-(
- XtAppContext		app_context
- );
-
-void XmuAddInitializer
-(
- XmuInitializerProc	func,
- XPointer		data
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_INITER_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_INITER_H_

+#define _XMU_INITER_H_

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+typedef void (*XmuInitializerProc)(XtAppContext app_context, XPointer data);

+

+_XFUNCPROTOBEGIN

+

+void XmuCallInitializers

+(

+ XtAppContext		app_context

+ );

+

+void XmuAddInitializer

+(

+ XmuInitializerProc	func,

+ XPointer		data

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_INITER_H_ */

diff --git a/X11/Xmu/Lookup.h b/X11/Xmu/Lookup.h
index 3699a2719..302045ac6 100644
--- a/X11/Xmu/Lookup.h
+++ b/X11/Xmu/Lookup.h
@@ -1,128 +1,124 @@
-/*
- * $XFree86$
- */
-
-/************************************************************
-
-Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-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 THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization.
-
-********************************************************/
-
-#ifndef included_xmu_lookup_h
-#define included_xmu_lookup_h 1
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-extern int XmuLookupString(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status,
-		unsigned long keysymSet);
-
-extern int XmuLookupLatin1(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupLatin2(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupLatin3(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupLatin4(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupKana(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupJISX0201(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupArabic(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupCyrillic(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupGreek(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupAPL(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-extern int XmuLookupHebrew(
-		XKeyEvent *event,
-		unsigned char *buffer,
-		int nbytes,
-		KeySym *keysym,
-		XComposeStatus *status);
-
-#endif /* included_xmu_lookup_h */
+/************************************************************

+

+Copyright 1999 by Thomas E. Dickey <dickey@clark.net>

+

+                        All Rights Reserved

+

+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 THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

+holders shall not be used in advertising or otherwise to promote the

+sale, use or other dealings in this Software without prior written

+authorization.

+

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

+

+#ifndef included_xmu_lookup_h

+#define included_xmu_lookup_h 1

+

+#include <X11/Xlib.h>

+#include <X11/Xutil.h>

+

+extern int XmuLookupString(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status,

+		unsigned long keysymSet);

+

+extern int XmuLookupLatin1(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupLatin2(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupLatin3(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupLatin4(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupKana(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupJISX0201(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupArabic(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupCyrillic(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupGreek(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupAPL(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+extern int XmuLookupHebrew(

+		XKeyEvent *event,

+		unsigned char *buffer,

+		int nbytes,

+		KeySym *keysym,

+		XComposeStatus *status);

+

+#endif /* included_xmu_lookup_h */

diff --git a/X11/Xmu/Misc.h b/X11/Xmu/Misc.h
index b47fbba4b..9d70ae15b 100644
--- a/X11/Xmu/Misc.h
+++ b/X11/Xmu/Misc.h
@@ -1,65 +1,63 @@
-/* $Xorg: Misc.h,v 1.4 2001/02/09 02:03:53 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.
-
-*/
-
-/***********************************************************
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-******************************************************************/
-
-/* Various useful constant and macro definitions */
-
-#ifndef _Xmu_Misc_h
-#define _Xmu_Misc_h
-
-#define MAXDIMENSION	((1 << 31)-1)
-
-#define Max(x, y)	(((x) > (y)) ? (x) : (y))
-#define Min(x, y)	(((x) < (y)) ? (x) : (y))
-#define AssignMax(x, y)	{if ((y) > (x)) x = (y);}
-#define AssignMin(x, y)	{if ((y) < (x)) x = (y);}
-
-#endif /*_Xmu_Misc_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.

+

+*/

+

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

+

+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

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

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

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

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

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

+

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

+

+/* Various useful constant and macro definitions */

+

+#ifndef _Xmu_Misc_h

+#define _Xmu_Misc_h

+

+#define MAXDIMENSION	((1 << 31)-1)

+

+#define Max(x, y)	(((x) > (y)) ? (x) : (y))

+#define Min(x, y)	(((x) < (y)) ? (x) : (y))

+#define AssignMax(x, y)	{if ((y) > (x)) x = (y);}

+#define AssignMin(x, y)	{if ((y) < (x)) x = (y);}

+

+#endif /*_Xmu_Misc_h*/

diff --git a/X11/Xmu/StdCmap.h b/X11/Xmu/StdCmap.h
index b268d073c..885c0f484 100644
--- a/X11/Xmu/StdCmap.h
+++ b/X11/Xmu/StdCmap.h
@@ -1,119 +1,116 @@
-/* $Xorg: StdCmap.h,v 1.5 2001/02/09 02:03:53 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/Xmu/StdCmap.h,v 1.8 2001/01/23 17:38:14 keithp Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_STDCMAP_H_
-#define _XMU_STDCMAP_H_
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-Status XmuAllStandardColormaps
-(
- Display		*dpy
- );
-
-Status XmuCreateColormap
-(
- Display		*dpy,
- XStandardColormap	*colormap
- );
-
-void XmuDeleteStandardColormap
-(
- Display		*dpy,
- int			screen,
- Atom			property
- );
-
-Status XmuGetColormapAllocation
-(
- XVisualInfo		*vinfo,
- Atom			property,
- unsigned long		*red_max_return,
- unsigned long		*green_max_return,
- unsigned long		*blue_max_return
- );
-
-Status XmuLookupStandardColormap
-(
- Display		*dpy,
- int			screen,
- VisualID		visualid,
- unsigned int		depth,
- Atom			property,
- Bool			replace,
- Bool			retain
- );
-
-XStandardColormap *XmuStandardColormap
-(
- Display		*dpy,
- int			screen,
- VisualID		visualid,
- unsigned int		depth,
- Atom			property,
- Colormap		cmap,
- unsigned long		red_max,
- unsigned long		green_max,
- unsigned long		blue_max
- );
-
-Status XmuVisualStandardColormaps
-(
- Display		*dpy,
- int			screen,
- VisualID		visualid,
- unsigned int		depth,
- Bool			replace,
- Bool			retain
- );
-
-Bool XmuDistinguishableColors
-(
- XColor			*colors,
- int			count
- );
-
-Bool XmuDistinguishablePixels
-(
- Display		*dpy,
- Colormap		cmap,
- unsigned long		*pixels,
- int			count
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_STDCMAP_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_STDCMAP_H_

+#define _XMU_STDCMAP_H_

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+Status XmuAllStandardColormaps

+(

+ Display		*dpy

+ );

+

+Status XmuCreateColormap

+(

+ Display		*dpy,

+ XStandardColormap	*colormap

+ );

+

+void XmuDeleteStandardColormap

+(

+ Display		*dpy,

+ int			screen,

+ Atom			property

+ );

+

+Status XmuGetColormapAllocation

+(

+ XVisualInfo		*vinfo,

+ Atom			property,

+ unsigned long		*red_max_return,

+ unsigned long		*green_max_return,

+ unsigned long		*blue_max_return

+ );

+

+Status XmuLookupStandardColormap

+(

+ Display		*dpy,

+ int			screen,

+ VisualID		visualid,

+ unsigned int		depth,

+ Atom			property,

+ Bool			replace,

+ Bool			retain

+ );

+

+XStandardColormap *XmuStandardColormap

+(

+ Display		*dpy,

+ int			screen,

+ VisualID		visualid,

+ unsigned int		depth,

+ Atom			property,

+ Colormap		cmap,

+ unsigned long		red_max,

+ unsigned long		green_max,

+ unsigned long		blue_max

+ );

+

+Status XmuVisualStandardColormaps

+(

+ Display		*dpy,

+ int			screen,

+ VisualID		visualid,

+ unsigned int		depth,

+ Bool			replace,

+ Bool			retain

+ );

+

+Bool XmuDistinguishableColors

+(

+ XColor			*colors,

+ int			count

+ );

+

+Bool XmuDistinguishablePixels

+(

+ Display		*dpy,

+ Colormap		cmap,

+ unsigned long		*pixels,

+ int			count

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_STDCMAP_H_ */

diff --git a/X11/Xmu/StdSel.h b/X11/Xmu/StdSel.h
index f7c9452de..97d6d01fc 100644
--- a/X11/Xmu/StdSel.h
+++ b/X11/Xmu/StdSel.h
@@ -1,57 +1,54 @@
-/* $Xorg: StdSel.h,v 1.5 2001/02/09 02:03:53 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/Xmu/StdSel.h,v 1.7 2001/01/17 19:42:56 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_SELECTION_H_
-#define _XMU_SELECTION_H_
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-Boolean XmuConvertStandardSelection
-(
- Widget			w,
- Time			timev,
- Atom			*selection,
- Atom			*target,
- Atom			*type_return,
- XPointer		*value_return,
- unsigned long		*length_return,
- int			*format_return
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_SELECTION_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_SELECTION_H_

+#define _XMU_SELECTION_H_

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+Boolean XmuConvertStandardSelection

+(

+ Widget			w,

+ Time			timev,

+ Atom			*selection,

+ Atom			*target,

+ Atom			*type_return,

+ XPointer		*value_return,

+ unsigned long		*length_return,

+ int			*format_return

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_SELECTION_H_ */

diff --git a/X11/Xmu/SysUtil.h b/X11/Xmu/SysUtil.h
index 9f5b033ac..192352fc7 100644
--- a/X11/Xmu/SysUtil.h
+++ b/X11/Xmu/SysUtil.h
@@ -1,60 +1,53 @@
-/* $Xorg: SysUtil.h,v 1.4 2001/02/09 02:03:53 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/Xmu/SysUtil.h,v 1.9 2001/12/14 19:55:55 dawes Exp $ */
-
-#ifndef _SYSUTIL_H_
-#define _SYSUTIL_H_
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-int XmuGetHostname
-(
-    char		*buf_return,
-    int			maxlen
-);
-
-#ifndef _XMU_H_
-int XmuSnprintf
-(
- char			*str,
- int			size,
- _Xconst char		*fmt,
-    ...
- )
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
-__attribute((format(printf,3,4)))
-#endif
-;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _SYSUTIL_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 _SYSUTIL_H_

+#define _SYSUTIL_H_

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+int XmuGetHostname

+(

+    char		*buf_return,

+    int			maxlen

+);

+

+#ifndef _XMU_H_

+int XmuSnprintf

+(

+ char			*str,

+ int			size,

+ _Xconst char		*fmt,

+    ...

+ )

+_X_ATTRIBUTE_PRINTF(3,4);

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _SYSUTIL_H_ */

diff --git a/X11/Xmu/WhitePoint.h b/X11/Xmu/WhitePoint.h
index a05bddd4a..31440d1e1 100644
--- a/X11/Xmu/WhitePoint.h
+++ b/X11/Xmu/WhitePoint.h
@@ -1,65 +1,63 @@
-/* $Xorg: WhitePoint.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
-/*
-
-Copyright 1991, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-
-/*
- *
- *	DESCRIPTION
- *		This file contains a series of standard white point values.
- */
-#define CIE_A_u		0.2560
-#define CIE_A_v		0.5243
-#define CIE_A_Y		1.0000
-
-#define CIE_B_u		0.2137
-#define CIE_B_v		0.4852
-#define CIE_B_Y		1.0000
-
-#define CIE_C_u		0.2009
-#define CIE_C_v		0.4609
-#define CIE_C_Y		1.0000
-
-#define CIE_D55_u	0.2044
-#define CIE_D55_v	0.4808
-#define CIE_D55_Y	1.0000
-
-#define CIE_D65_u	0.1978
-#define CIE_D65_v	0.4684
-#define CIE_D65_Y	1.0000
-
-#define CIE_D75_u	0.1935
-#define CIE_D75_v	0.4586
-#define CIE_D75_Y	1.0000
-
-#define ASTM_D50_u	0.2092
-#define ASTM_D50_v	0.4881
-#define ASTM_D50_Y	1.0000
-
-#define WP_9300K_u	0.1884
-#define WP_9300K_v	0.4463
-#define WP_9300K_Y	1.0000
+/*

+

+Copyright 1991, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+*/

+

+

+/*

+ *

+ *	DESCRIPTION

+ *		This file contains a series of standard white point values.

+ */

+#define CIE_A_u		0.2560

+#define CIE_A_v		0.5243

+#define CIE_A_Y		1.0000

+

+#define CIE_B_u		0.2137

+#define CIE_B_v		0.4852

+#define CIE_B_Y		1.0000

+

+#define CIE_C_u		0.2009

+#define CIE_C_v		0.4609

+#define CIE_C_Y		1.0000

+

+#define CIE_D55_u	0.2044

+#define CIE_D55_v	0.4808

+#define CIE_D55_Y	1.0000

+

+#define CIE_D65_u	0.1978

+#define CIE_D65_v	0.4684

+#define CIE_D65_Y	1.0000

+

+#define CIE_D75_u	0.1935

+#define CIE_D75_v	0.4586

+#define CIE_D75_Y	1.0000

+

+#define ASTM_D50_u	0.2092

+#define ASTM_D50_v	0.4881

+#define ASTM_D50_Y	1.0000

+

+#define WP_9300K_u	0.1884

+#define WP_9300K_v	0.4463

+#define WP_9300K_Y	1.0000

diff --git a/X11/Xmu/WidgetNode.h b/X11/Xmu/WidgetNode.h
index 75050d253..85a064ece 100644
--- a/X11/Xmu/WidgetNode.h
+++ b/X11/Xmu/WidgetNode.h
@@ -1,98 +1,95 @@
-/* $Xorg: WidgetNode.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
-/*
-
-Copyright 1990, 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/Xmu/WidgetNode.h,v 1.5 2001/01/17 19:42:57 dawes Exp $ */
-
-/*
- * Author:  Jim Fulton, MIT X Consortium
- */
-
-#ifndef _XmuWidgetNode_h
-#define _XmuWidgetNode_h
-
-#include <X11/Intrinsic.h>
-#include <X11/Xfuncproto.h>
-
-/*
- * This is usually initialized by setting the first two fields and letting
- * rest be implicitly nulled (by genlist.sh, for example)
- */
-typedef struct _XmuWidgetNode {
-    char *label;			/* mixed case name */
-    WidgetClass *widget_class_ptr;	/* addr of widget class */
-    struct _XmuWidgetNode *superclass;	/* superclass of widget_class */
-    struct _XmuWidgetNode *children, *siblings;	/* subclass links */
-    char *lowered_label;		/* lowercase version of label */
-    char *lowered_classname;		/* lowercase version of class_name */
-    Bool have_resources;		/* resources have been fetched */
-    XtResourceList resources;		/* extracted resource database */
-    struct _XmuWidgetNode **resourcewn;	/* where resources come from */
-    Cardinal nresources;		/* number of resources */
-    XtResourceList constraints;		/* extracted constraint resources */
-    struct _XmuWidgetNode **constraintwn;  /* where constraints come from */
-    Cardinal nconstraints;		/* number of constraint resources */
-    XtPointer data;			/* extra data */
-} XmuWidgetNode;
-
-#define XmuWnClass(wn) ((wn)->widget_class_ptr[0])
-#define XmuWnClassname(wn) (XmuWnClass(wn)->core_class.class_name)
-#define XmuWnSuperclass(wn) ((XmuWnClass(wn))->core_class.superclass)
-
-					/* external interfaces */
-_XFUNCPROTOBEGIN
-
-void XmuWnInitializeNodes
-(
- XmuWidgetNode		*nodearray,
- int			nnodes
- );
-
-void XmuWnFetchResources
-(
- XmuWidgetNode		*node,
- Widget			toplevel,
- XmuWidgetNode		*topnode
- );
-
-int XmuWnCountOwnedResources
-(
- XmuWidgetNode		*node,
- XmuWidgetNode		*ownernode,
- Bool			constraints
- );
-
-XmuWidgetNode *XmuWnNameToNode
-(
- XmuWidgetNode		*nodelist,
- int			nnodes,
- _Xconst char		*name
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XmuWidgetNode_h */
-
+/*

+

+Copyright 1990, 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 X Consortium

+ */

+

+#ifndef _XmuWidgetNode_h

+#define _XmuWidgetNode_h

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+/*

+ * This is usually initialized by setting the first two fields and letting

+ * rest be implicitly nulled (by genlist.sh, for example)

+ */

+typedef struct _XmuWidgetNode {

+    char *label;			/* mixed case name */

+    WidgetClass *widget_class_ptr;	/* addr of widget class */

+    struct _XmuWidgetNode *superclass;	/* superclass of widget_class */

+    struct _XmuWidgetNode *children, *siblings;	/* subclass links */

+    char *lowered_label;		/* lowercase version of label */

+    char *lowered_classname;		/* lowercase version of class_name */

+    Bool have_resources;		/* resources have been fetched */

+    XtResourceList resources;		/* extracted resource database */

+    struct _XmuWidgetNode **resourcewn;	/* where resources come from */

+    Cardinal nresources;		/* number of resources */

+    XtResourceList constraints;		/* extracted constraint resources */

+    struct _XmuWidgetNode **constraintwn;  /* where constraints come from */

+    Cardinal nconstraints;		/* number of constraint resources */

+    XtPointer data;			/* extra data */

+} XmuWidgetNode;

+

+#define XmuWnClass(wn) ((wn)->widget_class_ptr[0])

+#define XmuWnClassname(wn) (XmuWnClass(wn)->core_class.class_name)

+#define XmuWnSuperclass(wn) ((XmuWnClass(wn))->core_class.superclass)

+

+					/* external interfaces */

+_XFUNCPROTOBEGIN

+

+void XmuWnInitializeNodes

+(

+ XmuWidgetNode		*nodearray,

+ int			nnodes

+ );

+

+void XmuWnFetchResources

+(

+ XmuWidgetNode		*node,

+ Widget			toplevel,

+ XmuWidgetNode		*topnode

+ );

+

+int XmuWnCountOwnedResources

+(

+ XmuWidgetNode		*node,

+ XmuWidgetNode		*ownernode,

+ Bool			constraints

+ );

+

+XmuWidgetNode *XmuWnNameToNode

+(

+ XmuWidgetNode		*nodelist,

+ int			nnodes,

+ _Xconst char		*name

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XmuWidgetNode_h */

+

diff --git a/X11/Xmu/WinUtil.h b/X11/Xmu/WinUtil.h
index 0445bcfa8..de1d0acaf 100644
--- a/X11/Xmu/WinUtil.h
+++ b/X11/Xmu/WinUtil.h
@@ -1,64 +1,61 @@
-/* $Xorg: WinUtil.h,v 1.4 2001/02/09 02:03:53 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/Xmu/WinUtil.h,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_WINDOWUTIL_H_
-#define _XMU_WINDOWUTIL_H_
-
-#include <X11/Xutil.h>
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-Window XmuClientWindow
-(
- Display	*dpy,
- Window 	win
- );
-
-Bool XmuUpdateMapHints
-(
- Display	*dpy,
- Window		win,
- XSizeHints	*hints
- );
-
-Screen *XmuScreenOfWindow
-(
- Display	*dpy,
- Window 	w
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XMU_WINDOWUTIL_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_WINDOWUTIL_H_

+#define _XMU_WINDOWUTIL_H_

+

+#include <X11/Xutil.h>

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+Window XmuClientWindow

+(

+ Display	*dpy,

+ Window 	win

+ );

+

+Bool XmuUpdateMapHints

+(

+ Display	*dpy,

+ Window		win,

+ XSizeHints	*hints

+ );

+

+Screen *XmuScreenOfWindow

+(

+ Display	*dpy,

+ Window 	w

+);

+

+_XFUNCPROTOEND

+

+#endif /* _XMU_WINDOWUTIL_H_ */

diff --git a/X11/Xmu/Xct.h b/X11/Xmu/Xct.h
index b06644ae0..337b70bc8 100644
--- a/X11/Xmu/Xct.h
+++ b/X11/Xmu/Xct.h
@@ -1,168 +1,165 @@
-/* $Xorg: Xct.h,v 1.4 2001/02/09 02:03:53 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/Xmu/Xct.h,v 1.6 2001/01/17 19:42:58 dawes Exp $ */
-
-#ifndef _Xct_h
-#define _Xct_h
-
-#include <X11/Xfuncproto.h>
-
-#define XctVersion 1
-
-typedef unsigned char *XctString;
-
-typedef enum {
-    XctUnspecified,
-    XctLeftToRight,
-    XctRightToLeft
-} XctHDirection;
-
-typedef unsigned long XctFlags;
-
-/* These are bits in XctFlags. */
-
-#define XctSingleSetSegments	0x0001
-   /* This means that returned segments should contain characters from only
-    * one set (C0, C1, GL, GR).  When this is requested, XctSegment is never
-    * returned, instead XctC0Segment, XctC1Segment, XctGlSegment, and
-    * XctGRSegment are returned.  C0 and C1 segments are always returned as
-    * singleton characters.
-    */
-
-#define XctProvideExtensions	0x0002
-   /* This means that if the Compound Text string is from a higher version
-    * than this code is implemented to, then syntactically correct but unknown
-    * control sequences should be returned as XctExtension items.  If this
-    * flag is not set, and the Compound Text string version indicates that
-    * extensions cannot be ignored, then each unknown control sequence will be
-    * reported as an XctError.
-    */
-
-#define XctAcceptC0Extensions	0x0004
-   /* This means that if the Compound Text string is from a higher version
-    * than this code is implemented to, then unknown C0 characters should be
-    * treated as if they were legal, and returned as C0 characters (regardless
-    * of how XctProvideExtensions is set).  If this flag is not set, then all
-    * unknown C0 characters are treated according to XctProvideExtensions.
-    */
-
-#define XctAcceptC1Extensions	0x0008
-   /* This means that if the Compound Text string is from a higher version
-    * than this code is implemented to, then unknown C0 characters should be
-    * treated as if they were legal, and returned as C0 characters (regardless
-    * of how XctProvideExtensions is set).  If this flag is not set, then all
-    * unknown C0 characters are treated according to XctProvideExtensions.
-    */
-
-#define XctHideDirection	0x0010
-   /* This means that horizontal direction changes should be reported as
-    * XctHorizontal items.  If this flag is not set, then direction changes are
-    * not returned as items, but the current direction is still maintained and
-    * reported for other items.
-    */
-
-#define XctFreeString		0x0020
-   /* This means that XctFree should free the Compound Text string (that was
-    * passed to XctCreate.  If this flag is not set, the string is not freed.
-    */
-
-#define XctShiftMultiGRToGL	0x0040
-   /* Translate GR segments on-the-fly into GL segments for the GR sets:
-    * GB2312.1980-1, JISX0208.1983-1, and KSC5601.1987-1.
-    */
-
-/* This is the return type for XctNextItem. */
-typedef enum {
-    XctSegment,		/* used when XctSingleSetSegments is not requested */
-    XctC0Segment,	/* used when XctSingleSetSegments is requested */
-    XctGLSegment,	/* used when XctSingleSetSegments is requested */
-    XctC1Segment,	/* used when XctSingleSetSegments is requested */
-    XctGRSegment,	/* used when XctSingleSetSegments is requested */
-    XctExtendedSegment,	/* an extended segment */
-    XctExtension,	/* used when XctProvideExtensions is requested */
-    XctHorizontal,	/* horizontal direction or depth change */
-    XctEndOfText,	/* end of text string */
-    XctError		/* syntactic or semantic error */
-} XctResult;
-
-typedef struct _XctRec {
-    XctString		total_string;	/* as given to XctCreate */
-    int			total_length;	/* as given to XctCreate */
-    XctFlags		flags;		/* as given to XctCreate */
-    int			version;	/* indicates the version of the CT spec
-					 * the string was produced from */
-    int			can_ignore_exts;/* non-zero if ignoring extensions is
-					 * acceptable, else zero */
-    XctString		item;		/* item returned from XctNextItem */
-    unsigned		item_length;	/* length of item in bytes */
-    int			char_size;	/* number of bytes per character in
-					 * item, with zero meaning variable */
-    char		*encoding;	/* Encoding name for item */
-    XctHDirection	horizontal;	/* direction of item */
-    unsigned		horz_depth;	/* current direction nesting depth */
-    char		*GL;		/* "{I} F" string for current GL */
-    char		*GL_encoding;	/* Encoding name for current GL */
-    int			GL_set_size;	/* 94 or 96 */
-    int			GL_char_size;	/* number of bytes per GL character */
-    char		*GR;		/* "{I} F" string for current GR */
-    char		*GR_encoding;	/* Encoding name for current GR */
-    int			GR_set_size;	/* 94 or 96 */
-    int			GR_char_size;	/* number of bytes per GR character */
-    char		*GLGR_encoding;	/* Encoding name for current GL+GR,
-					 * if known */
-    struct _XctPriv	*priv;		/* private to parser, don't peek */
-} *XctData;
-
-/* these are the external routines */
-_XFUNCPROTOBEGIN
-
-XctData XctCreate
-(
- _Xconst unsigned char	*string,
- int			length,
- XctFlags		flags
-);
-
-XctResult XctNextItem
-(
- XctData		data
-);
-
-void XctFree
-(
- XctData		data
- );
-
-void XctReset
-(
- XctData		data
- );
-
-_XFUNCPROTOEND
-
-#endif /* _Xct_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 _Xct_h

+#define _Xct_h

+

+#include <X11/Xfuncproto.h>

+

+#define XctVersion 1

+

+typedef unsigned char *XctString;

+

+typedef enum {

+    XctUnspecified,

+    XctLeftToRight,

+    XctRightToLeft

+} XctHDirection;

+

+typedef unsigned long XctFlags;

+

+/* These are bits in XctFlags. */

+

+#define XctSingleSetSegments	0x0001

+   /* This means that returned segments should contain characters from only

+    * one set (C0, C1, GL, GR).  When this is requested, XctSegment is never

+    * returned, instead XctC0Segment, XctC1Segment, XctGlSegment, and

+    * XctGRSegment are returned.  C0 and C1 segments are always returned as

+    * singleton characters.

+    */

+

+#define XctProvideExtensions	0x0002

+   /* This means that if the Compound Text string is from a higher version

+    * than this code is implemented to, then syntactically correct but unknown

+    * control sequences should be returned as XctExtension items.  If this

+    * flag is not set, and the Compound Text string version indicates that

+    * extensions cannot be ignored, then each unknown control sequence will be

+    * reported as an XctError.

+    */

+

+#define XctAcceptC0Extensions	0x0004

+   /* This means that if the Compound Text string is from a higher version

+    * than this code is implemented to, then unknown C0 characters should be

+    * treated as if they were legal, and returned as C0 characters (regardless

+    * of how XctProvideExtensions is set).  If this flag is not set, then all

+    * unknown C0 characters are treated according to XctProvideExtensions.

+    */

+

+#define XctAcceptC1Extensions	0x0008

+   /* This means that if the Compound Text string is from a higher version

+    * than this code is implemented to, then unknown C0 characters should be

+    * treated as if they were legal, and returned as C0 characters (regardless

+    * of how XctProvideExtensions is set).  If this flag is not set, then all

+    * unknown C0 characters are treated according to XctProvideExtensions.

+    */

+

+#define XctHideDirection	0x0010

+   /* This means that horizontal direction changes should be reported as

+    * XctHorizontal items.  If this flag is not set, then direction changes are

+    * not returned as items, but the current direction is still maintained and

+    * reported for other items.

+    */

+

+#define XctFreeString		0x0020

+   /* This means that XctFree should free the Compound Text string (that was

+    * passed to XctCreate.  If this flag is not set, the string is not freed.

+    */

+

+#define XctShiftMultiGRToGL	0x0040

+   /* Translate GR segments on-the-fly into GL segments for the GR sets:

+    * GB2312.1980-1, JISX0208.1983-1, and KSC5601.1987-1.

+    */

+

+/* This is the return type for XctNextItem. */

+typedef enum {

+    XctSegment,		/* used when XctSingleSetSegments is not requested */

+    XctC0Segment,	/* used when XctSingleSetSegments is requested */

+    XctGLSegment,	/* used when XctSingleSetSegments is requested */

+    XctC1Segment,	/* used when XctSingleSetSegments is requested */

+    XctGRSegment,	/* used when XctSingleSetSegments is requested */

+    XctExtendedSegment,	/* an extended segment */

+    XctExtension,	/* used when XctProvideExtensions is requested */

+    XctHorizontal,	/* horizontal direction or depth change */

+    XctEndOfText,	/* end of text string */

+    XctError		/* syntactic or semantic error */

+} XctResult;

+

+typedef struct _XctRec {

+    XctString		total_string;	/* as given to XctCreate */

+    int			total_length;	/* as given to XctCreate */

+    XctFlags		flags;		/* as given to XctCreate */

+    int			version;	/* indicates the version of the CT spec

+					 * the string was produced from */

+    int			can_ignore_exts;/* non-zero if ignoring extensions is

+					 * acceptable, else zero */

+    XctString		item;		/* item returned from XctNextItem */

+    unsigned		item_length;	/* length of item in bytes */

+    int			char_size;	/* number of bytes per character in

+					 * item, with zero meaning variable */

+    char		*encoding;	/* Encoding name for item */

+    XctHDirection	horizontal;	/* direction of item */

+    unsigned		horz_depth;	/* current direction nesting depth */

+    char		*GL;		/* "{I} F" string for current GL */

+    char		*GL_encoding;	/* Encoding name for current GL */

+    int			GL_set_size;	/* 94 or 96 */

+    int			GL_char_size;	/* number of bytes per GL character */

+    char		*GR;		/* "{I} F" string for current GR */

+    char		*GR_encoding;	/* Encoding name for current GR */

+    int			GR_set_size;	/* 94 or 96 */

+    int			GR_char_size;	/* number of bytes per GR character */

+    char		*GLGR_encoding;	/* Encoding name for current GL+GR,

+					 * if known */

+    struct _XctPriv	*priv;		/* private to parser, don't peek */

+} *XctData;

+

+/* these are the external routines */

+_XFUNCPROTOBEGIN

+

+XctData XctCreate

+(

+ _Xconst unsigned char	*string,

+ int			length,

+ XctFlags		flags

+);

+

+XctResult XctNextItem

+(

+ XctData		data

+);

+

+void XctFree

+(

+ XctData		data

+ );

+

+void XctReset

+(

+ XctData		data

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _Xct_h */

diff --git a/X11/Xmu/Xmu.h b/X11/Xmu/Xmu.h
index c503a41b8..8ab9d7913 100644
--- a/X11/Xmu/Xmu.h
+++ b/X11/Xmu/Xmu.h
@@ -1,128 +1,122 @@
-/* $Xorg: Xmu.h,v 1.4 2001/02/09 02:03:53 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/Xmu/Xmu.h,v 1.9 2001/12/14 19:55:59 dawes Exp $ */
-
-/*
- * The interfaces described by this header file are for miscellaneous utilities
- * and are not part of the Xlib standard.
- */
-
-#ifndef _XMU_H_
-#define _XMU_H_
-
-#include <X11/Intrinsic.h>
-#include <X11/Xmu/Atoms.h>		/* _XA_... */
-#include <X11/Xmu/CharSet.h>		/* CopyISOLatin1Lowered */
-#include <X11/Xmu/Converters.h>		/* CvtStringTo... */
-#include <X11/Xmu/Drawing.h>		/* DrawRoundedRect, DrawLogo */
-#include <X11/Xmu/Error.h>		/* PrintDefaultError */
-#include <X11/Xmu/StdSel.h>		/* ConvertStandardSelection */
-
-/*
- * clip lists
- */
-typedef struct _XmuSegment {
-  int x1, x2;
-  struct _XmuSegment *next;
-} XmuSegment;
-
-typedef struct _XmuScanline {   
-  int y;
-  XmuSegment *segment;
-  struct _XmuScanline *next;
-} XmuScanline;
-                              
-typedef struct _XmuArea {
-  XmuScanline *scanline;     
-} XmuArea;
-
-#define XmuCreateArea()		XmuNewArea(0, 0, 0, 0)
-#define XmuAreaOr(dst, src)	XmuAreaOrXor((dst), (src), True)
-#define XmuAreaXor(dst, src)	XmuAreaOrXor((dst), (src), False)
-
-#define XmuDestroyArea(a)					\
-		  do {						\
-		    XmuDestroyScanlineList((a)->scanline);	\
-		    XtFree((char *)(a));			\
-		  } while (0)
-
-#define FreeArea(a)						\
-		  do {						\
-		    XmuDestroyScanlineList((a)->scanline);	\
-		    a->scanline = (Scanline *)0;		\
-		  } while (0)
-
-#define XmuValidSegment(s)	((s)->x1 < (s)->x2)
-#define XmuSegmentEqu(s1, s2)	((s1)->x1 == (s2)->x1 && (s1)->x2 == (s2)->x2)
-#define XmuDestroySegment(s)	XtFree((char *)(s))
-
-#define XmuDestroyScanline(s)					\
-		  do {						\
-		    XmuDestroySegmentList((s)->segment);	\
-		    XtFree((char*)(s));				\
-		  } while (0)
-
-XmuArea *XmuNewArea(int, int, int, int);
-XmuArea *XmuAreaDup(XmuArea*);
-XmuArea *XmuAreaCopy(XmuArea*, XmuArea*);
-XmuArea *XmuAreaNot(XmuArea*, int, int, int, int);
-XmuArea *XmuAreaOrXor(XmuArea*, XmuArea*, Bool);
-XmuArea *XmuAreaAnd(XmuArea*, XmuArea*);
-Bool XmuValidArea(XmuArea*);
-Bool XmuValidScanline(XmuScanline*);
-Bool XmuScanlineEqu(XmuScanline*, XmuScanline*);
-XmuSegment *XmuNewSegment(int, int);
-void XmuDestroySegmentList(XmuSegment*);
-XmuScanline *XmuScanlineCopy(XmuScanline*, XmuScanline*);
-Bool XmuAppendSegment(XmuSegment*, XmuSegment*);
-XmuScanline *XmuOptimizeScanline(XmuScanline*);
-XmuScanline *XmuScanlineNot(XmuScanline *scanline, int, int);
-XmuScanline *XmuScanlineOr(XmuScanline*, XmuScanline*);
-XmuScanline *XmuScanlineAnd(XmuScanline*, XmuScanline*);
-XmuScanline *XmuScanlineXor(XmuScanline*, XmuScanline*);
-XmuScanline *XmuNewScanline(int, int, int);
-void XmuDestroyScanlineList(XmuScanline*);
-XmuArea *XmuOptimizeArea(XmuArea *area);
-
-#ifndef notdef
-XmuScanline *XmuScanlineOrSegment(XmuScanline*, XmuSegment*);
-XmuScanline *XmuScanlineAndSegment(XmuScanline*, XmuSegment*);
-XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*);
-#endif /* notdef */
-
-#ifndef _SYSUTIL_H_
-int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...)
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
-__attribute((format(printf,3,4)))
-#endif
-;
-#endif
-
-#endif /* _XMU_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.

+

+*/

+

+/*

+ * The interfaces described by this header file are for miscellaneous utilities

+ * and are not part of the Xlib standard.

+ */

+

+#ifndef _XMU_H_

+#define _XMU_H_

+

+#include <X11/Xfuncproto.h>

+#include <X11/Intrinsic.h>

+#include <X11/Xmu/Atoms.h>		/* _XA_... */

+#include <X11/Xmu/CharSet.h>		/* CopyISOLatin1Lowered */

+#include <X11/Xmu/Converters.h>		/* CvtStringTo... */

+#include <X11/Xmu/Drawing.h>		/* DrawRoundedRect, DrawLogo */

+#include <X11/Xmu/Error.h>		/* PrintDefaultError */

+#include <X11/Xmu/StdSel.h>		/* ConvertStandardSelection */

+

+/*

+ * clip lists

+ */

+typedef struct _XmuSegment {

+  int x1, x2;

+  struct _XmuSegment *next;

+} XmuSegment;

+

+typedef struct _XmuScanline {   

+  int y;

+  XmuSegment *segment;

+  struct _XmuScanline *next;

+} XmuScanline;

+                              

+typedef struct _XmuArea {

+  XmuScanline *scanline;     

+} XmuArea;

+

+#define XmuCreateArea()		XmuNewArea(0, 0, 0, 0)

+#define XmuAreaOr(dst, src)	XmuAreaOrXor((dst), (src), True)

+#define XmuAreaXor(dst, src)	XmuAreaOrXor((dst), (src), False)

+

+#define XmuDestroyArea(a)					\

+		  do {						\

+		    XmuDestroyScanlineList((a)->scanline);	\

+		    XtFree((char *)(a));			\

+		  } while (0)

+

+#define FreeArea(a)						\

+		  do {						\

+		    XmuDestroyScanlineList((a)->scanline);	\

+		    a->scanline = (Scanline *)0;		\

+		  } while (0)

+

+#define XmuValidSegment(s)	((s)->x1 < (s)->x2)

+#define XmuSegmentEqu(s1, s2)	((s1)->x1 == (s2)->x1 && (s1)->x2 == (s2)->x2)

+#define XmuDestroySegment(s)	XtFree((char *)(s))

+

+#define XmuDestroyScanline(s)					\

+		  do {						\

+		    XmuDestroySegmentList((s)->segment);	\

+		    XtFree((char*)(s));				\

+		  } while (0)

+

+XmuArea *XmuNewArea(int, int, int, int);

+XmuArea *XmuAreaDup(XmuArea*);

+XmuArea *XmuAreaCopy(XmuArea*, XmuArea*);

+XmuArea *XmuAreaNot(XmuArea*, int, int, int, int);

+XmuArea *XmuAreaOrXor(XmuArea*, XmuArea*, Bool);

+XmuArea *XmuAreaAnd(XmuArea*, XmuArea*);

+Bool XmuValidArea(XmuArea*);

+Bool XmuValidScanline(XmuScanline*);

+Bool XmuScanlineEqu(XmuScanline*, XmuScanline*);

+XmuSegment *XmuNewSegment(int, int);

+void XmuDestroySegmentList(XmuSegment*);

+XmuScanline *XmuScanlineCopy(XmuScanline*, XmuScanline*);

+Bool XmuAppendSegment(XmuSegment*, XmuSegment*);

+XmuScanline *XmuOptimizeScanline(XmuScanline*);

+XmuScanline *XmuScanlineNot(XmuScanline *scanline, int, int);

+XmuScanline *XmuScanlineOr(XmuScanline*, XmuScanline*);

+XmuScanline *XmuScanlineAnd(XmuScanline*, XmuScanline*);

+XmuScanline *XmuScanlineXor(XmuScanline*, XmuScanline*);

+XmuScanline *XmuNewScanline(int, int, int);

+void XmuDestroyScanlineList(XmuScanline*);

+XmuArea *XmuOptimizeArea(XmuArea *area);

+

+#ifndef notdef

+XmuScanline *XmuScanlineOrSegment(XmuScanline*, XmuSegment*);

+XmuScanline *XmuScanlineAndSegment(XmuScanline*, XmuSegment*);

+XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*);

+#endif /* notdef */

+

+#ifndef _SYSUTIL_H_

+int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...)

+    _X_ATTRIBUTE_PRINTF(3,4);

+#endif

+

+#endif /* _XMU_H_ */

+