Synchronised files

130 files changed, 18748 insertions, 19190 deletions

diff --git a/X11/CallbackI.h b/X11/CallbackI.h
index 64e815256..d11134a5d 100644
--- a/X11/CallbackI.h
+++ b/X11/CallbackI.h
@@ -1,121 +1,119 @@
-/* $Xorg: CallbackI.h,v 1.4 2001/02/09 02:03:54 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.
-
-******************************************************************/
-/* $XFree86$ */
-
-/****************************************************************
- *
- * Callbacks
- *
- ****************************************************************/
-
-typedef XrmResource **CallbackTable;
-
-#define _XtCBCalling 1
-#define _XtCBFreeAfterCalling 2
-
-_XFUNCPROTOBEGIN
-
-typedef struct internalCallbackRec {
-    unsigned short count;
-    char	   is_padded;	/* contains NULL padding for external form */
-    char	   call_state;  /* combination of _XtCB{FreeAfter}Calling */
-#ifdef LONG64
-    unsigned int   align_pad;	/* padding to align callback list */
-#endif
-    /* XtCallbackList */
-} InternalCallbackRec, *InternalCallbackList;
-
-typedef Boolean (*_XtConditionProc)(
-    XtPointer	/* data */
-);
-
-extern void _XtAddCallback(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer 			/* closure */
-);
-
-extern void _XtAddCallbackOnce(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer 			/* closure */
-);
-
-extern InternalCallbackList _XtCompileCallbackList(
-    XtCallbackList		/* xtcallbacks */
-);
-
-extern XtCallbackList _XtGetCallbackList(
-    InternalCallbackList*	/* callbacks */
-);
-
-extern void _XtRemoveAllCallbacks(
-    InternalCallbackList*	/* callbacks */
-);
-
-extern void _XtRemoveCallback(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer			/* closure */
-);
-
-extern void _XtPeekCallback(
-    Widget			/* widget */,
-    XtCallbackList		/* callbacks */,
-    XtCallbackProc *		/* callback */,
-    XtPointer *			/* closure */
-);
-
-extern void _XtCallConditionalCallbackList(
-    Widget			/* widget */,
-    XtCallbackList		/* callbacks */,
-    XtPointer			/* call_data */,
-    _XtConditionProc		/* cond_proc */
-);
-
-_XFUNCPROTOEND
+/***********************************************************

+

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

+

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

+

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

+ *

+ * Callbacks

+ *

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

+

+typedef XrmResource **CallbackTable;

+

+#define _XtCBCalling 1

+#define _XtCBFreeAfterCalling 2

+

+_XFUNCPROTOBEGIN

+

+typedef struct internalCallbackRec {

+    unsigned short count;

+    char	   is_padded;	/* contains NULL padding for external form */

+    char	   call_state;  /* combination of _XtCB{FreeAfter}Calling */

+#ifdef LONG64

+    unsigned int   align_pad;	/* padding to align callback list */

+#endif

+    /* XtCallbackList */

+} InternalCallbackRec, *InternalCallbackList;

+

+typedef Boolean (*_XtConditionProc)(

+    XtPointer	/* data */

+);

+

+extern void _XtAddCallback(

+    InternalCallbackList*	/* callbacks */,

+    XtCallbackProc		/* callback */,

+    XtPointer 			/* closure */

+);

+

+extern void _XtAddCallbackOnce(

+    InternalCallbackList*	/* callbacks */,

+    XtCallbackProc		/* callback */,

+    XtPointer 			/* closure */

+);

+

+extern InternalCallbackList _XtCompileCallbackList(

+    XtCallbackList		/* xtcallbacks */

+);

+

+extern XtCallbackList _XtGetCallbackList(

+    InternalCallbackList*	/* callbacks */

+);

+

+extern void _XtRemoveAllCallbacks(

+    InternalCallbackList*	/* callbacks */

+);

+

+extern void _XtRemoveCallback(

+    InternalCallbackList*	/* callbacks */,

+    XtCallbackProc		/* callback */,

+    XtPointer			/* closure */

+);

+

+extern void _XtPeekCallback(

+    Widget			/* widget */,

+    XtCallbackList		/* callbacks */,

+    XtCallbackProc *		/* callback */,

+    XtPointer *			/* closure */

+);

+

+extern void _XtCallConditionalCallbackList(

+    Widget			/* widget */,

+    XtCallbackList		/* callbacks */,

+    XtPointer			/* call_data */,

+    _XtConditionProc		/* cond_proc */

+);

+

+_XFUNCPROTOEND

diff --git a/X11/Composite.h b/X11/Composite.h
index c3c982868..f9ab03e5a 100644
--- a/X11/Composite.h
+++ b/X11/Composite.h
@@ -1,105 +1,102 @@
-/* $Xorg: Composite.h,v 1.4 2001/02/09 02:03:54 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.
-
-******************************************************************/
-/* $XFree86$ */
-
-#ifndef _XtComposite_h
-#define _XtComposite_h
-
-typedef struct _CompositeClassRec *CompositeWidgetClass;
-
-typedef Cardinal (*XtOrderProc)(
-    Widget 	/* child */
-);
-
-_XFUNCPROTOBEGIN
-
-extern void XtManageChildren(
-    WidgetList 		/* children */,
-    Cardinal 		/* num_children */
-);
-
-extern void XtManageChild(
-    Widget 		/* child */
-);
-
-extern void XtUnmanageChildren(
-    WidgetList 		/* children */,
-    Cardinal 		/* num_children */
-);
-
-extern void XtUnmanageChild(
-    Widget 		/* child */
-);
-
-typedef void (*XtDoChangeProc)(
-    Widget		/* composite_parent */,
-    WidgetList		/* unmanage_children */,
-    Cardinal *		/* num_unmanage_children */,
-    WidgetList		/* manage_children */,
-    Cardinal *		/* num_manage_children */,
-    XtPointer		/* client_data */
-);
-
-extern void XtChangeManagedSet(
-    WidgetList		/* unmanage_children */,
-    Cardinal		/* num_unmanage_children */,
-    XtDoChangeProc	/* do_change_proc */,
-    XtPointer		/* client_data */,
-    WidgetList		/* manage_children */,
-    Cardinal		/* num_manage_children */
-);
-
-_XFUNCPROTOEND
-
-#ifndef VMS
-externalref WidgetClass compositeWidgetClass;
-#endif
-
-#endif /* _XtComposite_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtComposite_h

+#define _XtComposite_h

+

+typedef struct _CompositeClassRec *CompositeWidgetClass;

+

+typedef Cardinal (*XtOrderProc)(

+    Widget 	/* child */

+);

+

+_XFUNCPROTOBEGIN

+

+extern void XtManageChildren(

+    WidgetList 		/* children */,

+    Cardinal 		/* num_children */

+);

+

+extern void XtManageChild(

+    Widget 		/* child */

+);

+

+extern void XtUnmanageChildren(

+    WidgetList 		/* children */,

+    Cardinal 		/* num_children */

+);

+

+extern void XtUnmanageChild(

+    Widget 		/* child */

+);

+

+typedef void (*XtDoChangeProc)(

+    Widget		/* composite_parent */,

+    WidgetList		/* unmanage_children */,

+    Cardinal *		/* num_unmanage_children */,

+    WidgetList		/* manage_children */,

+    Cardinal *		/* num_manage_children */,

+    XtPointer		/* client_data */

+);

+

+extern void XtChangeManagedSet(

+    WidgetList		/* unmanage_children */,

+    Cardinal		/* num_unmanage_children */,

+    XtDoChangeProc	/* do_change_proc */,

+    XtPointer		/* client_data */,

+    WidgetList		/* manage_children */,

+    Cardinal		/* num_manage_children */

+);

+

+_XFUNCPROTOEND

+

+#ifndef VMS

+externalref WidgetClass compositeWidgetClass;

+#endif

+

+#endif /* _XtComposite_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/CompositeP.h b/X11/CompositeP.h
index e93275ace..8c447bd7e 100644
--- a/X11/CompositeP.h
+++ b/X11/CompositeP.h
@@ -1,115 +1,113 @@
-/* $Xorg: CompositeP.h,v 1.4 2001/02/09 02:03:54 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.
-
-******************************************************************/
-
-#ifndef _XtCompositeP_h
-#define _XtCompositeP_h
-
-#include <X11/Composite.h>
-
-_XFUNCPROTOBEGIN
-
-/************************************************************************
- *
- * Additional instance fields for widgets of (sub)class 'Composite' 
- *
- ************************************************************************/
-
-typedef struct _CompositePart {
-    WidgetList  children;	     /* array of ALL widget children	     */
-    Cardinal    num_children;	     /* total number of widget children	     */
-    Cardinal    num_slots;           /* number of slots in children array    */
-    XtOrderProc insert_position;     /* compute position of new child	     */
-} CompositePart,*CompositePtr;
-
-typedef struct _CompositeRec {
-    CorePart      core;
-    CompositePart composite;
-} CompositeRec;
-
-/*********************************************************************
- *
- *  Additional class fields for widgets of (sub)class 'Composite'
- *
- ********************************************************************/
-
-typedef struct _CompositeClassPart {
-    XtGeometryHandler geometry_manager;	  /* geometry manager for children   */
-    XtWidgetProc      change_managed;	  /* change managed state of child   */
-    XtWidgetProc      insert_child;	  /* physically add child to parent  */
-    XtWidgetProc      delete_child;	  /* physically remove child	     */
-    XtPointer	      extension;	  /* pointer to extension record     */
-} CompositeClassPart,*CompositePartPtr;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 mandated for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; on CompositeClassPart */
-    long version;		/* must be XtCompositeExtensionVersion */
-    Cardinal record_size;	/* sizeof(CompositeClassExtensionRec) */
-    Boolean accepts_objects;
-    Boolean allows_change_managed_set;
-} CompositeClassExtensionRec, *CompositeClassExtension;
-
-
-typedef struct _CompositeClassRec {
-     CoreClassPart      core_class;
-     CompositeClassPart composite_class;
-} CompositeClassRec;
-
-externalref CompositeClassRec compositeClassRec;
-
-_XFUNCPROTOEND
-
-#define XtCompositeExtensionVersion 2L
-#define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
-#define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
-#define XtInheritInsertChild ((XtWidgetProc) _XtInherit)
-#define XtInheritDeleteChild ((XtWidgetProc) _XtInherit)
-
-#endif /* _XtCompositeP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtCompositeP_h

+#define _XtCompositeP_h

+

+#include <X11/Composite.h>

+

+_XFUNCPROTOBEGIN

+

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

+ *

+ * Additional instance fields for widgets of (sub)class 'Composite' 

+ *

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

+

+typedef struct _CompositePart {

+    WidgetList  children;	     /* array of ALL widget children	     */

+    Cardinal    num_children;	     /* total number of widget children	     */

+    Cardinal    num_slots;           /* number of slots in children array    */

+    XtOrderProc insert_position;     /* compute position of new child	     */

+} CompositePart,*CompositePtr;

+

+typedef struct _CompositeRec {

+    CorePart      core;

+    CompositePart composite;

+} CompositeRec;

+

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

+ *

+ *  Additional class fields for widgets of (sub)class 'Composite'

+ *

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

+

+typedef struct _CompositeClassPart {

+    XtGeometryHandler geometry_manager;	  /* geometry manager for children   */

+    XtWidgetProc      change_managed;	  /* change managed state of child   */

+    XtWidgetProc      insert_child;	  /* physically add child to parent  */

+    XtWidgetProc      delete_child;	  /* physically remove child	     */

+    XtPointer	      extension;	  /* pointer to extension record     */

+} CompositeClassPart,*CompositePartPtr;

+

+typedef struct {

+    XtPointer next_extension;	/* 1st 4 mandated for all extension records */

+    XrmQuark record_type;	/* NULLQUARK; on CompositeClassPart */

+    long version;		/* must be XtCompositeExtensionVersion */

+    Cardinal record_size;	/* sizeof(CompositeClassExtensionRec) */

+    Boolean accepts_objects;

+    Boolean allows_change_managed_set;

+} CompositeClassExtensionRec, *CompositeClassExtension;

+

+

+typedef struct _CompositeClassRec {

+     CoreClassPart      core_class;

+     CompositeClassPart composite_class;

+} CompositeClassRec;

+

+externalref CompositeClassRec compositeClassRec;

+

+_XFUNCPROTOEND

+

+#define XtCompositeExtensionVersion 2L

+#define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)

+#define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)

+#define XtInheritInsertChild ((XtWidgetProc) _XtInherit)

+#define XtInheritDeleteChild ((XtWidgetProc) _XtInherit)

+

+#endif /* _XtCompositeP_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/ConstrainP.h b/X11/ConstrainP.h
index 7030a3411..eb2bb3180 100644
--- a/X11/ConstrainP.h
+++ b/X11/ConstrainP.h
@@ -1,98 +1,96 @@
-/* $Xorg: ConstrainP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/* $oHeader: ConstrainP.h,v 1.2 88/08/18 15:54:15 asente 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.
-
-******************************************************************/
-
-#ifndef _XtConstraintP_h
-#define _XtConstraintP_h
-
-#include <X11/Constraint.h>
-
-_XFUNCPROTOBEGIN
-
-typedef struct _ConstraintPart {
-    XtPointer   mumble;		/* No new fields, keep C compiler happy */
-} ConstraintPart;
-
-typedef struct _ConstraintRec {
-    CorePart	    core;
-    CompositePart   composite;
-    ConstraintPart  constraint;
-} ConstraintRec, *ConstraintWidget;
-
-typedef struct _ConstraintClassPart {
-    XtResourceList resources;	      /* constraint resource list	     */
-    Cardinal   num_resources;         /* number of constraints in list       */
-    Cardinal   constraint_size;       /* size of constraint record           */
-    XtInitProc initialize;            /* constraint initialization           */
-    XtWidgetProc destroy;             /* constraint destroy proc             */
-    XtSetValuesFunc set_values;       /* constraint set_values proc          */
-    XtPointer	    extension;		/* pointer to extension record      */
-} ConstraintClassPart;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 mandated for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; on ConstraintClassPart */
-    long version;		/* must be XtConstraintExtensionVersion */
-    Cardinal record_size;	/* sizeof(ConstraintClassExtensionRec) */
-    XtArgsProc get_values_hook;
-} ConstraintClassExtensionRec, *ConstraintClassExtension;
-
-typedef struct _ConstraintClassRec {
-    CoreClassPart       core_class;
-    CompositeClassPart  composite_class;
-    ConstraintClassPart constraint_class;
-} ConstraintClassRec;
-
-externalref ConstraintClassRec constraintClassRec;
-
-_XFUNCPROTOEND
-
-#define XtConstraintExtensionVersion 1L
-
-#endif /* _XtConstraintP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtConstraintP_h

+#define _XtConstraintP_h

+

+#include <X11/Constraint.h>

+

+_XFUNCPROTOBEGIN

+

+typedef struct _ConstraintPart {

+    XtPointer   mumble;		/* No new fields, keep C compiler happy */

+} ConstraintPart;

+

+typedef struct _ConstraintRec {

+    CorePart	    core;

+    CompositePart   composite;

+    ConstraintPart  constraint;

+} ConstraintRec, *ConstraintWidget;

+

+typedef struct _ConstraintClassPart {

+    XtResourceList resources;	      /* constraint resource list	     */

+    Cardinal   num_resources;         /* number of constraints in list       */

+    Cardinal   constraint_size;       /* size of constraint record           */

+    XtInitProc initialize;            /* constraint initialization           */

+    XtWidgetProc destroy;             /* constraint destroy proc             */

+    XtSetValuesFunc set_values;       /* constraint set_values proc          */

+    XtPointer	    extension;		/* pointer to extension record      */

+} ConstraintClassPart;

+

+typedef struct {

+    XtPointer next_extension;	/* 1st 4 mandated for all extension records */

+    XrmQuark record_type;	/* NULLQUARK; on ConstraintClassPart */

+    long version;		/* must be XtConstraintExtensionVersion */

+    Cardinal record_size;	/* sizeof(ConstraintClassExtensionRec) */

+    XtArgsProc get_values_hook;

+} ConstraintClassExtensionRec, *ConstraintClassExtension;

+

+typedef struct _ConstraintClassRec {

+    CoreClassPart       core_class;

+    CompositeClassPart  composite_class;

+    ConstraintClassPart constraint_class;

+} ConstraintClassRec;

+

+externalref ConstraintClassRec constraintClassRec;

+

+_XFUNCPROTOEND

+

+#define XtConstraintExtensionVersion 1L

+

+#endif /* _XtConstraintP_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/Constraint.h b/X11/Constraint.h
index 977e7eeac..cdc2de761 100644
--- a/X11/Constraint.h
+++ b/X11/Constraint.h
@@ -1,64 +1,62 @@
-/* $Xorg: Constraint.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/* $oHeader: Constraint.h,v 1.2 88/08/18 15:54:18 asente 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.
-
-******************************************************************/
-
-#ifndef _XtConstraint_h
-#define _XtConstraint_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-
-#ifndef VMS
-externalref WidgetClass constraintWidgetClass;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtConstraint_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtConstraint_h

+#define _XtConstraint_h

+

+_XFUNCPROTOBEGIN

+

+typedef struct _ConstraintClassRec *ConstraintWidgetClass;

+

+#ifndef VMS

+externalref WidgetClass constraintWidgetClass;

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XtConstraint_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/ConvertI.h b/X11/ConvertI.h
index f3f7fb0ba..c5ced0c35 100644
--- a/X11/ConvertI.h
+++ b/X11/ConvertI.h
@@ -1,99 +1,96 @@
-/* $Xorg: ConvertI.h,v 1.4 2001/02/09 02:03:54 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
-
-_XFUNCPROTOBEGIN
-
-/* Representation types */
-
-extern	XrmQuark  _XtQString;
-
-/*
- * Resource conversions
- */
-
-typedef struct _ConverterRec **ConverterTable;
-
-extern void _XtAddDefaultConverters(
-    ConverterTable	/* table */
-);
-
-extern void _XtSetDefaultConverterTable(
-    ConverterTable* 		/* table */
-);
-
-extern void _XtFreeConverterTable(
-    ConverterTable 		/* table */
-);
-
-extern void _XtTableAddConverter(
-    ConverterTable		/* table */,
-    XrmRepresentation    	/* from_type */,
-    XrmRepresentation    	/* to_type */,
-    XtTypeConverter      	/* converter */,
-    XtConvertArgList     	/* convert_args */,
-    Cardinal             	/* num_args */,
-    _XtBoolean              	/* new_style */,
-    XtCacheType	    		/* cache_type */,
-    XtDestructor         	/* destructor */,
-    _XtBoolean			/* global */
-);
-
-extern Boolean _XtConvert(
-    Widget			/* widget */,
-    XrmRepresentation    	/* from_type */,
-    XrmValuePtr			/* from */,
-    XrmRepresentation		/* to_type */,
-    XrmValuePtr			/* to */,
-    XtCacheRef*			/* cache_ref_return */
-);
-
-void _XtConvertInitialize(void);
-
-_XFUNCPROTOEND
+/***********************************************************

+

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

+

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

+

+_XFUNCPROTOBEGIN

+

+/* Representation types */

+

+extern	XrmQuark  _XtQString;

+

+/*

+ * Resource conversions

+ */

+

+typedef struct _ConverterRec **ConverterTable;

+

+extern void _XtAddDefaultConverters(

+    ConverterTable	/* table */

+);

+

+extern void _XtSetDefaultConverterTable(

+    ConverterTable* 		/* table */

+);

+

+extern void _XtFreeConverterTable(

+    ConverterTable 		/* table */

+);

+

+extern void _XtTableAddConverter(

+    ConverterTable		/* table */,

+    XrmRepresentation    	/* from_type */,

+    XrmRepresentation    	/* to_type */,

+    XtTypeConverter      	/* converter */,

+    XtConvertArgList     	/* convert_args */,

+    Cardinal             	/* num_args */,

+    _XtBoolean              	/* new_style */,

+    XtCacheType	    		/* cache_type */,

+    XtDestructor         	/* destructor */,

+    _XtBoolean			/* global */

+);

+

+extern Boolean _XtConvert(

+    Widget			/* widget */,

+    XrmRepresentation    	/* from_type */,

+    XrmValuePtr			/* from */,

+    XrmRepresentation		/* to_type */,

+    XrmValuePtr			/* to */,

+    XtCacheRef*			/* cache_ref_return */

+);

+

+void _XtConvertInitialize(void);

+

+_XFUNCPROTOEND

diff --git a/X11/Core.h b/X11/Core.h
index 5127b501a..7e1bc4658 100644
--- a/X11/Core.h
+++ b/X11/Core.h
@@ -1,70 +1,65 @@
-/*
-* $Xorg: Core.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $
-* $oHeader: Core.h,v 1.2 88/08/18 15:54:32 asente 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.
-
-******************************************************************/
-
-#ifndef _XtCore_h
-#define _XtCore_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _WidgetClassRec *CoreWidgetClass;
-typedef struct _WidgetRec *CoreWidget;
-externalref WidgetClass coreWidgetClass;
-
-#ifndef VMS
-externalref WidgetClass widgetClass;
-
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtCore_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtCore_h

+#define _XtCore_h

+

+_XFUNCPROTOBEGIN

+

+typedef struct _WidgetClassRec *CoreWidgetClass;

+typedef struct _WidgetRec *CoreWidget;

+externalref WidgetClass coreWidgetClass;

+

+#ifndef VMS

+externalref WidgetClass widgetClass;

+

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XtCore_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/CoreP.h b/X11/CoreP.h
index 57836e615..c383cc98d 100644
--- a/X11/CoreP.h
+++ b/X11/CoreP.h
@@ -1,175 +1,170 @@
-/*
-* $Xorg: CoreP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $
-* $oHeader: CoreP.h,v 1.2 88/08/18 15:54:37 asente 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.
-
-******************************************************************/
-
-#ifndef XtCoreP_h
-#define XtCoreP_h
-
-#include <X11/Core.h>
-
-_XFUNCPROTOBEGIN
-
-externalref int _XtInheritTranslations;
-
-#define XtInheritTranslations  ((String) &_XtInheritTranslations)
-#define XtInheritRealize ((XtRealizeProc) _XtInherit)
-#define XtInheritResize ((XtWidgetProc) _XtInherit)
-#define XtInheritExpose ((XtExposeProc) _XtInherit)
-#define XtInheritSetValuesAlmost ((XtAlmostProc) _XtInherit)
-#define XtInheritAcceptFocus ((XtAcceptFocusProc) _XtInherit)
-#define XtInheritQueryGeometry ((XtGeometryHandler) _XtInherit)
-#define XtInheritDisplayAccelerator ((XtStringProc) _XtInherit)
-
-/***************************************************************
- * Widget Core Data Structures
- *
- *
- **************************************************************/
-
-typedef struct _CorePart {
-    Widget	    self;		/* pointer to widget itself	     */
-    WidgetClass	    widget_class;	/* pointer to Widget's ClassRec	     */
-    Widget	    parent;		/* parent widget	  	     */
-    XrmName         xrm_name;		/* widget resource name quarkified   */
-    Boolean         being_destroyed;	/* marked for destroy		     */
-    XtCallbackList  destroy_callbacks;	/* who to call when widget destroyed */
-    XtPointer       constraints;        /* constraint record                 */
-    Position        x, y;		/* window position		     */
-    Dimension       width, height;	/* window dimensions		     */
-    Dimension       border_width;	/* window border width		     */
-    Boolean         managed;            /* is widget geometry managed?       */
-    Boolean	    sensitive;		/* is widget sensitive to user events*/
-    Boolean         ancestor_sensitive;	/* are all ancestors sensitive?      */
-    XtEventTable    event_table;	/* private to event dispatcher       */
-    XtTMRec	    tm;                 /* translation management            */
-    XtTranslations  accelerators;       /* accelerator translations          */
-    Pixel	    border_pixel;	/* window border pixel		     */
-    Pixmap          border_pixmap;	/* window border pixmap or NULL      */
-    WidgetList      popup_list;         /* list of popups                    */
-    Cardinal        num_popups;         /* how many popups                   */
-    String          name;		/* widget resource name		     */
-    Screen	    *screen;		/* window's screen		     */
-    Colormap        colormap;           /* colormap                          */
-    Window	    window;		/* window ID			     */
-    Cardinal        depth;		/* number of planes in window        */
-    Pixel	    background_pixel;	/* window background pixel	     */
-    Pixmap          background_pixmap;	/* window background pixmap or NULL  */
-    Boolean         visible;		/* is window mapped and not occluded?*/
-    Boolean	    mapped_when_managed;/* map window if it's managed?       */
-} CorePart;
-
-typedef struct _WidgetRec {
-    CorePart    core;
- } WidgetRec, CoreRec;
-
-
-
-/******************************************************************
- *
- * Core Class Structure. Widgets, regardless of their class, will have
- * these fields.  All widgets of a given class will have the same values
- * for these fields.  Widgets of a given class may also have additional
- * common fields.  These additional fields are included in incremental
- * class structures, such as CommandClass.
- *
- * The fields that are specific to this subclass, as opposed to fields that
- * are part of the superclass, are called "subclass fields" below.  Many
- * procedures are responsible only for the subclass fields, and not for
- * any superclass fields.
- *
- ********************************************************************/
-
-typedef struct _CoreClassPart {
-    WidgetClass     superclass;		/* pointer to superclass ClassRec   */
-    String          class_name;		/* widget resource class name       */
-    Cardinal        widget_size;	/* size in bytes of widget record   */
-    XtProc	    class_initialize;   /* class initialization proc	    */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization	    */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;		/* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtRealizeProc   realize;		/* XCreateWindow for widget	    */
-    XtActionList    actions;		/* widget semantics name to proc map */
-    Cardinal	    num_actions;	/* number of entries in actions     */
-    XtResourceList  resources;		/* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;		/* resource class quarkified	    */
-    Boolean         compress_motion;    /* compress MotionNotify for widget */
-    XtEnum          compress_exposure;  /* compress Expose events for widget*/
-    Boolean         compress_enterleave;/* compress enter and leave events  */
-    Boolean         visible_interest;   /* select for VisibilityNotify      */
-    XtWidgetProc    destroy;		/* free data for subclass pointers  */
-    XtWidgetProc    resize;		/* geom manager changed widget size */
-    XtExposeProc    expose;		/* rediplay window		    */
-    XtSetValuesFunc set_values;		/* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtAlmostProc    set_values_almost;  /* set_values got "Almost" geo reply */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtAcceptFocusProc accept_focus;     /* assign input focus to widget     */
-    XtVersionType   version;	        /* version of intrinsics used	    */
-    XtPointer       callback_private;   /* list of callback offsets       */
-    String          tm_table;           /* state machine                    */
-    XtGeometryHandler query_geometry;	/* return preferred geometry        */
-    XtStringProc    display_accelerator;/* display your accelerator	    */
-    XtPointer	    extension;		/* pointer to extension record      */
- } CoreClassPart;
-
-typedef struct _WidgetClassRec {
-    CoreClassPart core_class;
-} WidgetClassRec, CoreClassRec;
-
-externalref WidgetClassRec widgetClassRec;
-#define coreClassRec widgetClassRec
-
-_XFUNCPROTOEND
-
-#endif /* _XtCoreP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef XtCoreP_h

+#define XtCoreP_h

+

+#include <X11/Core.h>

+

+_XFUNCPROTOBEGIN

+

+externalref int _XtInheritTranslations;

+

+#define XtInheritTranslations  ((String) &_XtInheritTranslations)

+#define XtInheritRealize ((XtRealizeProc) _XtInherit)

+#define XtInheritResize ((XtWidgetProc) _XtInherit)

+#define XtInheritExpose ((XtExposeProc) _XtInherit)

+#define XtInheritSetValuesAlmost ((XtAlmostProc) _XtInherit)

+#define XtInheritAcceptFocus ((XtAcceptFocusProc) _XtInherit)

+#define XtInheritQueryGeometry ((XtGeometryHandler) _XtInherit)

+#define XtInheritDisplayAccelerator ((XtStringProc) _XtInherit)

+

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

+ * Widget Core Data Structures

+ *

+ *

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

+

+typedef struct _CorePart {

+    Widget	    self;		/* pointer to widget itself	     */

+    WidgetClass	    widget_class;	/* pointer to Widget's ClassRec	     */

+    Widget	    parent;		/* parent widget	  	     */

+    XrmName         xrm_name;		/* widget resource name quarkified   */

+    Boolean         being_destroyed;	/* marked for destroy		     */

+    XtCallbackList  destroy_callbacks;	/* who to call when widget destroyed */

+    XtPointer       constraints;        /* constraint record                 */

+    Position        x, y;		/* window position		     */

+    Dimension       width, height;	/* window dimensions		     */

+    Dimension       border_width;	/* window border width		     */

+    Boolean         managed;            /* is widget geometry managed?       */

+    Boolean	    sensitive;		/* is widget sensitive to user events*/

+    Boolean         ancestor_sensitive;	/* are all ancestors sensitive?      */

+    XtEventTable    event_table;	/* private to event dispatcher       */

+    XtTMRec	    tm;                 /* translation management            */

+    XtTranslations  accelerators;       /* accelerator translations          */

+    Pixel	    border_pixel;	/* window border pixel		     */

+    Pixmap          border_pixmap;	/* window border pixmap or NULL      */

+    WidgetList      popup_list;         /* list of popups                    */

+    Cardinal        num_popups;         /* how many popups                   */

+    String          name;		/* widget resource name		     */

+    Screen	    *screen;		/* window's screen		     */

+    Colormap        colormap;           /* colormap                          */

+    Window	    window;		/* window ID			     */

+    Cardinal        depth;		/* number of planes in window        */

+    Pixel	    background_pixel;	/* window background pixel	     */

+    Pixmap          background_pixmap;	/* window background pixmap or NULL  */

+    Boolean         visible;		/* is window mapped and not occluded?*/

+    Boolean	    mapped_when_managed;/* map window if it's managed?       */

+} CorePart;

+

+typedef struct _WidgetRec {

+    CorePart    core;

+ } WidgetRec, CoreRec;

+

+

+

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

+ *

+ * Core Class Structure. Widgets, regardless of their class, will have

+ * these fields.  All widgets of a given class will have the same values

+ * for these fields.  Widgets of a given class may also have additional

+ * common fields.  These additional fields are included in incremental

+ * class structures, such as CommandClass.

+ *

+ * The fields that are specific to this subclass, as opposed to fields that

+ * are part of the superclass, are called "subclass fields" below.  Many

+ * procedures are responsible only for the subclass fields, and not for

+ * any superclass fields.

+ *

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

+

+typedef struct _CoreClassPart {

+    WidgetClass     superclass;		/* pointer to superclass ClassRec   */

+    String          class_name;		/* widget resource class name       */

+    Cardinal        widget_size;	/* size in bytes of widget record   */

+    XtProc	    class_initialize;   /* class initialization proc	    */

+    XtWidgetClassProc class_part_initialize; /* dynamic initialization	    */

+    XtEnum          class_inited;       /* has class been initialized?      */

+    XtInitProc      initialize;		/* initialize subclass fields       */

+    XtArgsProc      initialize_hook;    /* notify that initialize called    */

+    XtRealizeProc   realize;		/* XCreateWindow for widget	    */

+    XtActionList    actions;		/* widget semantics name to proc map */

+    Cardinal	    num_actions;	/* number of entries in actions     */

+    XtResourceList  resources;		/* resources for subclass fields    */

+    Cardinal        num_resources;      /* number of entries in resources   */

+    XrmClass        xrm_class;		/* resource class quarkified	    */

+    Boolean         compress_motion;    /* compress MotionNotify for widget */

+    XtEnum          compress_exposure;  /* compress Expose events for widget*/

+    Boolean         compress_enterleave;/* compress enter and leave events  */

+    Boolean         visible_interest;   /* select for VisibilityNotify      */

+    XtWidgetProc    destroy;		/* free data for subclass pointers  */

+    XtWidgetProc    resize;		/* geom manager changed widget size */

+    XtExposeProc    expose;		/* rediplay window		    */

+    XtSetValuesFunc set_values;		/* set subclass resource values     */

+    XtArgsFunc      set_values_hook;    /* notify that set_values called    */

+    XtAlmostProc    set_values_almost;  /* set_values got "Almost" geo reply */

+    XtArgsProc      get_values_hook;    /* notify that get_values called    */

+    XtAcceptFocusProc accept_focus;     /* assign input focus to widget     */

+    XtVersionType   version;	        /* version of intrinsics used	    */

+    XtPointer       callback_private;   /* list of callback offsets       */

+    String          tm_table;           /* state machine                    */

+    XtGeometryHandler query_geometry;	/* return preferred geometry        */

+    XtStringProc    display_accelerator;/* display your accelerator	    */

+    XtPointer	    extension;		/* pointer to extension record      */

+ } CoreClassPart;

+

+typedef struct _WidgetClassRec {

+    CoreClassPart core_class;

+} WidgetClassRec, CoreClassRec;

+

+externalref WidgetClassRec widgetClassRec;

+#define coreClassRec widgetClassRec

+

+_XFUNCPROTOEND

+

+#endif /* _XtCoreP_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/CreateI.h b/X11/CreateI.h
index e0ca9a3a6..77d6af652 100644
--- a/X11/CreateI.h
+++ b/X11/CreateI.h
@@ -1,44 +1,42 @@
-/* $XFree86$ */
-
-#ifndef _XtcreateI_h
-#define _XtcreateI_h
-
-_XFUNCPROTOBEGIN
-
-extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
-			      Widget parent, ArgList args, Cardinal num_args,
-			      XtTypedArgList typed_args,
-			      Cardinal num_typed_args);
-extern Widget _XtCreatePopupShell(String name, WidgetClass widget_class,
-				  Widget parent, ArgList args,
-				  Cardinal num_args, XtTypedArgList typed_args,
-				  Cardinal num_typed_args);
-extern Widget _XtAppCreateShell(String name, String class,
-				WidgetClass widget_class, Display *display,
-				ArgList args, Cardinal num_args,
-				XtTypedArgList typed_args,
-				Cardinal num_typed_args);
-extern Widget _XtCreateHookObj(Screen *screen);
-
-_XFUNCPROTOEND
-
-#include <stdarg.h>
-
-_XFUNCPROTOBEGIN
-
-/* VarCreate.c */
-extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
-			_Xconst char* application_class,
-			XrmOptionDescList options, Cardinal num_options,
-			int *argc_in_out, String *argv_in_out,
-			String *fallback_resources, WidgetClass widget_class,
-			va_list var_args);
-extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
-			_Xconst char* application_class,
-			XrmOptionDescList options, Cardinal num_options,
-			int *argc_in_out, String *argv_in_out,
-			String *fallback_resources, va_list var_args);
-
-_XFUNCPROTOEND
-
-#endif /* _XtcreateI_h */
+#ifndef _XtcreateI_h

+#define _XtcreateI_h

+

+_XFUNCPROTOBEGIN

+

+extern Widget _XtCreateWidget(String name, WidgetClass widget_class,

+			      Widget parent, ArgList args, Cardinal num_args,

+			      XtTypedArgList typed_args,

+			      Cardinal num_typed_args);

+extern Widget _XtCreatePopupShell(String name, WidgetClass widget_class,

+				  Widget parent, ArgList args,

+				  Cardinal num_args, XtTypedArgList typed_args,

+				  Cardinal num_typed_args);

+extern Widget _XtAppCreateShell(String name, String class,

+				WidgetClass widget_class, Display *display,

+				ArgList args, Cardinal num_args,

+				XtTypedArgList typed_args,

+				Cardinal num_typed_args);

+extern Widget _XtCreateHookObj(Screen *screen);

+

+_XFUNCPROTOEND

+

+#include <stdarg.h>

+

+_XFUNCPROTOBEGIN

+

+/* VarCreate.c */

+extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,

+			_Xconst char* application_class,

+			XrmOptionDescList options, Cardinal num_options,

+			int *argc_in_out, String *argv_in_out,

+			String *fallback_resources, WidgetClass widget_class,

+			va_list var_args);

+extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,

+			_Xconst char* application_class,

+			XrmOptionDescList options, Cardinal num_options,

+			int *argc_in_out, String *argv_in_out,

+			String *fallback_resources, va_list var_args);

+

+_XFUNCPROTOEND

+

+#endif /* _XtcreateI_h */

diff --git a/X11/EventI.h b/X11/EventI.h
index d2d1d0f43..7817bc251 100644
--- a/X11/EventI.h
+++ b/X11/EventI.h
@@ -1,138 +1,134 @@
-/* $Xorg: EventI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/* $oHeader: EventI.h,v 1.3 88/08/24 09:21:11 asente 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */
-
-/* 
- * Event.h - exported types and functions for toolkit event handler
- * 
- * Author:	Charles Haynes
- * 		Digital Equipment Corporation
- * 		Western Software Laboratory
- * Date:	Sun Dec  6 1987
- */
-
-#ifndef _Event_h_
-#define _Event_h_
-
-typedef struct _XtGrabRec  *XtGrabList;
-
-#include "PassivGraI.h"
-
-_XFUNCPROTOBEGIN
-
-extern void _XtEventInitialize(
-    void
-);
-
-typedef struct _XtEventRec {
-     XtEventTable	next;
-     EventMask		mask;	/*  also select_data count for RecExt */
-     XtEventHandler	proc;
-     XtPointer		closure;
-     unsigned int	select:1;
-     unsigned int	has_type_specifier:1;
-     unsigned int	async:1; /* not used, here for Digital extension? */
-} XtEventRec;
-
-typedef struct _XtGrabRec {
-    XtGrabList next;
-    Widget   widget;
-    unsigned int exclusive:1;
-    unsigned int spring_loaded:1;
-}XtGrabRec;
-
-typedef struct _BlockHookRec {
-    struct _BlockHookRec* next;
-    XtAppContext app;
-    XtBlockHookProc proc;
-    XtPointer closure;
-} BlockHookRec, *BlockHook;
-
-extern void _XtFreeEventTable(
-    XtEventTable*	/* event_table */
-);
-
-extern Boolean _XtOnGrabList(
-    Widget	/* widget */,
-    XtGrabRec*	/* grabList */
-);
-
-extern void _XtRemoveAllInputs(
-    XtAppContext /* app */
-);
-
-extern void _XtRefreshMapping(
-    XEvent*	/* event */,
-    _XtBoolean	/* dispatch */
-);
-
-extern void _XtSendFocusEvent(
-    Widget	/* child */,
-    int		/* type */);
-
-extern EventMask _XtConvertTypeToMask(
-    int		/* eventType */
-);
-
-/* EventUtil.c */
-extern Widget _XtFindRemapWidget(XEvent *event, Widget widget,
-				 EventMask mask, XtPerDisplayInput pdi);
-extern void _XtUngrabBadGrabs(XEvent *event, Widget widget,
-				 EventMask mask, XtPerDisplayInput pdi);
-extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
-				int *numElemsPtr, Widget start,
-				Widget breakWidget);
-
-/* NextEvent.c */
-extern Boolean XtAppPeekEvent_SkipTimer;
-
-_XFUNCPROTOEND
-
-#endif /* _Event_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.

+

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

+

+/* 

+ * Event.h - exported types and functions for toolkit event handler

+ * 

+ * Author:	Charles Haynes

+ * 		Digital Equipment Corporation

+ * 		Western Software Laboratory

+ * Date:	Sun Dec  6 1987

+ */

+

+#ifndef _Event_h_

+#define _Event_h_

+

+typedef struct _XtGrabRec  *XtGrabList;

+

+#include "PassivGraI.h"

+

+_XFUNCPROTOBEGIN

+

+extern void _XtEventInitialize(

+    void

+);

+

+typedef struct _XtEventRec {

+     XtEventTable	next;

+     EventMask		mask;	/*  also select_data count for RecExt */

+     XtEventHandler	proc;

+     XtPointer		closure;

+     unsigned int	select:1;

+     unsigned int	has_type_specifier:1;

+     unsigned int	async:1; /* not used, here for Digital extension? */

+} XtEventRec;

+

+typedef struct _XtGrabRec {

+    XtGrabList next;

+    Widget   widget;

+    unsigned int exclusive:1;

+    unsigned int spring_loaded:1;

+}XtGrabRec;

+

+typedef struct _BlockHookRec {

+    struct _BlockHookRec* next;

+    XtAppContext app;

+    XtBlockHookProc proc;

+    XtPointer closure;

+} BlockHookRec, *BlockHook;

+

+extern void _XtFreeEventTable(

+    XtEventTable*	/* event_table */

+);

+

+extern Boolean _XtOnGrabList(

+    Widget	/* widget */,

+    XtGrabRec*	/* grabList */

+);

+

+extern void _XtRemoveAllInputs(

+    XtAppContext /* app */

+);

+

+extern void _XtRefreshMapping(

+    XEvent*	/* event */,

+    _XtBoolean	/* dispatch */

+);

+

+extern void _XtSendFocusEvent(

+    Widget	/* child */,

+    int		/* type */);

+

+extern EventMask _XtConvertTypeToMask(

+    int		/* eventType */

+);

+

+/* EventUtil.c */

+extern Widget _XtFindRemapWidget(XEvent *event, Widget widget,

+				 EventMask mask, XtPerDisplayInput pdi);

+extern void _XtUngrabBadGrabs(XEvent *event, Widget widget,

+				 EventMask mask, XtPerDisplayInput pdi);

+extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,

+				int *numElemsPtr, Widget start,

+				Widget breakWidget);

+

+/* NextEvent.c */

+extern Boolean XtAppPeekEvent_SkipTimer;

+

+_XFUNCPROTOEND

+

+#endif /* _Event_h_ */

diff --git a/X11/HookObjI.h b/X11/HookObjI.h
index c0858c2b5..331e1227e 100644
--- a/X11/HookObjI.h
+++ b/X11/HookObjI.h
@@ -1,75 +1,73 @@
-/* $Xorg: HookObjI.h,v 1.4 2001/02/09 02:03:55 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.
-
-*/
-
-#ifndef _XtHookObjI_h
-#define _XtHookObjI_h
-
-_XFUNCPROTOBEGIN
-
-/* This object is implementation-dependent and private to the library. */
-
-typedef struct _HookObjRec *HookObject;
-typedef struct _HookObjClassRec *HookObjectClass;
-
-externalref WidgetClass hookObjectClass;
-
-typedef struct _HookObjPart {
-    /* resources */
-    XtCallbackList createhook_callbacks;
-    XtCallbackList changehook_callbacks;
-    XtCallbackList confighook_callbacks;
-    XtCallbackList geometryhook_callbacks;
-    XtCallbackList destroyhook_callbacks;
-    WidgetList shells;
-    Cardinal num_shells;
-    /* private data */
-    Cardinal max_shells;
-    Screen* screen;
-}HookObjPart;
-
-typedef struct _HookObjRec {
-    ObjectPart object;
-    HookObjPart hooks;
-} HookObjRec;
-
-typedef struct _HookObjClassPart {
-    int unused;
-} HookObjClassPart;
-
-typedef struct _HookObjClassRec {
-    ObjectClassPart object_class;
-    HookObjClassPart hook_class;
-} HookObjClassRec;
-
-externalref HookObjClassRec hookObjClassRec;
-
-_XFUNCPROTOEND
-
-#endif /* ifndef _Xt_HookObjI_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 _XtHookObjI_h

+#define _XtHookObjI_h

+

+_XFUNCPROTOBEGIN

+

+/* This object is implementation-dependent and private to the library. */

+

+typedef struct _HookObjRec *HookObject;

+typedef struct _HookObjClassRec *HookObjectClass;

+

+externalref WidgetClass hookObjectClass;

+

+typedef struct _HookObjPart {

+    /* resources */

+    XtCallbackList createhook_callbacks;

+    XtCallbackList changehook_callbacks;

+    XtCallbackList confighook_callbacks;

+    XtCallbackList geometryhook_callbacks;

+    XtCallbackList destroyhook_callbacks;

+    WidgetList shells;

+    Cardinal num_shells;

+    /* private data */

+    Cardinal max_shells;

+    Screen* screen;

+}HookObjPart;

+

+typedef struct _HookObjRec {

+    ObjectPart object;

+    HookObjPart hooks;

+} HookObjRec;

+

+typedef struct _HookObjClassPart {

+    int unused;

+} HookObjClassPart;

+

+typedef struct _HookObjClassRec {

+    ObjectClassPart object_class;

+    HookObjClassPart hook_class;

+} HookObjClassRec;

+

+externalref HookObjClassRec hookObjClassRec;

+

+_XFUNCPROTOEND

+

+#endif /* ifndef _Xt_HookObjI_h */

+

+

diff --git a/X11/InitialI.h b/X11/InitialI.h
index 2ae9b743c..66a4041df 100644
--- a/X11/InitialI.h
+++ b/X11/InitialI.h
@@ -1,433 +1,430 @@
-/* $Xorg: InitialI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */
-
-#ifndef _XtinitialI_h
-#define _XtinitialI_h
-
-/****************************************************************
- *
- * Displays
- *
- ****************************************************************/
-
-#ifndef X_NOT_POSIX
-#ifdef _POSIX_SOURCE
-#include <limits.h>
-#else
-#define _POSIX_SOURCE
-#include <limits.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-#ifndef PATH_MAX
-#ifdef WIN32
-#define PATH_MAX 512
-#else
-#include <sys/param.h>
-#endif
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
-
-#include <X11/Xos.h>
-#include <X11/Xpoll.h>
-
-_XFUNCPROTOBEGIN
-
-typedef struct _TimerEventRec {
-        struct timeval        te_timer_value;
-	struct _TimerEventRec *te_next;
-	XtTimerCallbackProc   te_proc;
-	XtAppContext	      app;
-	XtPointer	      te_closure;
-} TimerEventRec;
-
-typedef struct _InputEvent {
-	XtInputCallbackProc   ie_proc;
-	XtPointer	      ie_closure;
-	struct _InputEvent    *ie_next;
-	struct _InputEvent    *ie_oq;
-	XtAppContext	      app;
-	int		      ie_source;
-	XtInputMask	      ie_condition;
-} InputEvent;
-
-typedef struct _SignalEventRec {
-	XtSignalCallbackProc  se_proc;
-	XtPointer	      se_closure;
-	struct _SignalEventRec *se_next;
-	XtAppContext	      app;
-	Boolean		      se_notice;
-} SignalEventRec;
-
-typedef struct _WorkProcRec {
-	XtWorkProc proc;
-	XtPointer closure;
-	struct _WorkProcRec *next;
-	XtAppContext app;
-} WorkProcRec;
-
-
-typedef struct 
-{
-#ifndef USE_POLL
-  	fd_set rmask;
-	fd_set wmask;
-	fd_set emask;
-#endif
-	int	nfds;
-} FdStruct;
-
-typedef struct _LangProcRec {
-    XtLanguageProc	proc;
-    XtPointer		closure;
-} LangProcRec;
-
-typedef struct _ProcessContextRec {
-    XtAppContext	defaultAppContext;
-    XtAppContext	appContextList;
-    ConverterTable	globalConverterTable;
-    LangProcRec		globalLangProcRec;
-} ProcessContextRec, *ProcessContext;
-
-typedef struct {
-    char*	start;
-    char*	current;
-    int		bytes_remaining;
-} Heap;
-
-typedef struct _DestroyRec DestroyRec;
-
-
-typedef struct _XtAppStruct {
-    XtAppContext next;		/* link to next app in process context */
-    ProcessContext process;	/* back pointer to our process context */
-    InternalCallbackList destroy_callbacks;
-    Display **list;
-    TimerEventRec *timerQueue;
-    WorkProcRec *workQueue;
-    InputEvent **input_list;
-    InputEvent *outstandingQueue;
-    SignalEventRec *signalQueue;
-    XrmDatabase errorDB;
-    XtErrorMsgHandler errorMsgHandler, warningMsgHandler;
-    XtErrorHandler errorHandler, warningHandler;
-    struct _ActionListRec *action_table;
-    ConverterTable converterTable;
-    unsigned long selectionTimeout;
-    FdStruct fds;
-    short count;			/* num of assigned entries in list */
-    short max;				/* allocate size of list */
-    short last;
-    short input_count;
-    short input_max;			/* elts input_list init'd with */
-    Boolean sync, being_destroyed, error_inited;
-#ifndef NO_IDENTIFY_WINDOWS
-    Boolean identify_windows;		/* debugging hack */
-#endif
-    Heap heap;
-    String * fallback_resources;	/* Set by XtAppSetFallbackResources. */
-    struct _ActionHookRec* action_hook_list;
-    struct _BlockHookRec* block_hook_list;
-    int destroy_list_size;		/* state data for 2-phase destroy */
-    int destroy_count;
-    int dispatch_level;
-    DestroyRec* destroy_list;
-    Widget in_phase2_destroy;
-    LangProcRec langProcRec;
-    struct _TMBindCacheRec * free_bindings;
-    String display_name_tried;
-    Display **dpy_destroy_list;
-    int dpy_destroy_count;
-    Boolean exit_flag;
-    Boolean rebuild_fdlist;
-#ifdef XTHREADS
-    LockPtr lock_info;
-    ThreadAppProc lock;
-    ThreadAppProc unlock;
-    ThreadAppYieldLockProc yield_lock;
-    ThreadAppRestoreLockProc restore_lock;
-    ThreadAppProc free_lock;
-#endif
-} XtAppStruct;
-
-extern void _XtHeapInit(Heap* heap);
-extern void _XtHeapFree(Heap* heap);
-
-#ifdef XTTRACEMEMORY
-
-
-extern char *_XtHeapMalloc(
-    Heap*	/* heap */,
-    Cardinal	/* size */,
-    char *	/* file */,
-    int		/* line */
-);
-
-#define _XtHeapAlloc(heap,bytes) _XtHeapMalloc(heap, bytes, __FILE__, __LINE__)
-
-#else /* XTTRACEMEMORY */
-
-extern char* _XtHeapAlloc(
-    Heap*	/* heap */,
-    Cardinal	/* size */
-);
-
-#endif /* XTTRACEMEMORY */
-
-extern void _XtSetDefaultErrorHandlers(
-    XtErrorMsgHandler*	/* errMsg */,
-    XtErrorMsgHandler*	/* warnMsg */,
-    XtErrorHandler*	/* err */,
-    XtErrorHandler*	/* warn */
-);
-
-extern void _XtSetDefaultSelectionTimeout(
-    unsigned long* /* timeout */
-);
-
-extern XtAppContext _XtDefaultAppContext(
-    void
-);
-
-extern ProcessContext _XtGetProcessContext(
-    void
-);
-
-Display *
-_XtAppInit(
-    XtAppContext*	/* app_context_return */,
-    String		/* application_class */,
-    XrmOptionDescRec*	/* options */,
-    Cardinal		/* num_options */,
-    int*		/* argc_in_out */,
-    String**		/* argv_in_out */,
-    String*		/* fallback_resources */
-);
-
-extern void _XtDestroyAppContexts(
-    void
-);
-
-extern void _XtCloseDisplays(
-    XtAppContext	/* app */
-);
-
-extern int _XtAppDestroyCount;
-
-extern int _XtWaitForSomething(
-    XtAppContext	/* app */,
-    _XtBoolean 		/* ignoreEvents */,
-    _XtBoolean 		/* ignoreTimers */,
-    _XtBoolean 		/* ignoreInputs */,
-    _XtBoolean		/* ignoreSignals */,
-    _XtBoolean 		/* block */,
-#ifdef XTHREADS
-    _XtBoolean		/* drop_lock */,
-#endif
-    unsigned long*	/* howlong */
-);
-
-typedef struct _CaseConverterRec *CaseConverterPtr;
-typedef struct _CaseConverterRec {
-    KeySym		start;		/* first KeySym valid in converter */
-    KeySym		stop;		/* last KeySym valid in converter */
-    XtCaseProc		proc;		/* case converter function */
-    CaseConverterPtr	next;		/* next converter record */
-} CaseConverterRec;
-
-typedef struct _ExtensionSelectorRec {
-    XtExtensionSelectProc proc;
-    int min, max;
-    XtPointer client_data;
-} ExtSelectRec;
-
-typedef struct _XtPerDisplayStruct {
-    InternalCallbackList destroy_callbacks;
-    Region region;
-    CaseConverterPtr case_cvt;		/* user-registered case converters */
-    XtKeyProc defaultKeycodeTranslator;
-    XtAppContext appContext;
-    unsigned long keysyms_serial;      /* for tracking MappingNotify events */
-    KeySym *keysyms;                   /* keycode to keysym table */
-    int keysyms_per_keycode;           /* number of keysyms for each keycode*/
-    int min_keycode, max_keycode;      /* range of keycodes */
-    KeySym *modKeysyms;                /* keysym values for modToKeysysm */
-    ModToKeysymTable *modsToKeysyms;   /* modifiers to Keysysms index table*/
-    unsigned char isModifier[32];      /* key-is-modifier-p bit table */
-    KeySym lock_meaning;	       /* Lock modifier meaning */
-    Modifiers mode_switch;	       /* keyboard group modifiers */
-    Modifiers num_lock;		       /* keyboard numlock modifiers */
-    Boolean being_destroyed;
-    Boolean rv;			       /* reverse_video resource */
-    XrmName name;		       /* resolved app name */
-    XrmClass class;		       /* application class */
-    Heap heap;
-    struct _GCrec *GClist;	       /* support for XtGetGC */
-    Drawable **pixmap_tab;             /* ditto for XtGetGC */
-    String language;		       /* XPG language string */
-    XEvent last_event;		       /* last event dispatched */
-    Time last_timestamp;	       /* from last event dispatched */
-    int multi_click_time;	       /* for XtSetMultiClickTime */
-    struct _TMKeyContextRec* tm_context;     /* for XtGetActionKeysym */
-    InternalCallbackList mapping_callbacks;  /* special case for TM */
-    XtPerDisplayInputRec pdi;	       /* state for modal grabs & kbd focus */
-    struct _WWTable *WWtable;	       /* window to widget table */
-    XrmDatabase *per_screen_db;        /* per screen resource databases */
-    XrmDatabase cmd_db;		       /* db from command line, if needed */
-    XrmDatabase server_db;	       /* resource property else .Xdefaults */
-    XtEventDispatchProc* dispatcher_list;
-    ExtSelectRec* ext_select_list;
-    int ext_select_count;
-    Widget hook_object;
-#ifndef X_NO_RESOURCE_CONFIGURATION_MANAGEMENT
-    Atom rcm_init;			/* ResConfig - initialize */
-    Atom rcm_data;			/* ResConfig - data atom */
-#endif
-} XtPerDisplayStruct, *XtPerDisplay;
-
-typedef struct _PerDisplayTable {
-	Display *dpy;
-	XtPerDisplayStruct perDpy;
-	struct _PerDisplayTable *next;
-} PerDisplayTable, *PerDisplayTablePtr;
-
-extern PerDisplayTablePtr _XtperDisplayList;
-
-extern XtPerDisplay _XtSortPerDisplayList(
-    Display* /* dpy */
-);
-
-extern XtPerDisplay _XtGetPerDisplay(
-    Display*		/* dpy */
-);
-
-extern XtPerDisplayInputRec* _XtGetPerDisplayInput(
-    Display* 		/* dpy */
-);
-
-#if 0
-#ifdef DEBUG
-#define _XtGetPerDisplay(display) \
-    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \
-     ? &_XtperDisplayList->perDpy \
-     : _XtSortPerDisplayList(display))
-#define _XtGetPerDisplayInput(display) \
-    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \
-     ? &_XtperDisplayList->perDpy.pdi \
-     : &_XtSortPerDisplayList(display)->pdi)
-#else
-#define _XtGetPerDisplay(display) \
-    ((_XtperDisplayList->dpy == (display)) \
-     ? &_XtperDisplayList->perDpy \
-     : _XtSortPerDisplayList(display))
-#define _XtGetPerDisplayInput(display) \
-    ((_XtperDisplayList->dpy == (display)) \
-     ? &_XtperDisplayList->perDpy.pdi \
-     : &_XtSortPerDisplayList(display)->pdi)
-#endif /*DEBUG*/
-#endif
-
-extern void _XtDisplayInitialize(
-    Display*		/* dpy */,
-    XtPerDisplay	/* pd */,
-    _Xconst char*	/* name */,
-    XrmOptionDescRec*	/* urlist */,
-    Cardinal 		/* num_urs */,
-    int*		/* argc */,
-    char** 		/* argv */
-);
-
-extern void _XtCacheFlushTag(
-    XtAppContext /* app */,
-    XtPointer	 /* tag */
-);
-
-extern void _XtFreeActions(
-    struct _ActionListRec* /* action_table */
-);
-
-extern void _XtDoPhase2Destroy(
-    XtAppContext /* app */,
-    int		 /* dispatch_level */
-);
-
-extern void _XtDoFreeBindings(
-    XtAppContext /* app */
-);
-
-extern void _XtExtensionSelect(
-    Widget /* widget */
-);
-
-#define _XtSafeToDestroy(app) ((app)->dispatch_level == 0)
-
-extern void _XtAllocWWTable(
-    XtPerDisplay pd
-);
-
-extern void _XtFreeWWTable(
-    XtPerDisplay pd
-);
-
-extern String _XtGetUserName(String dest, int len);
-extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
-			Cardinal num_urs, int argc, String *argv,
-			String *applName, String *displayName,
-			String *language);
-
-_XFUNCPROTOEND
-
-#endif /* _XtinitialI_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XtinitialI_h

+#define _XtinitialI_h

+

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

+ *

+ * Displays

+ *

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

+

+#ifndef X_NOT_POSIX

+#ifdef _POSIX_SOURCE

+#include <limits.h>

+#else

+#define _POSIX_SOURCE

+#include <limits.h>

+#undef _POSIX_SOURCE

+#endif

+#endif

+#ifndef PATH_MAX

+#ifdef WIN32

+#define PATH_MAX 512

+#else

+#include <sys/param.h>

+#endif

+#ifndef PATH_MAX

+#ifdef MAXPATHLEN

+#define PATH_MAX MAXPATHLEN

+#else

+#define PATH_MAX 1024

+#endif

+#endif

+#endif

+

+#include <X11/Xos.h>

+#include <X11/Xpoll.h>

+

+_XFUNCPROTOBEGIN

+

+typedef struct _TimerEventRec {

+        struct timeval        te_timer_value;

+	struct _TimerEventRec *te_next;

+	XtTimerCallbackProc   te_proc;

+	XtAppContext	      app;

+	XtPointer	      te_closure;

+} TimerEventRec;

+

+typedef struct _InputEvent {

+	XtInputCallbackProc   ie_proc;

+	XtPointer	      ie_closure;

+	struct _InputEvent    *ie_next;

+	struct _InputEvent    *ie_oq;

+	XtAppContext	      app;

+	int		      ie_source;

+	XtInputMask	      ie_condition;

+} InputEvent;

+

+typedef struct _SignalEventRec {

+	XtSignalCallbackProc  se_proc;

+	XtPointer	      se_closure;

+	struct _SignalEventRec *se_next;

+	XtAppContext	      app;

+	Boolean		      se_notice;

+} SignalEventRec;

+

+typedef struct _WorkProcRec {

+	XtWorkProc proc;

+	XtPointer closure;

+	struct _WorkProcRec *next;

+	XtAppContext app;

+} WorkProcRec;

+

+

+typedef struct 

+{

+#ifndef USE_POLL

+  	fd_set rmask;

+	fd_set wmask;

+	fd_set emask;

+#endif

+	int	nfds;

+} FdStruct;

+

+typedef struct _LangProcRec {

+    XtLanguageProc	proc;

+    XtPointer		closure;

+} LangProcRec;

+

+typedef struct _ProcessContextRec {

+    XtAppContext	defaultAppContext;

+    XtAppContext	appContextList;

+    ConverterTable	globalConverterTable;

+    LangProcRec		globalLangProcRec;

+} ProcessContextRec, *ProcessContext;

+

+typedef struct {

+    char*	start;

+    char*	current;

+    int		bytes_remaining;

+} Heap;

+

+typedef struct _DestroyRec DestroyRec;

+

+

+typedef struct _XtAppStruct {

+    XtAppContext next;		/* link to next app in process context */

+    ProcessContext process;	/* back pointer to our process context */

+    InternalCallbackList destroy_callbacks;

+    Display **list;

+    TimerEventRec *timerQueue;

+    WorkProcRec *workQueue;

+    InputEvent **input_list;

+    InputEvent *outstandingQueue;

+    SignalEventRec *signalQueue;

+    XrmDatabase errorDB;

+    XtErrorMsgHandler errorMsgHandler, warningMsgHandler;

+    XtErrorHandler errorHandler, warningHandler;

+    struct _ActionListRec *action_table;

+    ConverterTable converterTable;

+    unsigned long selectionTimeout;

+    FdStruct fds;

+    short count;			/* num of assigned entries in list */

+    short max;				/* allocate size of list */

+    short last;

+    short input_count;

+    short input_max;			/* elts input_list init'd with */

+    Boolean sync, being_destroyed, error_inited;

+#ifndef NO_IDENTIFY_WINDOWS

+    Boolean identify_windows;		/* debugging hack */

+#endif

+    Heap heap;

+    String * fallback_resources;	/* Set by XtAppSetFallbackResources. */

+    struct _ActionHookRec* action_hook_list;

+    struct _BlockHookRec* block_hook_list;

+    int destroy_list_size;		/* state data for 2-phase destroy */

+    int destroy_count;

+    int dispatch_level;

+    DestroyRec* destroy_list;

+    Widget in_phase2_destroy;

+    LangProcRec langProcRec;

+    struct _TMBindCacheRec * free_bindings;

+    String display_name_tried;

+    Display **dpy_destroy_list;

+    int dpy_destroy_count;

+    Boolean exit_flag;

+    Boolean rebuild_fdlist;

+#ifdef XTHREADS

+    LockPtr lock_info;

+    ThreadAppProc lock;

+    ThreadAppProc unlock;

+    ThreadAppYieldLockProc yield_lock;

+    ThreadAppRestoreLockProc restore_lock;

+    ThreadAppProc free_lock;

+#endif

+} XtAppStruct;

+

+extern void _XtHeapInit(Heap* heap);

+extern void _XtHeapFree(Heap* heap);

+

+#ifdef XTTRACEMEMORY

+

+

+extern char *_XtHeapMalloc(

+    Heap*	/* heap */,

+    Cardinal	/* size */,

+    char *	/* file */,

+    int		/* line */

+);

+

+#define _XtHeapAlloc(heap,bytes) _XtHeapMalloc(heap, bytes, __FILE__, __LINE__)

+

+#else /* XTTRACEMEMORY */

+

+extern char* _XtHeapAlloc(

+    Heap*	/* heap */,

+    Cardinal	/* size */

+);

+

+#endif /* XTTRACEMEMORY */

+

+extern void _XtSetDefaultErrorHandlers(

+    XtErrorMsgHandler*	/* errMsg */,

+    XtErrorMsgHandler*	/* warnMsg */,

+    XtErrorHandler*	/* err */,

+    XtErrorHandler*	/* warn */

+);

+

+extern void _XtSetDefaultSelectionTimeout(

+    unsigned long* /* timeout */

+);

+

+extern XtAppContext _XtDefaultAppContext(

+    void

+);

+

+extern ProcessContext _XtGetProcessContext(

+    void

+);

+

+Display *

+_XtAppInit(

+    XtAppContext*	/* app_context_return */,

+    String		/* application_class */,

+    XrmOptionDescRec*	/* options */,

+    Cardinal		/* num_options */,

+    int*		/* argc_in_out */,

+    String**		/* argv_in_out */,

+    String*		/* fallback_resources */

+);

+

+extern void _XtDestroyAppContexts(

+    void

+);

+

+extern void _XtCloseDisplays(

+    XtAppContext	/* app */

+);

+

+extern int _XtAppDestroyCount;

+

+extern int _XtWaitForSomething(

+    XtAppContext	/* app */,

+    _XtBoolean 		/* ignoreEvents */,

+    _XtBoolean 		/* ignoreTimers */,

+    _XtBoolean 		/* ignoreInputs */,

+    _XtBoolean		/* ignoreSignals */,

+    _XtBoolean 		/* block */,

+#ifdef XTHREADS

+    _XtBoolean		/* drop_lock */,

+#endif

+    unsigned long*	/* howlong */

+);

+

+typedef struct _CaseConverterRec *CaseConverterPtr;

+typedef struct _CaseConverterRec {

+    KeySym		start;		/* first KeySym valid in converter */

+    KeySym		stop;		/* last KeySym valid in converter */

+    XtCaseProc		proc;		/* case converter function */

+    CaseConverterPtr	next;		/* next converter record */

+} CaseConverterRec;

+

+typedef struct _ExtensionSelectorRec {

+    XtExtensionSelectProc proc;

+    int min, max;

+    XtPointer client_data;

+} ExtSelectRec;

+

+typedef struct _XtPerDisplayStruct {

+    InternalCallbackList destroy_callbacks;

+    Region region;

+    CaseConverterPtr case_cvt;		/* user-registered case converters */

+    XtKeyProc defaultKeycodeTranslator;

+    XtAppContext appContext;

+    unsigned long keysyms_serial;      /* for tracking MappingNotify events */

+    KeySym *keysyms;                   /* keycode to keysym table */

+    int keysyms_per_keycode;           /* number of keysyms for each keycode*/

+    int min_keycode, max_keycode;      /* range of keycodes */

+    KeySym *modKeysyms;                /* keysym values for modToKeysysm */

+    ModToKeysymTable *modsToKeysyms;   /* modifiers to Keysysms index table*/

+    unsigned char isModifier[32];      /* key-is-modifier-p bit table */

+    KeySym lock_meaning;	       /* Lock modifier meaning */

+    Modifiers mode_switch;	       /* keyboard group modifiers */

+    Modifiers num_lock;		       /* keyboard numlock modifiers */

+    Boolean being_destroyed;

+    Boolean rv;			       /* reverse_video resource */

+    XrmName name;		       /* resolved app name */

+    XrmClass class;		       /* application class */

+    Heap heap;

+    struct _GCrec *GClist;	       /* support for XtGetGC */

+    Drawable **pixmap_tab;             /* ditto for XtGetGC */

+    String language;		       /* XPG language string */

+    XEvent last_event;		       /* last event dispatched */

+    Time last_timestamp;	       /* from last event dispatched */

+    int multi_click_time;	       /* for XtSetMultiClickTime */

+    struct _TMKeyContextRec* tm_context;     /* for XtGetActionKeysym */

+    InternalCallbackList mapping_callbacks;  /* special case for TM */

+    XtPerDisplayInputRec pdi;	       /* state for modal grabs & kbd focus */

+    struct _WWTable *WWtable;	       /* window to widget table */

+    XrmDatabase *per_screen_db;        /* per screen resource databases */

+    XrmDatabase cmd_db;		       /* db from command line, if needed */

+    XrmDatabase server_db;	       /* resource property else .Xdefaults */

+    XtEventDispatchProc* dispatcher_list;

+    ExtSelectRec* ext_select_list;

+    int ext_select_count;

+    Widget hook_object;

+#ifndef X_NO_RESOURCE_CONFIGURATION_MANAGEMENT

+    Atom rcm_init;			/* ResConfig - initialize */

+    Atom rcm_data;			/* ResConfig - data atom */

+#endif

+} XtPerDisplayStruct, *XtPerDisplay;

+

+typedef struct _PerDisplayTable {

+	Display *dpy;

+	XtPerDisplayStruct perDpy;

+	struct _PerDisplayTable *next;

+} PerDisplayTable, *PerDisplayTablePtr;

+

+extern PerDisplayTablePtr _XtperDisplayList;

+

+extern XtPerDisplay _XtSortPerDisplayList(

+    Display* /* dpy */

+);

+

+extern XtPerDisplay _XtGetPerDisplay(

+    Display*		/* dpy */

+);

+

+extern XtPerDisplayInputRec* _XtGetPerDisplayInput(

+    Display* 		/* dpy */

+);

+

+#if 0

+#ifdef DEBUG

+#define _XtGetPerDisplay(display) \

+    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \

+     ? &_XtperDisplayList->perDpy \

+     : _XtSortPerDisplayList(display))

+#define _XtGetPerDisplayInput(display) \

+    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \

+     ? &_XtperDisplayList->perDpy.pdi \

+     : &_XtSortPerDisplayList(display)->pdi)

+#else

+#define _XtGetPerDisplay(display) \

+    ((_XtperDisplayList->dpy == (display)) \

+     ? &_XtperDisplayList->perDpy \

+     : _XtSortPerDisplayList(display))

+#define _XtGetPerDisplayInput(display) \

+    ((_XtperDisplayList->dpy == (display)) \

+     ? &_XtperDisplayList->perDpy.pdi \

+     : &_XtSortPerDisplayList(display)->pdi)

+#endif /*DEBUG*/

+#endif

+

+extern void _XtDisplayInitialize(

+    Display*		/* dpy */,

+    XtPerDisplay	/* pd */,

+    _Xconst char*	/* name */,

+    XrmOptionDescRec*	/* urlist */,

+    Cardinal 		/* num_urs */,

+    int*		/* argc */,

+    char** 		/* argv */

+);

+

+extern void _XtCacheFlushTag(

+    XtAppContext /* app */,

+    XtPointer	 /* tag */

+);

+

+extern void _XtFreeActions(

+    struct _ActionListRec* /* action_table */

+);

+

+extern void _XtDoPhase2Destroy(

+    XtAppContext /* app */,

+    int		 /* dispatch_level */

+);

+

+extern void _XtDoFreeBindings(

+    XtAppContext /* app */

+);

+

+extern void _XtExtensionSelect(

+    Widget /* widget */

+);

+

+#define _XtSafeToDestroy(app) ((app)->dispatch_level == 0)

+

+extern void _XtAllocWWTable(

+    XtPerDisplay pd

+);

+

+extern void _XtFreeWWTable(

+    XtPerDisplay pd

+);

+

+extern String _XtGetUserName(String dest, int len);

+extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,

+			Cardinal num_urs, int argc, String *argv,

+			String *applName, String *displayName,

+			String *language);

+

+_XFUNCPROTOEND

+

+#endif /* _XtinitialI_h */

diff --git a/X11/Intrinsic.h b/X11/Intrinsic.h
index 0461b842f..a117e5777 100644
--- a/X11/Intrinsic.h
+++ b/X11/Intrinsic.h
@@ -1,2589 +1,2595 @@
-/* $Xorg: Intrinsic.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/***********************************************************
-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 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.
-
-******************************************************************/
-
-/*
-
-Copyright 1987, 1988, 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/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */
-
-#ifndef _XtIntrinsic_h
-#define _XtIntrinsic_h
-
-#include	<X11/Xlib.h>
-#include	<X11/Xutil.h>
-#include	<X11/Xresource.h>
-#include	<X11/Xfuncproto.h>
-#ifdef XT_BC
-#include <X11/Xos.h>		/* for R4 compatibility */
-#else
-#include <X11/Xosdefs.h>
-#include <string.h>		/* for XtNewString */
-#endif /* XT_BC else */
-
-#define XtSpecificationRelease 6
-
-typedef char *String;
-
-/* We do this in order to get "const" declarations to work right.  We
- * use _XtString instead of String so that C++ applications can
- * #define String to something else if they choose, to avoid conflicts
- * with other C++ libraries.
- */
-#define _XtString char*
-
-/* _Xt names are private to Xt implementation, do not use in client code */
-#if NeedWidePrototypes
-#define _XtBoolean	int
-#define _XtDimension	unsigned int
-#define _XtKeyCode	unsigned int
-#define _XtPosition	int
-#define _XtXtEnum	unsigned int
-#else
-#define _XtBoolean	Boolean
-#define _XtDimension	Dimension
-#define _XtKeyCode	KeyCode
-#define _XtPosition	Position
-#define _XtXtEnum	XtEnum
-#endif /* NeedWidePrototypes */
-
-#include <stddef.h>
-
-#ifdef VMS
-#define externalref globalref
-#define externaldef(psect) globaldef {"psect"} noshare
-#else
-#define externalref extern
-#define externaldef(psect)
-#endif /* VMS */
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-#define XtNumber(arr)		((Cardinal) (sizeof(arr) / sizeof(arr[0])))
-
-typedef struct _WidgetRec *Widget;
-typedef Widget *WidgetList;
-typedef struct _WidgetClassRec *WidgetClass;
-typedef struct _CompositeRec *CompositeWidget;
-typedef struct _XtActionsRec *XtActionList;
-typedef struct _XtEventRec *XtEventTable;
-
-typedef struct _XtAppStruct *XtAppContext;
-typedef unsigned long	XtValueMask;
-typedef unsigned long	XtIntervalId;
-typedef unsigned long	XtInputId;
-typedef unsigned long	XtWorkProcId;
-typedef unsigned long	XtSignalId;
-typedef unsigned int	XtGeometryMask;
-typedef unsigned long	XtGCMask;   /* Mask of values that are used by widget*/
-typedef unsigned long	Pixel;	    /* Index into colormap		*/
-typedef int		XtCacheType;
-#define			XtCacheNone	  0x001
-#define			XtCacheAll	  0x002
-#define			XtCacheByDisplay  0x003
-#define			XtCacheRefCount	  0x100
-
-/****************************************************************
- *
- * System Dependent Definitions; see spec for specific range
- * requirements.  Do not assume every implementation uses the
- * same base types!
- *
- *
- * XtArgVal ought to be a union of XtPointer, char *, long, int *, and proc *
- * but casting to union types is not really supported.
- *
- * So the typedef for XtArgVal should be chosen such that
- *
- *	sizeof (XtArgVal) >=	sizeof(XtPointer)
- *				sizeof(char *)
- *				sizeof(long)
- *				sizeof(int *)
- *				sizeof(proc *)
- *
- * ArgLists rely heavily on the above typedef.
- *
- ****************************************************************/
-#ifdef CRAY
-typedef long		Boolean;
-typedef char*		XtArgVal;
-typedef long		XtEnum;
-#else
-typedef char		Boolean;
-typedef long		XtArgVal;
-typedef unsigned char	XtEnum;
-#endif
-
-typedef unsigned int	Cardinal;
-typedef unsigned short	Dimension;  /* Size in pixels			*/
-typedef short		Position;   /* Offset from 0 coordinate		*/
-
-typedef void*		XtPointer;
-
-/* The type Opaque is NOT part of the Xt standard, do NOT use it. */
-/* (It remains here only for backward compatibility.) */
-typedef XtPointer	Opaque;
-
-#include <X11/Core.h>
-#include <X11/Composite.h>
-#include <X11/Constraint.h>
-#include <X11/Object.h>
-#include <X11/RectObj.h>
-
-typedef struct _TranslationData *XtTranslations;
-typedef struct _TranslationData *XtAccelerators;
-typedef unsigned int Modifiers;
-
-typedef void (*XtActionProc)(
-    Widget 		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-typedef XtActionProc* XtBoundActions;
-
-typedef struct _XtActionsRec{
-    String	 string;
-    XtActionProc proc;
-} XtActionsRec;
-
-typedef enum {
-/* address mode		parameter representation    */
-/* ------------		------------------------    */
-    XtAddress,		/* address		    */
-    XtBaseOffset,	/* offset		    */
-    XtImmediate,	/* constant		    */
-    XtResourceString,	/* resource name string	    */
-    XtResourceQuark,	/* resource name quark	    */
-    XtWidgetBaseOffset,	/* offset from ancestor	    */
-    XtProcedureArg	/* procedure to invoke	    */
-} XtAddressMode;
-
-typedef struct {
-    XtAddressMode   address_mode;
-    XtPointer	    address_id;
-    Cardinal	    size;
-} XtConvertArgRec, *XtConvertArgList;
-
-typedef void (*XtConvertArgProc)(
-    Widget 		/* widget */,
-    Cardinal*		/* size */,
-    XrmValue*		/* value */
-);
-
-typedef struct {
-    XtGeometryMask request_mode;
-    Position x, y;
-    Dimension width, height, border_width;
-    Widget sibling;
-    int stack_mode;   /* Above, Below, TopIf, BottomIf, Opposite, DontChange */
-} XtWidgetGeometry;
-
-/* Additions to Xlib geometry requests: ask what would happen, don't do it */
-#define XtCWQueryOnly	(1 << 7)
-
-/* Additions to Xlib stack modes: don't change stack order */
-#define XtSMDontChange	5
-
-typedef void (*XtConverter)( /* obsolete */
-    XrmValue*		/* args */,
-    Cardinal*		/* num_args */,
-    XrmValue*		/* from */,
-    XrmValue*		/* to */
-);
-
-typedef Boolean (*XtTypeConverter)(
-    Display*		/* dpy */,
-    XrmValue*		/* args */,
-    Cardinal*		/* num_args */,
-    XrmValue*		/* from */,
-    XrmValue*		/* to */,
-    XtPointer*		/* converter_data */
-);
-
-typedef void (*XtDestructor)(
-    XtAppContext	/* app */,
-    XrmValue*		/* to */,
-    XtPointer 		/* converter_data */,
-    XrmValue*		/* args */,
-    Cardinal*		/* num_args */
-);
-
-typedef Opaque XtCacheRef;
-
-typedef Opaque XtActionHookId;
-
-typedef void (*XtActionHookProc)(
-    Widget		/* w */,
-    XtPointer		/* client_data */,
-    String		/* action_name */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-typedef unsigned long XtBlockHookId;
-
-typedef void (*XtBlockHookProc)(
-    XtPointer		/* client_data */
-);
-
-typedef void (*XtKeyProc)(
-    Display*		/* dpy */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers		/* modifiers */,
-    Modifiers*		/* modifiers_return */,
-    KeySym*		/* keysym_return */
-);
-
-typedef void (*XtCaseProc)(
-    Display*		/* display */,
-    KeySym		/* keysym */,
-    KeySym*		/* lower_return */,
-    KeySym*		/* upper_return */
-);
-
-typedef void (*XtEventHandler)(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XEvent*		/* event */,
-    Boolean*		/* continue_to_dispatch */
-);
-typedef unsigned long EventMask;
-
-typedef enum {XtListHead, XtListTail } XtListPosition;
-
-typedef unsigned long	XtInputMask;
-#define XtInputNoneMask		0L
-#define XtInputReadMask		(1L<<0)
-#define XtInputWriteMask	(1L<<1)
-#define XtInputExceptMask	(1L<<2)
-
-typedef void (*XtTimerCallbackProc)(
-    XtPointer 		/* closure */,
-    XtIntervalId*	/* id */
-);
-
-typedef void (*XtInputCallbackProc)(
-    XtPointer 		/* closure */,
-    int*		/* source */,
-    XtInputId*		/* id */
-);
-
-typedef void (*XtSignalCallbackProc)(
-    XtPointer		/* closure */,
-    XtSignalId*		/* id */
-);
-
-typedef struct {
-    String	name;
-    XtArgVal	value;
-} Arg, *ArgList;
-
-typedef XtPointer	XtVarArgsList;
-
-typedef void (*XtCallbackProc)(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,	/* data the application registered */
-    XtPointer 		/* call_data */	/* callback specific data */
-);
-
-typedef struct _XtCallbackRec {
-    XtCallbackProc  callback;
-    XtPointer	    closure;
-} XtCallbackRec, *XtCallbackList;
-
-typedef enum {
-	XtCallbackNoList,
-	XtCallbackHasNone,
-	XtCallbackHasSome
-} XtCallbackStatus;
-
-typedef enum  {
-    XtGeometryYes,	  /* Request accepted. */
-    XtGeometryNo,	  /* Request denied. */
-    XtGeometryAlmost,	  /* Request denied, but willing to take replyBox. */
-    XtGeometryDone	  /* Request accepted and done. */
-} XtGeometryResult;
-
-typedef enum {XtGrabNone, XtGrabNonexclusive, XtGrabExclusive} XtGrabKind;
-
-typedef struct {
-    Widget  shell_widget;
-    Widget  enable_widget;
-} XtPopdownIDRec, *XtPopdownID;
-
-typedef struct _XtResource {
-    String	resource_name;	/* Resource name			    */
-    String	resource_class;	/* Resource class			    */
-    String	resource_type;	/* Representation type desired		    */
-    Cardinal	resource_size;	/* Size in bytes of representation	    */
-    Cardinal	resource_offset;/* Offset from base to put resource value   */
-    String	default_type;	/* representation type of specified default */
-    XtPointer	default_addr;	/* Address of default resource		    */
-} XtResource, *XtResourceList;
-
-typedef void (*XtResourceDefaultProc)(
-    Widget	/* widget */,
-    int		/* offset */,
-    XrmValue*	/* value */
-);
-
-typedef String (*XtLanguageProc)(
-    Display*	/* dpy */,
-    String	/* xnl */,
-    XtPointer	/* client_data */
-);
-
-typedef void (*XtErrorMsgHandler)(
-    String 		/* name */,
-    String		/* type */,
-    String		/* class */,
-    String		/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-typedef void (*XtErrorHandler)(
-  String		/* msg */
-);
-
-typedef void (*XtCreatePopupChildProc)(
-    Widget	/* shell */
-);
-
-typedef Boolean (*XtWorkProc)(
-    XtPointer 		/* closure */	/* data the application registered */
-);
-
-typedef struct {
-    char match;
-    String substitution;
-} SubstitutionRec, *Substitution;
-
-typedef Boolean (*XtFilePredicate)(
-   String /* filename */
-);
-
-typedef XtPointer XtRequestId;
-
-typedef Boolean (*XtConvertSelectionProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    Atom*		/* type_return */,
-    XtPointer*		/* value_return */,
-    unsigned long*	/* length_return */,
-    int*		/* format_return */
-);
-
-typedef void (*XtLoseSelectionProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */
-);
-
-typedef void (*XtSelectionDoneProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */
-);
-
-typedef void (*XtSelectionCallbackProc)(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    Atom*		/* selection */,
-    Atom*		/* type */,
-    XtPointer 		/* value */,
-    unsigned long*	/* length */,
-    int*		/* format */
-);
-
-typedef void (*XtLoseSelectionIncrProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    XtPointer 		/* client_data */
-);
-
-typedef void (*XtSelectionDoneIncrProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    XtRequestId*	/* receiver_id */,
-    XtPointer 		/* client_data */
-);
-
-typedef Boolean (*XtConvertSelectionIncrProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    Atom*		/* type */,
-    XtPointer*		/* value */,
-    unsigned long*	/* length */,
-    int*		/* format */,
-    unsigned long*	/* max_length */,
-    XtPointer 		/* client_data */,
-    XtRequestId*	/* receiver_id */
-);
-
-typedef void (*XtCancelConvertSelectionProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    XtRequestId*	/* receiver_id */,
-    XtPointer 		/* client_data */
-);
-
-typedef Boolean (*XtEventDispatchProc)(
-    XEvent*		/* event */
-);
-
-typedef void (*XtExtensionSelectProc)(
-    Widget		/* widget */,
-    int*		/* event_types */,
-    XtPointer*		/* select_data */,
-    int			/* count */,
-    XtPointer		/* client_data */
-);
-
-/***************************************************************
- *
- * Exported Interfaces
- *
- ****************************************************************/
-
-_XFUNCPROTOBEGIN
-
-extern Boolean XtConvertAndStore(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* from_type */,
-    XrmValue*		/* from */,
-    _Xconst _XtString 	/* to_type */,
-    XrmValue*		/* to_in_out */
-);
-
-extern Boolean XtCallConverter(
-    Display*		/* dpy */,
-    XtTypeConverter 	/* converter */,
-    XrmValuePtr 	/* args */,
-    Cardinal 		/* num_args */,
-    XrmValuePtr 	/* from */,
-    XrmValue*		/* to_in_out */,
-    XtCacheRef*		/* cache_ref_return */
-);
-
-extern Boolean XtDispatchEvent(
-    XEvent* 		/* event */
-);
-
-extern Boolean XtCallAcceptFocus(
-    Widget 		/* widget */,
-    Time*		/* time */
-);
-
-extern Boolean XtPeekEvent( /* obsolete */
-    XEvent*		/* event_return */
-);
-
-extern Boolean XtAppPeekEvent(
-    XtAppContext 	/* app_context */,
-    XEvent*		/* event_return */
-);
-
-extern Boolean XtIsSubclass(
-    Widget 		/* widget */,
-    WidgetClass 	/* widgetClass */
-);
-
-extern Boolean XtIsObject(
-    Widget 		/* object */
-);
-
-extern Boolean _XtCheckSubclassFlag( /* implementation-private */
-    Widget		/* object */,
-    _XtXtEnum		/* type_flag */
-);
-
-extern Boolean _XtIsSubclassOf( /* implementation-private */
-    Widget		/* object */,
-    WidgetClass		/* widget_class */,
-    WidgetClass		/* flag_class */,
-    _XtXtEnum		/* type_flag */
-);
-
-extern Boolean XtIsManaged(
-    Widget 		/* rectobj */
-);
-
-extern Boolean XtIsRealized(
-    Widget 		/* widget */
-);
-
-extern Boolean XtIsSensitive(
-    Widget 		/* widget */
-);
-
-extern Boolean XtOwnSelection(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Time 		/* time */,
-    XtConvertSelectionProc /* convert */,
-    XtLoseSelectionProc	/* lose */,
-    XtSelectionDoneProc /* done */
-);
-
-extern Boolean XtOwnSelectionIncremental(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Time 		/* time */,
-    XtConvertSelectionIncrProc	/* convert_callback */,
-    XtLoseSelectionIncrProc	/* lose_callback */,
-    XtSelectionDoneIncrProc	/* done_callback */,
-    XtCancelConvertSelectionProc /* cancel_callback */,
-    XtPointer 		/* client_data */
-);
-
-extern XtGeometryResult XtMakeResizeRequest(
-    Widget 		/* widget */,
-    _XtDimension	/* width */,
-    _XtDimension	/* height */,
-    Dimension*		/* width_return */,
-    Dimension*		/* height_return */
-);
-
-extern void XtTranslateCoords(
-    Widget 		/* widget */,
-    _XtPosition		/* x */,
-    _XtPosition		/* y */,
-    Position*		/* rootx_return */,
-    Position*		/* rooty_return */
-);
-
-extern KeySym* XtGetKeysymTable(
-    Display*		/* dpy */,
-    KeyCode*		/* min_keycode_return */,
-    int*		/* keysyms_per_keycode_return */
-);
-
-extern void XtKeysymToKeycodeList(
-    Display*		/* dpy */,
-    KeySym 		/* keysym */,
-    KeyCode**		/* keycodes_return */,
-    Cardinal*		/* keycount_return */
-);
-
-extern void XtStringConversionWarning( /* obsolete */
-    _Xconst _XtString	/* from_value */,
-    _Xconst _XtString	/* to_type */
-);
-
-extern void XtDisplayStringConversionWarning(
-    Display*	 	/* dpy */,
-    _Xconst _XtString	/* from_value */,
-    _Xconst _XtString	/* to_type */
-);
-
-externalref XtConvertArgRec const colorConvertArgs[];
-externalref XtConvertArgRec const screenConvertArg[];
-
-extern void XtAppAddConverter( /* obsolete */
-    XtAppContext	/* app_context */,
-    _Xconst _XtString	/* from_type */,
-    _Xconst _XtString	/* to_type */,
-    XtConverter 	/* converter */,
-    XtConvertArgList	/* convert_args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtAddConverter( /* obsolete */
-    _Xconst _XtString	/* from_type */,
-    _Xconst _XtString 	/* to_type */,
-    XtConverter 	/* converter */,
-    XtConvertArgList 	/* convert_args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtSetTypeConverter(
-    _Xconst _XtString 	/* from_type */,
-    _Xconst _XtString 	/* to_type */,
-    XtTypeConverter 	/* converter */,
-    XtConvertArgList 	/* convert_args */,
-    Cardinal 		/* num_args */,
-    XtCacheType 	/* cache_type */,
-    XtDestructor 	/* destructor */
-);
-
-extern void XtAppSetTypeConverter(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString 	/* from_type */,
-    _Xconst _XtString 	/* to_type */,
-    XtTypeConverter 	/* converter */,
-    XtConvertArgList 	/* convert_args */,
-    Cardinal 		/* num_args */,
-    XtCacheType 	/* cache_type */,
-    XtDestructor 	/* destructor */
-);
-
-extern void XtConvert( /* obsolete */
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* from_type */,
-    XrmValue*		/* from */,
-    _Xconst _XtString 	/* to_type */,
-    XrmValue*		/* to_return */
-);
-
-extern void XtDirectConvert( /* obsolete */
-    XtConverter 	/* converter */,
-    XrmValuePtr 	/* args */,
-    Cardinal 		/* num_args */,
-    XrmValuePtr 	/* from */,
-    XrmValue*		/* to_return */
-);
-
-/****************************************************************
- *
- * Translation Management
- *
- ****************************************************************/
-
-extern XtTranslations XtParseTranslationTable(
-    _Xconst _XtString	/* table */
-);
-
-extern XtAccelerators XtParseAcceleratorTable(
-    _Xconst _XtString	/* source */
-);
-
-extern void XtOverrideTranslations(
-    Widget 		/* widget */,
-    XtTranslations 	/* translations */
-);
-
-extern void XtAugmentTranslations(
-    Widget 		/* widget */,
-    XtTranslations 	/* translations */
-);
-
-extern void XtInstallAccelerators(
-    Widget 		/* destination */,
-    Widget		/* source */
-);
-
-extern void XtInstallAllAccelerators(
-    Widget 		/* destination */,
-    Widget		/* source */
-);
-
-extern void XtUninstallTranslations(
-    Widget 		/* widget */
-);
-
-extern void XtAppAddActions(
-    XtAppContext 	/* app_context */,
-    XtActionList 	/* actions */,
-    Cardinal 		/* num_actions */
-);
-
-extern void XtAddActions( /* obsolete */
-    XtActionList 	/* actions */,
-    Cardinal 		/* num_actions */
-);
-
-extern XtActionHookId XtAppAddActionHook(
-    XtAppContext 	/* app_context */,
-    XtActionHookProc 	/* proc */,
-    XtPointer 		/* client_data */
-);
-
-extern void XtRemoveActionHook(
-    XtActionHookId 	/* id */
-);
-
-extern void XtGetActionList(
-    WidgetClass		/* widget_class */,
-    XtActionList*	/* actions_return */,
-    Cardinal*		/* num_actions_return */
-);
-
-extern void XtCallActionProc(
-    Widget		/* widget */,
-    _Xconst _XtString	/* action */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal		/* num_params */
-);
-
-extern void XtRegisterGrabAction(
-    XtActionProc 	/* action_proc */,
-    _XtBoolean 		/* owner_events */,
-    unsigned int 	/* event_mask */,
-    int			/* pointer_mode */,
-    int	 		/* keyboard_mode */
-);
-
-extern void XtSetMultiClickTime(
-    Display*		/* dpy */,
-    int 		/* milliseconds */
-);
-
-extern int XtGetMultiClickTime(
-    Display*		/* dpy */
-);
-
-extern KeySym XtGetActionKeysym(
-    XEvent*		/* event */,
-    Modifiers*		/* modifiers_return */
-);
-
-/***************************************************************
- *
- * Keycode and Keysym procedures for translation management
- *
- ****************************************************************/
-
-extern void XtTranslateKeycode(
-    Display*		/* dpy */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers 		/* modifiers */,
-    Modifiers*		/* modifiers_return */,
-    KeySym*		/* keysym_return */
-);
-
-extern void XtTranslateKey(
-    Display*		/* dpy */,
-    _XtKeyCode		/* keycode */,
-    Modifiers		/* modifiers */,
-    Modifiers*		/* modifiers_return */,
-    KeySym*		/* keysym_return */
-);
-
-extern void XtSetKeyTranslator(
-    Display*		/* dpy */,
-    XtKeyProc 		/* proc */
-);
-
-extern void XtRegisterCaseConverter(
-    Display*		/* dpy */,
-    XtCaseProc 		/* proc */,
-    KeySym 		/* start */,
-    KeySym 		/* stop */
-);
-
-extern void XtConvertCase(
-    Display*		/* dpy */,
-    KeySym 		/* keysym */,
-    KeySym*		/* lower_return */,
-    KeySym*		/* upper_return */
-);
-
-/****************************************************************
- *
- * Event Management
- *
- ****************************************************************/
-
-/* XtAllEvents is valid only for XtRemoveEventHandler and
- * XtRemoveRawEventHandler; don't use it to select events!
- */
-#define XtAllEvents ((EventMask) -1L)
-
-extern void XtAddEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtAddRawEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveRawEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtInsertEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */,
-    XtListPosition 	/* position */
-);
-
-extern void XtInsertRawEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */,
-    XtListPosition 	/* position */
-);
-
-extern XtEventDispatchProc XtSetEventDispatcher(
-    Display*		/* dpy */,
-    int			/* event_type */,
-    XtEventDispatchProc	/* proc */
-);
-
-extern Boolean XtDispatchEventToWidget(
-    Widget		/* widget */,
-    XEvent*		/* event */
-);
-
-extern void XtInsertEventTypeHandler(
-    Widget		/* widget */,
-    int			/* type */,
-    XtPointer		/* select_data */,
-    XtEventHandler	/* proc */,
-    XtPointer		/* closure */,
-    XtListPosition	/* position */
-);
-
-extern void XtRemoveEventTypeHandler(
-    Widget		/* widget */,
-    int			/* type */,
-    XtPointer		/* select_data */,
-    XtEventHandler	/* proc */,
-    XtPointer		/* closure */
-);
-
-extern EventMask XtBuildEventMask(
-    Widget 		/* widget */
-);
-
-extern void XtRegisterExtensionSelector(
-    Display*		/* dpy */,
-    int			/* min_event_type */,
-    int			/* max_event_type */,
-    XtExtensionSelectProc /* proc */,
-    XtPointer		/* client_data */
-);
-
-extern void XtAddGrab(
-    Widget 		/* widget */,
-    _XtBoolean 		/* exclusive */,
-    _XtBoolean 		/* spring_loaded */
-);
-
-extern void XtRemoveGrab(
-    Widget 		/* widget */
-);
-
-extern void XtProcessEvent( /* obsolete */
-    XtInputMask 		/* mask */
-);
-
-extern void XtAppProcessEvent(
-    XtAppContext 		/* app_context */,
-    XtInputMask 		/* mask */
-);
-
-extern void XtMainLoop( /* obsolete */
-    void
-);
-
-extern void XtAppMainLoop(
-    XtAppContext 		/* app_context */
-);
-
-extern void XtAddExposureToRegion(
-    XEvent*		/* event */,
-    Region 		/* region */
-);
-
-extern void XtSetKeyboardFocus(
-    Widget		/* subtree */,
-    Widget 		/* descendent */
-);
-
-extern Widget XtGetKeyboardFocusWidget(
-    Widget		/* widget */
-);
-
-extern XEvent* XtLastEventProcessed(
-    Display*		/* dpy */
-);
-
-extern Time XtLastTimestampProcessed(
-    Display*		/* dpy */
-);
-
-/****************************************************************
- *
- * Event Gathering Routines
- *
- ****************************************************************/
-
-extern XtIntervalId XtAddTimeOut( /* obsolete */
-    unsigned long 	/* interval */,
-    XtTimerCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern XtIntervalId XtAppAddTimeOut(
-    XtAppContext 	/* app_context */,
-    unsigned long 	/* interval */,
-    XtTimerCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveTimeOut(
-    XtIntervalId 	/* timer */
-);
-
-extern XtInputId XtAddInput( /* obsolete */
-    int 		/* source */,
-    XtPointer 		/* condition */,
-    XtInputCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern XtInputId XtAppAddInput(
-    XtAppContext       	/* app_context */,
-    int 		/* source */,
-    XtPointer 		/* condition */,
-    XtInputCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveInput(
-    XtInputId 		/* id */
-);
-
-extern XtSignalId XtAddSignal(
-    XtSignalCallbackProc /* proc */,
-    XtPointer		/* closure */);
-
-extern XtSignalId XtAppAddSignal(
-    XtAppContext       	/* app_context */,
-    XtSignalCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveSignal(
-    XtSignalId 		/* id */
-);
-
-extern void XtNoticeSignal(
-    XtSignalId		/* id */
-);
-
-extern void XtNextEvent( /* obsolete */
-    XEvent* 		/* event */
-);
-
-extern void XtAppNextEvent(
-    XtAppContext 	/* app_context */,
-    XEvent*		/* event_return */
-);
-
-#define XtIMXEvent		1
-#define XtIMTimer		2
-#define XtIMAlternateInput	4
-#define XtIMSignal		8
-#define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal)
-
-extern Boolean XtPending( /* obsolete */
-    void
-);
-
-extern XtInputMask XtAppPending(
-    XtAppContext 	/* app_context */
-);
-
-extern XtBlockHookId XtAppAddBlockHook(
-    XtAppContext 	/* app_context */,
-    XtBlockHookProc 	/* proc */,
-    XtPointer 		/* client_data */
-);
-
-extern void XtRemoveBlockHook(
-    XtBlockHookId 	/* id */
-);
-
-/****************************************************************
- *
- * Random utility routines
- *
- ****************************************************************/
-
-#define XtIsRectObj(object)	(_XtCheckSubclassFlag(object, (XtEnum)0x02))
-#define XtIsWidget(object)	(_XtCheckSubclassFlag(object, (XtEnum)0x04))
-#define XtIsComposite(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x08))
-#define XtIsConstraint(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x10))
-#define XtIsShell(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x20))
-
-#undef XtIsOverrideShell
-extern Boolean XtIsOverrideShell(Widget /* object */);
-#define XtIsOverrideShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)overrideShellWidgetClass, \
-		     (WidgetClass)shellWidgetClass, (XtEnum)0x20))
-
-#define XtIsWMShell(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x40))
-
-#undef XtIsVendorShell
-extern Boolean XtIsVendorShell(Widget /* object */);
-#define XtIsVendorShell(widget)	\
-    (_XtIsSubclassOf(widget, (WidgetClass)vendorShellWidgetClass, \
-		     (WidgetClass)wmShellWidgetClass, (XtEnum)0x40))
-
-#undef XtIsTransientShell
-extern Boolean XtIsTransientShell(Widget /* object */);
-#define XtIsTransientShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)transientShellWidgetClass, \
-		     (WidgetClass)wmShellWidgetClass, (XtEnum)0x40))
-#define XtIsTopLevelShell(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x80))
-
-#undef XtIsApplicationShell
-extern Boolean XtIsApplicationShell(Widget /* object */);
-#define XtIsApplicationShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)applicationShellWidgetClass, \
-		     (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80))
-
-#undef XtIsSessionShell
-extern Boolean XtIsSessionShell(Widget /* object */);
-#define XtIsSessionShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)sessionShellWidgetClass, \
-		     (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80))
-
-extern void XtRealizeWidget(
-    Widget 		/* widget */
-);
-
-void XtUnrealizeWidget(
-    Widget 		/* widget */
-);
-
-extern void XtDestroyWidget(
-    Widget 		/* widget */
-);
-
-extern void XtSetSensitive(
-    Widget 		/* widget */,
-    _XtBoolean 		/* sensitive */
-);
-
-extern void XtSetMappedWhenManaged(
-    Widget 		/* widget */,
-    _XtBoolean 		/* mapped_when_managed */
-);
-
-extern Widget XtNameToWidget(
-    Widget 		/* reference */,
-    _Xconst _XtString	/* names */
-);
-
-extern Widget XtWindowToWidget(
-    Display*		/* display */,
-    Window 		/* window */
-);
-
-extern XtPointer XtGetClassExtension(
-    WidgetClass		/* object_class */,
-    Cardinal		/* byte_offset */,
-    XrmQuark		/* type */,
-    long		/* version */,
-    Cardinal		/* record_size */
-);
-
-/***************************************************************
- *
- * Arg lists
- *
- ****************************************************************/
-
-
-#define XtSetArg(arg, n, d) \
-    ((void)( (arg).name = (n), (arg).value = (XtArgVal)(d) ))
-
-extern ArgList XtMergeArgLists(
-    ArgList 		/* args1 */,
-    Cardinal 		/* num_args1 */,
-    ArgList 		/* args2 */,
-    Cardinal 		/* num_args2 */
-);
-
-/***************************************************************
- *
- * Vararg lists
- *
- ****************************************************************/
-
-#define XtVaNestedList  "XtVaNestedList"
-#define XtVaTypedArg    "XtVaTypedArg"
-
-extern XtVarArgsList XtVaCreateArgsList(
-    XtPointer		/*unused*/, ...
-) _X_SENTINEL(0);
-
-/*************************************************************
- *
- * Information routines
- *
- ************************************************************/
-
-#ifndef _XtIntrinsicP_h
-
-/* We're not included from the private file, so define these */
-
-extern Display *XtDisplay(
-    Widget 		/* widget */
-);
-
-extern Display *XtDisplayOfObject(
-    Widget 		/* object */
-);
-
-extern Screen *XtScreen(
-    Widget 		/* widget */
-);
-
-extern Screen *XtScreenOfObject(
-    Widget 		/* object */
-);
-
-extern Window XtWindow(
-    Widget 		/* widget */
-);
-
-extern Window XtWindowOfObject(
-    Widget 		/* object */
-);
-
-extern String XtName(
-    Widget 		/* object */
-);
-
-extern WidgetClass XtSuperclass(
-    Widget 		/* object */
-);
-
-extern WidgetClass XtClass(
-    Widget 		/* object */
-);
-
-extern Widget XtParent(
-    Widget 		/* widget */
-);
-
-#endif /*_XtIntrinsicP_h*/
-
-#undef XtMapWidget
-extern void XtMapWidget(Widget /* w */);
-#define XtMapWidget(widget)	XMapWindow(XtDisplay(widget), XtWindow(widget))
-
-#undef XtUnmapWidget
-extern void XtUnmapWidget(Widget /* w */);
-#define XtUnmapWidget(widget)	\
-		XUnmapWindow(XtDisplay(widget), XtWindow(widget))
-
-extern void XtAddCallback(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtCallbackProc 	/* callback */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveCallback(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtCallbackProc 	/* callback */,
-    XtPointer 		/* closure */
-);
-
-extern void XtAddCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString	/* callback_name */,
-    XtCallbackList 	/* callbacks */
-);
-
-extern void XtRemoveCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtCallbackList 	/* callbacks */
-);
-
-extern void XtRemoveAllCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */
-);
-
-
-extern void XtCallCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallCallbackList(
-    Widget		/* widget */,
-    XtCallbackList 	/* callbacks */,
-    XtPointer 		/* call_data */
-);
-
-extern XtCallbackStatus XtHasCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */
-);
-
-/****************************************************************
- *
- * Geometry Management
- *
- ****************************************************************/
-
-
-extern XtGeometryResult XtMakeGeometryRequest(
-    Widget 		/* widget */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply_return */
-);
-
-extern XtGeometryResult XtQueryGeometry(
-    Widget 		/* widget */,
-    XtWidgetGeometry*	/* intended */,
-    XtWidgetGeometry*	/* preferred_return */
-);
-
-extern Widget XtCreatePopupShell(
-    _Xconst _XtString	/* name */,
-    WidgetClass 	/* widgetClass */,
-    Widget 		/* parent */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaCreatePopupShell(
-    _Xconst _XtString	/* name */,
-    WidgetClass		/* widgetClass */,
-    Widget		/* parent */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtPopup(
-    Widget 		/* popup_shell */,
-    XtGrabKind 		/* grab_kind */
-);
-
-extern void XtPopupSpringLoaded(
-    Widget 		/* popup_shell */
-);
-
-extern void XtCallbackNone(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallbackNonexclusive(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallbackExclusive(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtPopdown(
-    Widget 		/* popup_shell */
-);
-
-extern void XtCallbackPopdown(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtMenuPopupAction(
-    Widget 		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern Widget XtCreateWidget(
-    _Xconst _XtString 	/* name */,
-    WidgetClass 	/* widget_class */,
-    Widget 		/* parent */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtCreateManagedWidget(
-    _Xconst _XtString 	/* name */,
-    WidgetClass 	/* widget_class */,
-    Widget 		/* parent */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaCreateWidget(
-    _Xconst _XtString	/* name */,
-    WidgetClass		/* widget */,
-    Widget		/* parent */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtVaCreateManagedWidget(
-    _Xconst _XtString	/* name */,
-    WidgetClass		/* widget_class */,
-    Widget		/* parent */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtCreateApplicationShell( /* obsolete */
-    _Xconst _XtString 	/* name */,
-    WidgetClass 	/* widget_class */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtAppCreateShell(
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    WidgetClass 	/* widget_class */,
-    Display*		/* display */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaAppCreateShell(
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    WidgetClass		/* widget_class */,
-    Display*		/* display */,
-    ...
-) _X_SENTINEL(0);
-
-/****************************************************************
- *
- * Toolkit initialization
- *
- ****************************************************************/
-
-extern void XtToolkitInitialize(
-    void
-);
-
-extern XtLanguageProc XtSetLanguageProc(
-    XtAppContext	/* app_context */,
-    XtLanguageProc	/* proc */,
-    XtPointer		/* client_data */
-);
-
-extern void XtDisplayInitialize(
-    XtAppContext 	/* app_context */,
-    Display*		/* dpy */,
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescRec* 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc */,
-    char**		/* argv */
-);
-
-extern Widget XtOpenApplication(
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    WidgetClass		/* widget_class */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaOpenApplication(
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList	/* options */,
-    Cardinal		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    WidgetClass		/* widget_class */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtAppInitialize( /* obsolete */
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaAppInitialize( /* obsolete */
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList	/* options */,
-    Cardinal		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtInitialize( /* obsolete */
-    _Xconst _XtString 	/* shell_name */,
-    _Xconst _XtString 	/* application_class */,
-    XrmOptionDescRec* 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc */,
-    char**		/* argv */
-);
-
-extern Display *XtOpenDisplay(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* display_string */,
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescRec*	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc */,
-    char**		/* argv */
-);
-
-extern XtAppContext XtCreateApplicationContext(
-    void
-);
-
-extern void XtAppSetFallbackResources(
-    XtAppContext 	/* app_context */,
-    String*		/* specification_list */
-);
-
-extern void XtDestroyApplicationContext(
-    XtAppContext 	/* app_context */
-);
-
-extern void XtInitializeWidgetClass(
-    WidgetClass 	/* widget_class */
-);
-
-extern XtAppContext XtWidgetToApplicationContext(
-    Widget 		/* widget */
-);
-
-extern XtAppContext XtDisplayToApplicationContext(
-    Display*		/* dpy */
-);
-
-extern XrmDatabase XtDatabase(
-    Display*		/* dpy */
-);
-
-extern XrmDatabase XtScreenDatabase(
-    Screen*		/* screen */
-);
-
-extern void XtCloseDisplay(
-    Display*		/* dpy */
-);
-
-extern void XtGetApplicationResources(
-    Widget 		/* widget */,
-    XtPointer 		/* base */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetApplicationResources(
-    Widget		/* widget */,
-    XtPointer		/* base */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetSubresources(
-    Widget 		/* widget */,
-    XtPointer 		/* base */,
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString 	/* class */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetSubresources(
-    Widget		/* widget */,
-    XtPointer		/* base */,
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* class */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtSetValues(
-    Widget 		/* widget */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaSetValues(
-    Widget		/* widget */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetValues(
-    Widget 		/* widget */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetValues(
-    Widget		/* widget */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtSetSubvalues(
-    XtPointer 		/* base */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaSetSubvalues(
-    XtPointer		/* base */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetSubvalues(
-    XtPointer 		/* base */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetSubvalues(
-    XtPointer		/* base */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetResourceList(
-    WidgetClass 	/* widget_class */,
-    XtResourceList*	/* resources_return */,
-    Cardinal*		/* num_resources_return */
-);
-
-extern void XtGetConstraintResourceList(
-    WidgetClass 	/* widget_class */,
-    XtResourceList*	/* resources_return */,
-    Cardinal*		/* num_resources_return */
-);
-
-#define XtUnspecifiedPixmap	((Pixmap)2)
-#define XtUnspecifiedShellInt	(-1)
-#define XtUnspecifiedWindow	((Window)2)
-#define XtUnspecifiedWindowGroup ((Window)3)
-#define XtCurrentDirectory	"XtCurrentDirectory"
-#define XtDefaultForeground	"XtDefaultForeground"
-#define XtDefaultBackground	"XtDefaultBackground"
-#define XtDefaultFont		"XtDefaultFont"
-#define XtDefaultFontSet	"XtDefaultFontSet"
-
-#if defined(CRAY)
-#define XtOffset(p_type,field) _Offsetof(p_type,field)
-#else	/* ! CRAY */
-#define XtOffset(p_type,field) \
-	((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-#endif /* !CRAY */
-
-#ifdef offsetof
-#define XtOffsetOf(s_type,field) offsetof(s_type,field)
-#else
-#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
-#endif
-
-/*************************************************************
- *
- * Session Management
- *
- ************************************************************/
-
-typedef struct _XtCheckpointTokenRec {
-    int		save_type;
-    int		interact_style;
-    Boolean	shutdown;
-    Boolean	fast;
-    Boolean	cancel_shutdown;
-    int		phase;
-    int		interact_dialog_type;	/* return */
-    Boolean	request_cancel;		/* return */
-    Boolean	request_next_phase;	/* return */
-    Boolean	save_success;		/* return */
-    int		type;		/* implementation private */
-    Widget	widget;		/* implementation private */
-} XtCheckpointTokenRec, *XtCheckpointToken;
-
-XtCheckpointToken XtSessionGetToken(
-    Widget		/* widget */
-);
-
-void XtSessionReturnToken(
-    XtCheckpointToken	/* token */
-);
-
-/*************************************************************
- *
- * Error Handling
- *
- ************************************************************/
-
-extern XtErrorMsgHandler XtAppSetErrorMsgHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern void XtSetErrorMsgHandler( /* obsolete */
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern XtErrorMsgHandler XtAppSetWarningMsgHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern void XtSetWarningMsgHandler( /* obsolete */
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern void XtAppErrorMsg(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void XtErrorMsg( /* obsolete */
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void XtAppWarningMsg(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString 	/* type */,
-    _Xconst _XtString 	/* class */,
-    _Xconst _XtString 	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void XtWarningMsg( /* obsolete */
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern XtErrorHandler XtAppSetErrorHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorHandler 	/* handler */
-);
-
-extern void XtSetErrorHandler( /* obsolete */
-    XtErrorHandler 	/* handler */
-);
-
-extern XtErrorHandler XtAppSetWarningHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorHandler 	/* handler */
-);
-
-extern void XtSetWarningHandler( /* obsolete */
-    XtErrorHandler 	/* handler */
-);
-
-extern void XtAppError(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* message */
-);
-
-extern void XtError( /* obsolete */
-    _Xconst _XtString	/* message */
-);
-
-extern void XtAppWarning(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* message */
-);
-
-extern void XtWarning( /* obsolete */
-    _Xconst _XtString	/* message */
-);
-
-extern XrmDatabase *XtAppGetErrorDatabase(
-    XtAppContext 	/* app_context */
-);
-
-extern XrmDatabase *XtGetErrorDatabase( /* obsolete */
-    void
-);
-
-extern void XtAppGetErrorDatabaseText(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString 	/* default */,
-    String 		/* buffer_return */,
-    int 		/* nbytes */,
-    XrmDatabase 	/* database */
-);
-
-extern void XtGetErrorDatabaseText( /* obsolete */
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString 	/* default */,
-    String 		/* buffer_return */,
-    int 		/* nbytes */
-);
-
-/****************************************************************
- *
- * Memory Management
- *
- ****************************************************************/
-
-extern char *XtMalloc(
-    Cardinal 		/* size */
-);
-
-extern char *XtCalloc(
-    Cardinal		/* num */,
-    Cardinal 		/* size */
-);
-
-extern char *XtRealloc(
-    char* 		/* ptr */,
-    Cardinal 		/* num */
-);
-
-extern void XtFree(
-    char*		/* ptr */
-);
-
-#ifdef XTTRACEMEMORY
-
-extern char *_XtMalloc( /* implementation-private */
-    Cardinal	/* size */,
-    char *	/* file */,
-    int	        /* line */
-);
-
-extern char *_XtRealloc( /* implementation-private */
-    char *	/* ptr */,
-    Cardinal    /* size */,
-    char *	/* file */,
-    int		/* line */
-);
-
-extern char *_XtCalloc( /* implementation-private */
-    Cardinal	/* num */,
-    Cardinal 	/* size */,
-    char *	/* file */,
-    int		/* line */
-);
-
-extern void _XtFree( /* implementation-private */
-    char *	/* ptr */
-);
-
-#define XtMalloc(size) _XtMalloc(size, __FILE__, __LINE__)
-#define XtRealloc(ptr,size) _XtRealloc(ptr, size, __FILE__, __LINE__)
-#define XtCalloc(num,size) _XtCalloc(num, size, __FILE__, __LINE__)
-#define XtFree(ptr) _XtFree(ptr)
-
-#endif /* ifdef XTTRACEMEMORY */
-
-#define XtNew(type) ((type *) XtMalloc((unsigned) sizeof(type)))
-
-#undef XtNewString
-extern String XtNewString(String /* str */);
-#define XtNewString(str) \
-    ((str) != NULL ? (strcpy(XtMalloc((unsigned)strlen(str) + 1), str)) : NULL)
-
-/*************************************************************
- *
- *  Work procs
- *
- **************************************************************/
-
-extern XtWorkProcId XtAddWorkProc( /* obsolete */
-    XtWorkProc 		/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern XtWorkProcId XtAppAddWorkProc(
-    XtAppContext 	/* app_context */,
-    XtWorkProc 		/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void  XtRemoveWorkProc(
-    XtWorkProcId 	/* id */
-);
-
-
-/****************************************************************
- *
- * Graphic Context Management
- *****************************************************************/
-
-extern GC XtGetGC(
-    Widget 		/* widget */,
-    XtGCMask 		/* valueMask */,
-    XGCValues* 		/* values */
-);
-
-extern GC XtAllocateGC(
-    Widget 		/* widget */,
-    Cardinal		/* depth */,
-    XtGCMask 		/* valueMask */,
-    XGCValues* 		/* values */,
-    XtGCMask		/* dynamicMask */,
-    XtGCMask		/* unusedMask */
-);
-
-/* This implementation of XtDestroyGC differs from the formal specification
- * for historic backwards compatibility reasons.  As other implementations
- * may conform to the spec, use of XtReleaseGC is strongly encouraged.
- */
-extern void XtDestroyGC( /* obsolete */
-    GC 			/* gc */
-);
-
-extern void XtReleaseGC(
-    Widget 		/* object */,
-    GC 			/* gc */
-);
-
-
-
-extern void XtAppReleaseCacheRefs(
-    XtAppContext	/* app_context */,
-    XtCacheRef*		/* cache_ref */
-);
-
-extern void XtCallbackReleaseCacheRef(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,	/* XtCacheRef */
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallbackReleaseCacheRefList(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,	/* XtCacheRef* */
-    XtPointer 		/* call_data */
-);
-
-extern void XtSetWMColormapWindows(
-    Widget 		/* widget */,
-    Widget*		/* list */,
-    Cardinal		/* count */
-);
-
-extern String XtFindFile(
-    _Xconst _XtString	/* path */,
-    Substitution	/* substitutions */,
-    Cardinal 		/* num_substitutions */,
-    XtFilePredicate	/* predicate */
-);
-
-extern String XtResolvePathname(
-    Display*		/* dpy */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* filename */,
-    _Xconst _XtString	/* suffix */,
-    _Xconst _XtString	/* path */,
-    Substitution	/* substitutions */,
-    Cardinal		/* num_substitutions */,
-    XtFilePredicate 	/* predicate */
-);
-
-/****************************************************************
- *
- * Selections
- *
- *****************************************************************/
-
-#define XT_CONVERT_FAIL (Atom)0x80000001
-
-extern void XtDisownSelection(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Time 		/* time */
-);
-
-extern void XtGetSelectionValue(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom 		/* target */,
-    XtSelectionCallbackProc /* callback */,
-    XtPointer 		/* closure */,
-    Time 		/* time */
-);
-
-extern void XtGetSelectionValues(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom*		/* targets */,
-    int 		/* count */,
-    XtSelectionCallbackProc /* callback */,
-    XtPointer*		/* closures */,
-    Time 		/* time */
-);
-
-extern void XtAppSetSelectionTimeout(
-    XtAppContext 	/* app_context */,
-    unsigned long 	/* timeout */
-);
-
-extern void XtSetSelectionTimeout( /* obsolete */
-    unsigned long 	/* timeout */
-);
-
-extern unsigned long XtAppGetSelectionTimeout(
-    XtAppContext 	/* app_context */
-);
-
-extern unsigned long XtGetSelectionTimeout( /* obsolete */
-    void
-);
-
-extern XSelectionRequestEvent *XtGetSelectionRequest(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    XtRequestId 	/* request_id */
-);
-
-extern void XtGetSelectionValueIncremental(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom 		/* target */,
-    XtSelectionCallbackProc /* selection_callback */,
-    XtPointer 		/* client_data */,
-    Time 		/* time */
-);
-
-extern void XtGetSelectionValuesIncremental(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom*		/* targets */,
-    int 		/* count */,
-    XtSelectionCallbackProc /* callback */,
-    XtPointer*		/* client_data */,
-    Time 		/* time */
-);
-
-extern void XtSetSelectionParameters(
-    Widget		/* requestor */,
-    Atom		/* selection */,
-    Atom		/* type */,
-    XtPointer		/* value */,
-    unsigned long	/* length */,
-    int			/* format */
-);
-
-extern void XtGetSelectionParameters(
-    Widget		/* owner */,
-    Atom		/* selection */,
-    XtRequestId		/* request_id */,
-    Atom*		/* type_return */,
-    XtPointer*		/* value_return */,
-    unsigned long*	/* length_return */,
-    int*		/* format_return */
-);
-
-extern void XtCreateSelectionRequest(
-    Widget		/* requestor */,
-    Atom		/* selection */
-);
-
-extern void XtSendSelectionRequest(
-    Widget		/* requestor */,
-    Atom		/* selection */,
-    Time		/* time */
-);
-
-extern void XtCancelSelectionRequest(
-    Widget		/* requestor */,
-    Atom		/* selection */
-);
-
-extern Atom XtReservePropertyAtom(
-    Widget		/* widget */
-);
-
-extern void XtReleasePropertyAtom(
-    Widget		/* widget */,
-    Atom		/* selection */
-);
-
-extern void XtGrabKey(
-    Widget 		/* widget */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers	 	/* modifiers */,
-    _XtBoolean 		/* owner_events */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */
-);
-
-extern void XtUngrabKey(
-    Widget 		/* widget */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers	 	/* modifiers */
-);
-
-extern int XtGrabKeyboard(
-    Widget 		/* widget */,
-    _XtBoolean 		/* owner_events */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */,
-    Time 		/* time */
-);
-
-extern void XtUngrabKeyboard(
-    Widget 		/* widget */,
-    Time 		/* time */
-);
-
-extern void XtGrabButton(
-    Widget 		/* widget */,
-    int 		/* button */,
-    Modifiers	 	/* modifiers */,
-    _XtBoolean 		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */,
-    Window 		/* confine_to */,
-    Cursor 		/* cursor */
-);
-
-extern void XtUngrabButton(
-    Widget 		/* widget */,
-    unsigned int	/* button */,
-    Modifiers	 	/* modifiers */
-);
-
-extern int XtGrabPointer(
-    Widget 		/* widget */,
-    _XtBoolean 		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */,
-    Window 		/* confine_to */,
-    Cursor 		/* cursor */,
-    Time 		/* time */
-);
-
-extern void XtUngrabPointer(
-    Widget 		/* widget */,
-    Time 		/* time */
-);
-
-extern void XtGetApplicationNameAndClass(
-    Display*		/* dpy */,
-    String*		/* name_return */,
-    String*		/* class_return */
-);
-
-extern void XtRegisterDrawable(
-    Display*		/* dpy */,
-    Drawable		/* drawable */,
-    Widget		/* widget */
-);
-
-extern void XtUnregisterDrawable(
-    Display*		/* dpy */,
-    Drawable		/* drawable */
-);
-
-extern Widget XtHooksOfDisplay(
-    Display*		/* dpy */
-);
-
-typedef struct {
-    String type;
-    Widget widget;
-    ArgList args;
-    Cardinal num_args;
-} XtCreateHookDataRec, *XtCreateHookData;
-
-typedef struct {
-    String type;
-    Widget widget;
-    XtPointer event_data;
-    Cardinal num_event_data;
-} XtChangeHookDataRec, *XtChangeHookData;
-
-typedef struct {
-    Widget old, req;
-    ArgList args;
-    Cardinal num_args;
-} XtChangeHookSetValuesDataRec, *XtChangeHookSetValuesData;
-
-typedef struct {
-    String type;
-    Widget widget;
-    XtGeometryMask changeMask;
-    XWindowChanges changes;
-} XtConfigureHookDataRec, *XtConfigureHookData;
-
-typedef struct {
-    String type;
-    Widget widget;
-    XtWidgetGeometry* request;
-    XtWidgetGeometry* reply;
-    XtGeometryResult result;
-} XtGeometryHookDataRec, *XtGeometryHookData;
-
-typedef struct {
-    String type;
-    Widget widget;
-} XtDestroyHookDataRec, *XtDestroyHookData;
-
-extern void XtGetDisplays(
-    XtAppContext	/* app_context */,
-    Display***		/* dpy_return */,
-    Cardinal*		/* num_dpy_return */
-);
-
-extern Boolean XtToolkitThreadInitialize(
-    void
-);
-
-extern void XtAppSetExitFlag(
-    XtAppContext	/* app_context */
-);
-
-extern Boolean XtAppGetExitFlag(
-    XtAppContext	/* app_context */
-);
-
-extern void XtAppLock(
-    XtAppContext	/* app_context */
-);
-
-extern void XtAppUnlock(
-    XtAppContext	/* app_context */
-);
-
-/*
- *	Predefined Resource Converters
- */
-
-
-/* String converters */
-
-extern Boolean XtCvtStringToAcceleratorTable(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToAtom(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToBool(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToBoolean(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToCommandArgArray(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToCursor(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToDimension(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToDirectoryString(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToDisplay(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFile(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFloat(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFont(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFontSet(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display, locale */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFontStruct(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToGravity(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToInitialState(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToInt(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToPixel(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Screen, Colormap */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-#define XtCvtStringToPosition XtCvtStringToShort
-
-extern Boolean XtCvtStringToRestartStyle(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToShort(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToTranslationTable(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToUnsignedChar(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToVisual(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Screen, depth */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-/* int converters */
-
-extern Boolean XtCvtIntToBool(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToBoolean(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToColor(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Screen, Colormap */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-#define XtCvtIntToDimension XtCvtIntToShort
-
-extern Boolean XtCvtIntToFloat(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToFont(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToPixel(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToPixmap(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-#define XtCvtIntToPosition XtCvtIntToShort
-
-extern Boolean XtCvtIntToShort(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToUnsignedChar(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-/* Color converter */
-
-extern Boolean XtCvtColorToPixel(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-/* Pixel converter */
-
-#define XtCvtPixelToColor XtCvtIntToColor
-
-
-_XFUNCPROTOEND
-
-#endif /*_XtIntrinsic_h*/
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

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

+

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

+

+/*

+

+Copyright 1987, 1988, 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 _XtIntrinsic_h

+#define _XtIntrinsic_h

+

+#include	<X11/Xlib.h>

+#include	<X11/Xutil.h>

+#include	<X11/Xresource.h>

+#include	<X11/Xfuncproto.h>

+#ifdef XT_BC

+#include <X11/Xos.h>		/* for R4 compatibility */

+#else

+#include <X11/Xosdefs.h>

+#include <string.h>		/* for XtNewString */

+#endif /* XT_BC else */

+

+#define XtSpecificationRelease 6

+

+typedef char *String;

+

+/* We do this in order to get "const" declarations to work right.  We

+ * use _XtString instead of String so that C++ applications can

+ * #define String to something else if they choose, to avoid conflicts

+ * with other C++ libraries.

+ */

+#define _XtString char*

+

+/* _Xt names are private to Xt implementation, do not use in client code */

+#if NeedWidePrototypes

+#define _XtBoolean	int

+#define _XtDimension	unsigned int

+#define _XtKeyCode	unsigned int

+#define _XtPosition	int

+#define _XtXtEnum	unsigned int

+#else

+#define _XtBoolean	Boolean

+#define _XtDimension	Dimension

+#define _XtKeyCode	KeyCode

+#define _XtPosition	Position

+#define _XtXtEnum	XtEnum

+#endif /* NeedWidePrototypes */

+

+#include <stddef.h>

+

+#ifdef VMS

+#define externalref globalref

+#define externaldef(psect) globaldef {"psect"} noshare

+#else

+#define externalref extern

+#define externaldef(psect)

+#endif /* VMS */

+

+#ifndef FALSE

+#define FALSE 0

+#define TRUE 1

+#endif

+

+#define XtNumber(arr)		((Cardinal) (sizeof(arr) / sizeof(arr[0])))

+

+typedef struct _WidgetRec *Widget;

+typedef Widget *WidgetList;

+typedef struct _WidgetClassRec *WidgetClass;

+typedef struct _CompositeRec *CompositeWidget;

+typedef struct _XtActionsRec *XtActionList;

+typedef struct _XtEventRec *XtEventTable;

+

+typedef struct _XtAppStruct *XtAppContext;

+typedef unsigned long	XtValueMask;

+typedef unsigned long	XtIntervalId;

+typedef unsigned long	XtInputId;

+typedef unsigned long	XtWorkProcId;

+typedef unsigned long	XtSignalId;

+typedef unsigned int	XtGeometryMask;

+typedef unsigned long	XtGCMask;   /* Mask of values that are used by widget*/

+typedef unsigned long	Pixel;	    /* Index into colormap		*/

+typedef int		XtCacheType;

+#define			XtCacheNone	  0x001

+#define			XtCacheAll	  0x002

+#define			XtCacheByDisplay  0x003

+#define			XtCacheRefCount	  0x100

+

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

+ *

+ * System Dependent Definitions; see spec for specific range

+ * requirements.  Do not assume every implementation uses the

+ * same base types!

+ *

+ *

+ * XtArgVal ought to be a union of XtPointer, char *, long, int *, and proc *

+ * but casting to union types is not really supported.

+ *

+ * So the typedef for XtArgVal should be chosen such that

+ *

+ *	sizeof (XtArgVal) >=	sizeof(XtPointer)

+ *				sizeof(char *)

+ *				sizeof(long)

+ *				sizeof(int *)

+ *				sizeof(proc *)

+ *

+ * ArgLists rely heavily on the above typedef.

+ *

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

+#ifdef CRAY

+typedef long		Boolean;

+typedef char*		XtArgVal;

+typedef long		XtEnum;

+#else

+typedef char		Boolean;

+typedef long		XtArgVal;

+typedef unsigned char	XtEnum;

+#endif

+

+typedef unsigned int	Cardinal;

+typedef unsigned short	Dimension;  /* Size in pixels			*/

+typedef short		Position;   /* Offset from 0 coordinate		*/

+

+typedef void*		XtPointer;

+

+/* The type Opaque is NOT part of the Xt standard, do NOT use it. */

+/* (It remains here only for backward compatibility.) */

+typedef XtPointer	Opaque;

+

+#include <X11/Core.h>

+#include <X11/Composite.h>

+#include <X11/Constraint.h>

+#include <X11/Object.h>

+#include <X11/RectObj.h>

+

+typedef struct _TranslationData *XtTranslations;

+typedef struct _TranslationData *XtAccelerators;

+typedef unsigned int Modifiers;

+

+typedef void (*XtActionProc)(

+    Widget 		/* widget */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+typedef XtActionProc* XtBoundActions;

+

+typedef struct _XtActionsRec{

+    String	 string;

+    XtActionProc proc;

+} XtActionsRec;

+

+typedef enum {

+/* address mode		parameter representation    */

+/* ------------		------------------------    */

+    XtAddress,		/* address		    */

+    XtBaseOffset,	/* offset		    */

+    XtImmediate,	/* constant		    */

+    XtResourceString,	/* resource name string	    */

+    XtResourceQuark,	/* resource name quark	    */

+    XtWidgetBaseOffset,	/* offset from ancestor	    */

+    XtProcedureArg	/* procedure to invoke	    */

+} XtAddressMode;

+

+typedef struct {

+    XtAddressMode   address_mode;

+    XtPointer	    address_id;

+    Cardinal	    size;

+} XtConvertArgRec, *XtConvertArgList;

+

+typedef void (*XtConvertArgProc)(

+    Widget 		/* widget */,

+    Cardinal*		/* size */,

+    XrmValue*		/* value */

+);

+

+typedef struct {

+    XtGeometryMask request_mode;

+    Position x, y;

+    Dimension width, height, border_width;

+    Widget sibling;

+    int stack_mode;   /* Above, Below, TopIf, BottomIf, Opposite, DontChange */

+} XtWidgetGeometry;

+

+/* Additions to Xlib geometry requests: ask what would happen, don't do it */

+#define XtCWQueryOnly	(1 << 7)

+

+/* Additions to Xlib stack modes: don't change stack order */

+#define XtSMDontChange	5

+

+typedef void (*XtConverter)( /* obsolete */

+    XrmValue*		/* args */,

+    Cardinal*		/* num_args */,

+    XrmValue*		/* from */,

+    XrmValue*		/* to */

+);

+

+typedef Boolean (*XtTypeConverter)(

+    Display*		/* dpy */,

+    XrmValue*		/* args */,

+    Cardinal*		/* num_args */,

+    XrmValue*		/* from */,

+    XrmValue*		/* to */,

+    XtPointer*		/* converter_data */

+);

+

+typedef void (*XtDestructor)(

+    XtAppContext	/* app */,

+    XrmValue*		/* to */,

+    XtPointer 		/* converter_data */,

+    XrmValue*		/* args */,

+    Cardinal*		/* num_args */

+);

+

+typedef Opaque XtCacheRef;

+

+typedef Opaque XtActionHookId;

+

+typedef void (*XtActionHookProc)(

+    Widget		/* w */,

+    XtPointer		/* client_data */,

+    String		/* action_name */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+typedef unsigned long XtBlockHookId;

+

+typedef void (*XtBlockHookProc)(

+    XtPointer		/* client_data */

+);

+

+typedef void (*XtKeyProc)(

+    Display*		/* dpy */,

+    _XtKeyCode 		/* keycode */,

+    Modifiers		/* modifiers */,

+    Modifiers*		/* modifiers_return */,

+    KeySym*		/* keysym_return */

+);

+

+typedef void (*XtCaseProc)(

+    Display*		/* display */,

+    KeySym		/* keysym */,

+    KeySym*		/* lower_return */,

+    KeySym*		/* upper_return */

+);

+

+typedef void (*XtEventHandler)(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,

+    XEvent*		/* event */,

+    Boolean*		/* continue_to_dispatch */

+);

+typedef unsigned long EventMask;

+

+typedef enum {XtListHead, XtListTail } XtListPosition;

+

+typedef unsigned long	XtInputMask;

+#define XtInputNoneMask		0L

+#define XtInputReadMask		(1L<<0)

+#define XtInputWriteMask	(1L<<1)

+#define XtInputExceptMask	(1L<<2)

+

+typedef void (*XtTimerCallbackProc)(

+    XtPointer 		/* closure */,

+    XtIntervalId*	/* id */

+);

+

+typedef void (*XtInputCallbackProc)(

+    XtPointer 		/* closure */,

+    int*		/* source */,

+    XtInputId*		/* id */

+);

+

+typedef void (*XtSignalCallbackProc)(

+    XtPointer		/* closure */,

+    XtSignalId*		/* id */

+);

+

+typedef struct {

+    String	name;

+    XtArgVal	value;

+} Arg, *ArgList;

+

+typedef XtPointer	XtVarArgsList;

+

+typedef void (*XtCallbackProc)(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,	/* data the application registered */

+    XtPointer 		/* call_data */	/* callback specific data */

+);

+

+typedef struct _XtCallbackRec {

+    XtCallbackProc  callback;

+    XtPointer	    closure;

+} XtCallbackRec, *XtCallbackList;

+

+typedef enum {

+	XtCallbackNoList,

+	XtCallbackHasNone,

+	XtCallbackHasSome

+} XtCallbackStatus;

+

+typedef enum  {

+    XtGeometryYes,	  /* Request accepted. */

+    XtGeometryNo,	  /* Request denied. */

+    XtGeometryAlmost,	  /* Request denied, but willing to take replyBox. */

+    XtGeometryDone	  /* Request accepted and done. */

+} XtGeometryResult;

+

+typedef enum {XtGrabNone, XtGrabNonexclusive, XtGrabExclusive} XtGrabKind;

+

+typedef struct {

+    Widget  shell_widget;

+    Widget  enable_widget;

+} XtPopdownIDRec, *XtPopdownID;

+

+typedef struct _XtResource {

+    String	resource_name;	/* Resource name			    */

+    String	resource_class;	/* Resource class			    */

+    String	resource_type;	/* Representation type desired		    */

+    Cardinal	resource_size;	/* Size in bytes of representation	    */

+    Cardinal	resource_offset;/* Offset from base to put resource value   */

+    String	default_type;	/* representation type of specified default */

+    XtPointer	default_addr;	/* Address of default resource		    */

+} XtResource, *XtResourceList;

+

+typedef void (*XtResourceDefaultProc)(

+    Widget	/* widget */,

+    int		/* offset */,

+    XrmValue*	/* value */

+);

+

+typedef String (*XtLanguageProc)(

+    Display*	/* dpy */,

+    String	/* xnl */,

+    XtPointer	/* client_data */

+);

+

+typedef void (*XtErrorMsgHandler)(

+    String 		/* name */,

+    String		/* type */,

+    String		/* class */,

+    String		/* default */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+typedef void (*XtErrorHandler)(

+  String		/* msg */

+);

+

+typedef void (*XtCreatePopupChildProc)(

+    Widget	/* shell */

+);

+

+typedef Boolean (*XtWorkProc)(

+    XtPointer 		/* closure */	/* data the application registered */

+);

+

+typedef struct {

+    char match;

+    String substitution;

+} SubstitutionRec, *Substitution;

+

+typedef Boolean (*XtFilePredicate)(

+   String /* filename */

+);

+

+typedef XtPointer XtRequestId;

+

+typedef Boolean (*XtConvertSelectionProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */,

+    Atom*		/* target */,

+    Atom*		/* type_return */,

+    XtPointer*		/* value_return */,

+    unsigned long*	/* length_return */,

+    int*		/* format_return */

+);

+

+typedef void (*XtLoseSelectionProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */

+);

+

+typedef void (*XtSelectionDoneProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */,

+    Atom*		/* target */

+);

+

+typedef void (*XtSelectionCallbackProc)(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,

+    Atom*		/* selection */,

+    Atom*		/* type */,

+    XtPointer 		/* value */,

+    unsigned long*	/* length */,

+    int*		/* format */

+);

+

+typedef void (*XtLoseSelectionIncrProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */,

+    XtPointer 		/* client_data */

+);

+

+typedef void (*XtSelectionDoneIncrProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */,

+    Atom*		/* target */,

+    XtRequestId*	/* receiver_id */,

+    XtPointer 		/* client_data */

+);

+

+typedef Boolean (*XtConvertSelectionIncrProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */,

+    Atom*		/* target */,

+    Atom*		/* type */,

+    XtPointer*		/* value */,

+    unsigned long*	/* length */,

+    int*		/* format */,

+    unsigned long*	/* max_length */,

+    XtPointer 		/* client_data */,

+    XtRequestId*	/* receiver_id */

+);

+

+typedef void (*XtCancelConvertSelectionProc)(

+    Widget 		/* widget */,

+    Atom*		/* selection */,

+    Atom*		/* target */,

+    XtRequestId*	/* receiver_id */,

+    XtPointer 		/* client_data */

+);

+

+typedef Boolean (*XtEventDispatchProc)(

+    XEvent*		/* event */

+);

+

+typedef void (*XtExtensionSelectProc)(

+    Widget		/* widget */,

+    int*		/* event_types */,

+    XtPointer*		/* select_data */,

+    int			/* count */,

+    XtPointer		/* client_data */

+);

+

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

+ *

+ * Exported Interfaces

+ *

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

+

+_XFUNCPROTOBEGIN

+

+extern Boolean XtConvertAndStore(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* from_type */,

+    XrmValue*		/* from */,

+    _Xconst _XtString 	/* to_type */,

+    XrmValue*		/* to_in_out */

+);

+

+extern Boolean XtCallConverter(

+    Display*		/* dpy */,

+    XtTypeConverter 	/* converter */,

+    XrmValuePtr 	/* args */,

+    Cardinal 		/* num_args */,

+    XrmValuePtr 	/* from */,

+    XrmValue*		/* to_in_out */,

+    XtCacheRef*		/* cache_ref_return */

+);

+

+extern Boolean XtDispatchEvent(

+    XEvent* 		/* event */

+);

+

+extern Boolean XtCallAcceptFocus(

+    Widget 		/* widget */,

+    Time*		/* time */

+);

+

+extern Boolean XtPeekEvent( /* obsolete */

+    XEvent*		/* event_return */

+);

+

+extern Boolean XtAppPeekEvent(

+    XtAppContext 	/* app_context */,

+    XEvent*		/* event_return */

+);

+

+extern Boolean XtIsSubclass(

+    Widget 		/* widget */,

+    WidgetClass 	/* widgetClass */

+);

+

+extern Boolean XtIsObject(

+    Widget 		/* object */

+);

+

+extern Boolean _XtCheckSubclassFlag( /* implementation-private */

+    Widget		/* object */,

+    _XtXtEnum		/* type_flag */

+);

+

+extern Boolean _XtIsSubclassOf( /* implementation-private */

+    Widget		/* object */,

+    WidgetClass		/* widget_class */,

+    WidgetClass		/* flag_class */,

+    _XtXtEnum		/* type_flag */

+);

+

+extern Boolean XtIsManaged(

+    Widget 		/* rectobj */

+);

+

+extern Boolean XtIsRealized(

+    Widget 		/* widget */

+);

+

+extern Boolean XtIsSensitive(

+    Widget 		/* widget */

+);

+

+extern Boolean XtOwnSelection(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Time 		/* time */,

+    XtConvertSelectionProc /* convert */,

+    XtLoseSelectionProc	/* lose */,

+    XtSelectionDoneProc /* done */

+);

+

+extern Boolean XtOwnSelectionIncremental(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Time 		/* time */,

+    XtConvertSelectionIncrProc	/* convert_callback */,

+    XtLoseSelectionIncrProc	/* lose_callback */,

+    XtSelectionDoneIncrProc	/* done_callback */,

+    XtCancelConvertSelectionProc /* cancel_callback */,

+    XtPointer 		/* client_data */

+);

+

+extern XtGeometryResult XtMakeResizeRequest(

+    Widget 		/* widget */,

+    _XtDimension	/* width */,

+    _XtDimension	/* height */,

+    Dimension*		/* width_return */,

+    Dimension*		/* height_return */

+);

+

+extern void XtTranslateCoords(

+    Widget 		/* widget */,

+    _XtPosition		/* x */,

+    _XtPosition		/* y */,

+    Position*		/* rootx_return */,

+    Position*		/* rooty_return */

+);

+

+extern KeySym* XtGetKeysymTable(

+    Display*		/* dpy */,

+    KeyCode*		/* min_keycode_return */,

+    int*		/* keysyms_per_keycode_return */

+);

+

+extern void XtKeysymToKeycodeList(

+    Display*		/* dpy */,

+    KeySym 		/* keysym */,

+    KeyCode**		/* keycodes_return */,

+    Cardinal*		/* keycount_return */

+);

+

+extern void XtStringConversionWarning( /* obsolete */

+    _Xconst _XtString	/* from_value */,

+    _Xconst _XtString	/* to_type */

+);

+

+extern void XtDisplayStringConversionWarning(

+    Display*	 	/* dpy */,

+    _Xconst _XtString	/* from_value */,

+    _Xconst _XtString	/* to_type */

+);

+

+externalref XtConvertArgRec const colorConvertArgs[];

+externalref XtConvertArgRec const screenConvertArg[];

+

+extern void XtAppAddConverter( /* obsolete */

+    XtAppContext	/* app_context */,

+    _Xconst _XtString	/* from_type */,

+    _Xconst _XtString	/* to_type */,

+    XtConverter 	/* converter */,

+    XtConvertArgList	/* convert_args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtAddConverter( /* obsolete */

+    _Xconst _XtString	/* from_type */,

+    _Xconst _XtString 	/* to_type */,

+    XtConverter 	/* converter */,

+    XtConvertArgList 	/* convert_args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtSetTypeConverter(

+    _Xconst _XtString 	/* from_type */,

+    _Xconst _XtString 	/* to_type */,

+    XtTypeConverter 	/* converter */,

+    XtConvertArgList 	/* convert_args */,

+    Cardinal 		/* num_args */,

+    XtCacheType 	/* cache_type */,

+    XtDestructor 	/* destructor */

+);

+

+extern void XtAppSetTypeConverter(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString 	/* from_type */,

+    _Xconst _XtString 	/* to_type */,

+    XtTypeConverter 	/* converter */,

+    XtConvertArgList 	/* convert_args */,

+    Cardinal 		/* num_args */,

+    XtCacheType 	/* cache_type */,

+    XtDestructor 	/* destructor */

+);

+

+extern void XtConvert( /* obsolete */

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* from_type */,

+    XrmValue*		/* from */,

+    _Xconst _XtString 	/* to_type */,

+    XrmValue*		/* to_return */

+);

+

+extern void XtDirectConvert( /* obsolete */

+    XtConverter 	/* converter */,

+    XrmValuePtr 	/* args */,

+    Cardinal 		/* num_args */,

+    XrmValuePtr 	/* from */,

+    XrmValue*		/* to_return */

+);

+

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

+ *

+ * Translation Management

+ *

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

+

+extern XtTranslations XtParseTranslationTable(

+    _Xconst _XtString	/* table */

+);

+

+extern XtAccelerators XtParseAcceleratorTable(

+    _Xconst _XtString	/* source */

+);

+

+extern void XtOverrideTranslations(

+    Widget 		/* widget */,

+    XtTranslations 	/* translations */

+);

+

+extern void XtAugmentTranslations(

+    Widget 		/* widget */,

+    XtTranslations 	/* translations */

+);

+

+extern void XtInstallAccelerators(

+    Widget 		/* destination */,

+    Widget		/* source */

+);

+

+extern void XtInstallAllAccelerators(

+    Widget 		/* destination */,

+    Widget		/* source */

+);

+

+extern void XtUninstallTranslations(

+    Widget 		/* widget */

+);

+

+extern void XtAppAddActions(

+    XtAppContext 	/* app_context */,

+    XtActionList 	/* actions */,

+    Cardinal 		/* num_actions */

+);

+

+extern void XtAddActions( /* obsolete */

+    XtActionList 	/* actions */,

+    Cardinal 		/* num_actions */

+);

+

+extern XtActionHookId XtAppAddActionHook(

+    XtAppContext 	/* app_context */,

+    XtActionHookProc 	/* proc */,

+    XtPointer 		/* client_data */

+);

+

+extern void XtRemoveActionHook(

+    XtActionHookId 	/* id */

+);

+

+extern void XtGetActionList(

+    WidgetClass		/* widget_class */,

+    XtActionList*	/* actions_return */,

+    Cardinal*		/* num_actions_return */

+);

+

+extern void XtCallActionProc(

+    Widget		/* widget */,

+    _Xconst _XtString	/* action */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal		/* num_params */

+);

+

+extern void XtRegisterGrabAction(

+    XtActionProc 	/* action_proc */,

+    _XtBoolean 		/* owner_events */,

+    unsigned int 	/* event_mask */,

+    int			/* pointer_mode */,

+    int	 		/* keyboard_mode */

+);

+

+extern void XtSetMultiClickTime(

+    Display*		/* dpy */,

+    int 		/* milliseconds */

+);

+

+extern int XtGetMultiClickTime(

+    Display*		/* dpy */

+);

+

+extern KeySym XtGetActionKeysym(

+    XEvent*		/* event */,

+    Modifiers*		/* modifiers_return */

+);

+

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

+ *

+ * Keycode and Keysym procedures for translation management

+ *

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

+

+extern void XtTranslateKeycode(

+    Display*		/* dpy */,

+    _XtKeyCode 		/* keycode */,

+    Modifiers 		/* modifiers */,

+    Modifiers*		/* modifiers_return */,

+    KeySym*		/* keysym_return */

+);

+

+extern void XtTranslateKey(

+    Display*		/* dpy */,

+    _XtKeyCode		/* keycode */,

+    Modifiers		/* modifiers */,

+    Modifiers*		/* modifiers_return */,

+    KeySym*		/* keysym_return */

+);

+

+extern void XtSetKeyTranslator(

+    Display*		/* dpy */,

+    XtKeyProc 		/* proc */

+);

+

+extern void XtRegisterCaseConverter(

+    Display*		/* dpy */,

+    XtCaseProc 		/* proc */,

+    KeySym 		/* start */,

+    KeySym 		/* stop */

+);

+

+extern void XtConvertCase(

+    Display*		/* dpy */,

+    KeySym 		/* keysym */,

+    KeySym*		/* lower_return */,

+    KeySym*		/* upper_return */

+);

+

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

+ *

+ * Event Management

+ *

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

+

+/* XtAllEvents is valid only for XtRemoveEventHandler and

+ * XtRemoveRawEventHandler; don't use it to select events!

+ */

+#define XtAllEvents ((EventMask) -1L)

+

+extern void XtAddEventHandler(

+    Widget 		/* widget */,

+    EventMask 		/* event_mask */,

+    _XtBoolean 		/* nonmaskable */,

+    XtEventHandler 	/* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtRemoveEventHandler(

+    Widget 		/* widget */,

+    EventMask 		/* event_mask */,

+    _XtBoolean 		/* nonmaskable */,

+    XtEventHandler 	/* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtAddRawEventHandler(

+    Widget 		/* widget */,

+    EventMask 		/* event_mask */,

+    _XtBoolean 		/* nonmaskable */,

+    XtEventHandler 	/* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtRemoveRawEventHandler(

+    Widget 		/* widget */,

+    EventMask 		/* event_mask */,

+    _XtBoolean 		/* nonmaskable */,

+    XtEventHandler 	/* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtInsertEventHandler(

+    Widget 		/* widget */,

+    EventMask 		/* event_mask */,

+    _XtBoolean 		/* nonmaskable */,

+    XtEventHandler 	/* proc */,

+    XtPointer 		/* closure */,

+    XtListPosition 	/* position */

+);

+

+extern void XtInsertRawEventHandler(

+    Widget 		/* widget */,

+    EventMask 		/* event_mask */,

+    _XtBoolean 		/* nonmaskable */,

+    XtEventHandler 	/* proc */,

+    XtPointer 		/* closure */,

+    XtListPosition 	/* position */

+);

+

+extern XtEventDispatchProc XtSetEventDispatcher(

+    Display*		/* dpy */,

+    int			/* event_type */,

+    XtEventDispatchProc	/* proc */

+);

+

+extern Boolean XtDispatchEventToWidget(

+    Widget		/* widget */,

+    XEvent*		/* event */

+);

+

+extern void XtInsertEventTypeHandler(

+    Widget		/* widget */,

+    int			/* type */,

+    XtPointer		/* select_data */,

+    XtEventHandler	/* proc */,

+    XtPointer		/* closure */,

+    XtListPosition	/* position */

+);

+

+extern void XtRemoveEventTypeHandler(

+    Widget		/* widget */,

+    int			/* type */,

+    XtPointer		/* select_data */,

+    XtEventHandler	/* proc */,

+    XtPointer		/* closure */

+);

+

+extern EventMask XtBuildEventMask(

+    Widget 		/* widget */

+);

+

+extern void XtRegisterExtensionSelector(

+    Display*		/* dpy */,

+    int			/* min_event_type */,

+    int			/* max_event_type */,

+    XtExtensionSelectProc /* proc */,

+    XtPointer		/* client_data */

+);

+

+extern void XtAddGrab(

+    Widget 		/* widget */,

+    _XtBoolean 		/* exclusive */,

+    _XtBoolean 		/* spring_loaded */

+);

+

+extern void XtRemoveGrab(

+    Widget 		/* widget */

+);

+

+extern void XtProcessEvent( /* obsolete */

+    XtInputMask 		/* mask */

+);

+

+extern void XtAppProcessEvent(

+    XtAppContext 		/* app_context */,

+    XtInputMask 		/* mask */

+);

+

+extern void XtMainLoop( /* obsolete */

+    void

+);

+

+extern void XtAppMainLoop(

+    XtAppContext 		/* app_context */

+);

+

+extern void XtAddExposureToRegion(

+    XEvent*		/* event */,

+    Region 		/* region */

+);

+

+extern void XtSetKeyboardFocus(

+    Widget		/* subtree */,

+    Widget 		/* descendent */

+);

+

+extern Widget XtGetKeyboardFocusWidget(

+    Widget		/* widget */

+);

+

+extern XEvent* XtLastEventProcessed(

+    Display*		/* dpy */

+);

+

+extern Time XtLastTimestampProcessed(

+    Display*		/* dpy */

+);

+

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

+ *

+ * Event Gathering Routines

+ *

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

+

+extern XtIntervalId XtAddTimeOut( /* obsolete */

+    unsigned long 	/* interval */,

+    XtTimerCallbackProc /* proc */,

+    XtPointer 		/* closure */

+);

+

+extern XtIntervalId XtAppAddTimeOut(

+    XtAppContext 	/* app_context */,

+    unsigned long 	/* interval */,

+    XtTimerCallbackProc /* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtRemoveTimeOut(

+    XtIntervalId 	/* timer */

+);

+

+extern XtInputId XtAddInput( /* obsolete */

+    int 		/* source */,

+    XtPointer 		/* condition */,

+    XtInputCallbackProc /* proc */,

+    XtPointer 		/* closure */

+);

+

+extern XtInputId XtAppAddInput(

+    XtAppContext       	/* app_context */,

+    int 		/* source */,

+    XtPointer 		/* condition */,

+    XtInputCallbackProc /* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtRemoveInput(

+    XtInputId 		/* id */

+);

+

+extern XtSignalId XtAddSignal(

+    XtSignalCallbackProc /* proc */,

+    XtPointer		/* closure */);

+

+extern XtSignalId XtAppAddSignal(

+    XtAppContext       	/* app_context */,

+    XtSignalCallbackProc /* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void XtRemoveSignal(

+    XtSignalId 		/* id */

+);

+

+extern void XtNoticeSignal(

+    XtSignalId		/* id */

+);

+

+extern void XtNextEvent( /* obsolete */

+    XEvent* 		/* event */

+);

+

+extern void XtAppNextEvent(

+    XtAppContext 	/* app_context */,

+    XEvent*		/* event_return */

+);

+

+#define XtIMXEvent		1

+#define XtIMTimer		2

+#define XtIMAlternateInput	4

+#define XtIMSignal		8

+#define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal)

+

+extern Boolean XtPending( /* obsolete */

+    void

+);

+

+extern XtInputMask XtAppPending(

+    XtAppContext 	/* app_context */

+);

+

+extern XtBlockHookId XtAppAddBlockHook(

+    XtAppContext 	/* app_context */,

+    XtBlockHookProc 	/* proc */,

+    XtPointer 		/* client_data */

+);

+

+extern void XtRemoveBlockHook(

+    XtBlockHookId 	/* id */

+);

+

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

+ *

+ * Random utility routines

+ *

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

+

+#define XtIsRectObj(object)	(_XtCheckSubclassFlag(object, (XtEnum)0x02))

+#define XtIsWidget(object)	(_XtCheckSubclassFlag(object, (XtEnum)0x04))

+#define XtIsComposite(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x08))

+#define XtIsConstraint(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x10))

+#define XtIsShell(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x20))

+

+#undef XtIsOverrideShell

+extern Boolean XtIsOverrideShell(Widget /* object */);

+#define XtIsOverrideShell(widget) \

+    (_XtIsSubclassOf(widget, (WidgetClass)overrideShellWidgetClass, \

+		     (WidgetClass)shellWidgetClass, (XtEnum)0x20))

+

+#define XtIsWMShell(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x40))

+

+#undef XtIsVendorShell

+extern Boolean XtIsVendorShell(Widget /* object */);

+#define XtIsVendorShell(widget)	\

+    (_XtIsSubclassOf(widget, (WidgetClass)vendorShellWidgetClass, \

+		     (WidgetClass)wmShellWidgetClass, (XtEnum)0x40))

+

+#undef XtIsTransientShell

+extern Boolean XtIsTransientShell(Widget /* object */);

+#define XtIsTransientShell(widget) \

+    (_XtIsSubclassOf(widget, (WidgetClass)transientShellWidgetClass, \

+		     (WidgetClass)wmShellWidgetClass, (XtEnum)0x40))

+#define XtIsTopLevelShell(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x80))

+

+#undef XtIsApplicationShell

+extern Boolean XtIsApplicationShell(Widget /* object */);

+#define XtIsApplicationShell(widget) \

+    (_XtIsSubclassOf(widget, (WidgetClass)applicationShellWidgetClass, \

+		     (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80))

+

+#undef XtIsSessionShell

+extern Boolean XtIsSessionShell(Widget /* object */);

+#define XtIsSessionShell(widget) \

+    (_XtIsSubclassOf(widget, (WidgetClass)sessionShellWidgetClass, \

+		     (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80))

+

+extern void XtRealizeWidget(

+    Widget 		/* widget */

+);

+

+void XtUnrealizeWidget(

+    Widget 		/* widget */

+);

+

+extern void XtDestroyWidget(

+    Widget 		/* widget */

+);

+

+extern void XtSetSensitive(

+    Widget 		/* widget */,

+    _XtBoolean 		/* sensitive */

+);

+

+extern void XtSetMappedWhenManaged(

+    Widget 		/* widget */,

+    _XtBoolean 		/* mapped_when_managed */

+);

+

+extern Widget XtNameToWidget(

+    Widget 		/* reference */,

+    _Xconst _XtString	/* names */

+);

+

+extern Widget XtWindowToWidget(

+    Display*		/* display */,

+    Window 		/* window */

+);

+

+extern XtPointer XtGetClassExtension(

+    WidgetClass		/* object_class */,

+    Cardinal		/* byte_offset */,

+    XrmQuark		/* type */,

+    long		/* version */,

+    Cardinal		/* record_size */

+);

+

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

+ *

+ * Arg lists

+ *

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

+

+

+#define XtSetArg(arg, n, d) \

+    ((void)( (arg).name = (n), (arg).value = (XtArgVal)(d) ))

+

+extern ArgList XtMergeArgLists(

+    ArgList 		/* args1 */,

+    Cardinal 		/* num_args1 */,

+    ArgList 		/* args2 */,

+    Cardinal 		/* num_args2 */

+);

+

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

+ *

+ * Vararg lists

+ *

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

+

+#define XtVaNestedList  "XtVaNestedList"

+#define XtVaTypedArg    "XtVaTypedArg"

+

+extern XtVarArgsList XtVaCreateArgsList(

+    XtPointer		/*unused*/, ...

+) _X_SENTINEL(0);

+

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

+ *

+ * Information routines

+ *

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

+

+#ifndef _XtIntrinsicP_h

+

+/* We're not included from the private file, so define these */

+

+extern Display *XtDisplay(

+    Widget 		/* widget */

+);

+

+extern Display *XtDisplayOfObject(

+    Widget 		/* object */

+);

+

+extern Screen *XtScreen(

+    Widget 		/* widget */

+);

+

+extern Screen *XtScreenOfObject(

+    Widget 		/* object */

+);

+

+extern Window XtWindow(

+    Widget 		/* widget */

+);

+

+extern Window XtWindowOfObject(

+    Widget 		/* object */

+);

+

+extern String XtName(

+    Widget 		/* object */

+);

+

+extern WidgetClass XtSuperclass(

+    Widget 		/* object */

+);

+

+extern WidgetClass XtClass(

+    Widget 		/* object */

+);

+

+extern Widget XtParent(

+    Widget 		/* widget */

+);

+

+#endif /*_XtIntrinsicP_h*/

+

+#undef XtMapWidget

+extern void XtMapWidget(Widget /* w */);

+#define XtMapWidget(widget)	XMapWindow(XtDisplay(widget), XtWindow(widget))

+

+#undef XtUnmapWidget

+extern void XtUnmapWidget(Widget /* w */);

+#define XtUnmapWidget(widget)	\

+		XUnmapWindow(XtDisplay(widget), XtWindow(widget))

+

+extern void XtAddCallback(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* callback_name */,

+    XtCallbackProc 	/* callback */,

+    XtPointer 		/* closure */

+);

+

+extern void XtRemoveCallback(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* callback_name */,

+    XtCallbackProc 	/* callback */,

+    XtPointer 		/* closure */

+);

+

+extern void XtAddCallbacks(

+    Widget 		/* widget */,

+    _Xconst _XtString	/* callback_name */,

+    XtCallbackList 	/* callbacks */

+);

+

+extern void XtRemoveCallbacks(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* callback_name */,

+    XtCallbackList 	/* callbacks */

+);

+

+extern void XtRemoveAllCallbacks(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* callback_name */

+);

+

+

+extern void XtCallCallbacks(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* callback_name */,

+    XtPointer 		/* call_data */

+);

+

+extern void XtCallCallbackList(

+    Widget		/* widget */,

+    XtCallbackList 	/* callbacks */,

+    XtPointer 		/* call_data */

+);

+

+extern XtCallbackStatus XtHasCallbacks(

+    Widget 		/* widget */,

+    _Xconst _XtString 	/* callback_name */

+);

+

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

+ *

+ * Geometry Management

+ *

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

+

+

+extern XtGeometryResult XtMakeGeometryRequest(

+    Widget 		/* widget */,

+    XtWidgetGeometry*	/* request */,

+    XtWidgetGeometry*	/* reply_return */

+);

+

+extern XtGeometryResult XtQueryGeometry(

+    Widget 		/* widget */,

+    XtWidgetGeometry*	/* intended */,

+    XtWidgetGeometry*	/* preferred_return */

+);

+

+extern Widget XtCreatePopupShell(

+    _Xconst _XtString	/* name */,

+    WidgetClass 	/* widgetClass */,

+    Widget 		/* parent */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtVaCreatePopupShell(

+    _Xconst _XtString	/* name */,

+    WidgetClass		/* widgetClass */,

+    Widget		/* parent */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtPopup(

+    Widget 		/* popup_shell */,

+    XtGrabKind 		/* grab_kind */

+);

+

+extern void XtPopupSpringLoaded(

+    Widget 		/* popup_shell */

+);

+

+extern void XtCallbackNone(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,

+    XtPointer 		/* call_data */

+);

+

+extern void XtCallbackNonexclusive(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,

+    XtPointer 		/* call_data */

+);

+

+extern void XtCallbackExclusive(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,

+    XtPointer 		/* call_data */

+);

+

+extern void XtPopdown(

+    Widget 		/* popup_shell */

+);

+

+extern void XtCallbackPopdown(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,

+    XtPointer 		/* call_data */

+);

+

+extern void XtMenuPopupAction(

+    Widget 		/* widget */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern Widget XtCreateWidget(

+    _Xconst _XtString 	/* name */,

+    WidgetClass 	/* widget_class */,

+    Widget 		/* parent */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtCreateManagedWidget(

+    _Xconst _XtString 	/* name */,

+    WidgetClass 	/* widget_class */,

+    Widget 		/* parent */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtVaCreateWidget(

+    _Xconst _XtString	/* name */,

+    WidgetClass		/* widget */,

+    Widget		/* parent */,

+    ...

+) _X_SENTINEL(0);

+

+extern Widget XtVaCreateManagedWidget(

+    _Xconst _XtString	/* name */,

+    WidgetClass		/* widget_class */,

+    Widget		/* parent */,

+    ...

+) _X_SENTINEL(0);

+

+extern Widget XtCreateApplicationShell( /* obsolete */

+    _Xconst _XtString 	/* name */,

+    WidgetClass 	/* widget_class */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtAppCreateShell(

+    _Xconst _XtString	/* application_name */,

+    _Xconst _XtString	/* application_class */,

+    WidgetClass 	/* widget_class */,

+    Display*		/* display */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtVaAppCreateShell(

+    _Xconst _XtString	/* application_name */,

+    _Xconst _XtString	/* application_class */,

+    WidgetClass		/* widget_class */,

+    Display*		/* display */,

+    ...

+) _X_SENTINEL(0);

+

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

+ *

+ * Toolkit initialization

+ *

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

+

+extern void XtToolkitInitialize(

+    void

+);

+

+extern XtLanguageProc XtSetLanguageProc(

+    XtAppContext	/* app_context */,

+    XtLanguageProc	/* proc */,

+    XtPointer		/* client_data */

+);

+

+extern void XtDisplayInitialize(

+    XtAppContext 	/* app_context */,

+    Display*		/* dpy */,

+    _Xconst _XtString	/* application_name */,

+    _Xconst _XtString	/* application_class */,

+    XrmOptionDescRec* 	/* options */,

+    Cardinal 		/* num_options */,

+    int*		/* argc */,

+    char**		/* argv */

+);

+

+extern Widget XtOpenApplication(

+    XtAppContext*	/* app_context_return */,

+    _Xconst _XtString	/* application_class */,

+    XrmOptionDescList 	/* options */,

+    Cardinal 		/* num_options */,

+    int*		/* argc_in_out */,

+    String*		/* argv_in_out */,

+    String*		/* fallback_resources */,

+    WidgetClass		/* widget_class */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtVaOpenApplication(

+    XtAppContext*	/* app_context_return */,

+    _Xconst _XtString	/* application_class */,

+    XrmOptionDescList	/* options */,

+    Cardinal		/* num_options */,

+    int*		/* argc_in_out */,

+    String*		/* argv_in_out */,

+    String*		/* fallback_resources */,

+    WidgetClass		/* widget_class */,

+    ...

+) _X_SENTINEL(0);

+

+extern Widget XtAppInitialize( /* obsolete */

+    XtAppContext*	/* app_context_return */,

+    _Xconst _XtString	/* application_class */,

+    XrmOptionDescList 	/* options */,

+    Cardinal 		/* num_options */,

+    int*		/* argc_in_out */,

+    String*		/* argv_in_out */,

+    String*		/* fallback_resources */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern Widget XtVaAppInitialize( /* obsolete */

+    XtAppContext*	/* app_context_return */,

+    _Xconst _XtString	/* application_class */,

+    XrmOptionDescList	/* options */,

+    Cardinal		/* num_options */,

+    int*		/* argc_in_out */,

+    String*		/* argv_in_out */,

+    String*		/* fallback_resources */,

+    ...

+) _X_SENTINEL(0);

+

+extern Widget XtInitialize( /* obsolete */

+    _Xconst _XtString 	/* shell_name */,

+    _Xconst _XtString 	/* application_class */,

+    XrmOptionDescRec* 	/* options */,

+    Cardinal 		/* num_options */,

+    int*		/* argc */,

+    char**		/* argv */

+);

+

+extern Display *XtOpenDisplay(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString	/* display_string */,

+    _Xconst _XtString	/* application_name */,

+    _Xconst _XtString	/* application_class */,

+    XrmOptionDescRec*	/* options */,

+    Cardinal 		/* num_options */,

+    int*		/* argc */,

+    char**		/* argv */

+);

+

+extern XtAppContext XtCreateApplicationContext(

+    void

+);

+

+extern void XtAppSetFallbackResources(

+    XtAppContext 	/* app_context */,

+    String*		/* specification_list */

+);

+

+extern void XtDestroyApplicationContext(

+    XtAppContext 	/* app_context */

+);

+

+extern void XtInitializeWidgetClass(

+    WidgetClass 	/* widget_class */

+);

+

+extern XtAppContext XtWidgetToApplicationContext(

+    Widget 		/* widget */

+);

+

+extern XtAppContext XtDisplayToApplicationContext(

+    Display*		/* dpy */

+);

+

+extern XrmDatabase XtDatabase(

+    Display*		/* dpy */

+);

+

+extern XrmDatabase XtScreenDatabase(

+    Screen*		/* screen */

+);

+

+extern void XtCloseDisplay(

+    Display*		/* dpy */

+);

+

+extern void XtGetApplicationResources(

+    Widget 		/* widget */,

+    XtPointer 		/* base */,

+    XtResourceList 	/* resources */,

+    Cardinal 		/* num_resources */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtVaGetApplicationResources(

+    Widget		/* widget */,

+    XtPointer		/* base */,

+    XtResourceList	/* resources */,

+    Cardinal		/* num_resources */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtGetSubresources(

+    Widget 		/* widget */,

+    XtPointer 		/* base */,

+    _Xconst _XtString 	/* name */,

+    _Xconst _XtString 	/* class */,

+    XtResourceList 	/* resources */,

+    Cardinal 		/* num_resources */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtVaGetSubresources(

+    Widget		/* widget */,

+    XtPointer		/* base */,

+    _Xconst _XtString	/* name */,

+    _Xconst _XtString	/* class */,

+    XtResourceList	/* resources */,

+    Cardinal		/* num_resources */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtSetValues(

+    Widget 		/* widget */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtVaSetValues(

+    Widget		/* widget */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtGetValues(

+    Widget 		/* widget */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtVaGetValues(

+    Widget		/* widget */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtSetSubvalues(

+    XtPointer 		/* base */,

+    XtResourceList 	/* resources */,

+    Cardinal 		/* num_resources */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtVaSetSubvalues(

+    XtPointer		/* base */,

+    XtResourceList	/* resources */,

+    Cardinal		/* num_resources */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtGetSubvalues(

+    XtPointer 		/* base */,

+    XtResourceList 	/* resources */,

+    Cardinal 		/* num_resources */,

+    ArgList 		/* args */,

+    Cardinal 		/* num_args */

+);

+

+extern void XtVaGetSubvalues(

+    XtPointer		/* base */,

+    XtResourceList	/* resources */,

+    Cardinal		/* num_resources */,

+    ...

+) _X_SENTINEL(0);

+

+extern void XtGetResourceList(

+    WidgetClass 	/* widget_class */,

+    XtResourceList*	/* resources_return */,

+    Cardinal*		/* num_resources_return */

+);

+

+extern void XtGetConstraintResourceList(

+    WidgetClass 	/* widget_class */,

+    XtResourceList*	/* resources_return */,

+    Cardinal*		/* num_resources_return */

+);

+

+#define XtUnspecifiedPixmap	((Pixmap)2)

+#define XtUnspecifiedShellInt	(-1)

+#define XtUnspecifiedWindow	((Window)2)

+#define XtUnspecifiedWindowGroup ((Window)3)

+#define XtCurrentDirectory	"XtCurrentDirectory"

+#define XtDefaultForeground	"XtDefaultForeground"

+#define XtDefaultBackground	"XtDefaultBackground"

+#define XtDefaultFont		"XtDefaultFont"

+#define XtDefaultFontSet	"XtDefaultFontSet"

+

+#if defined(CRAY)

+#define XtOffset(p_type,field) _Offsetof(p_type,field)

+#else	/* ! CRAY */

+#define XtOffset(p_type,field) \

+	((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))

+#endif /* !CRAY */

+

+#ifdef offsetof

+#define XtOffsetOf(s_type,field) offsetof(s_type,field)

+#else

+#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)

+#endif

+

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

+ *

+ * Session Management

+ *

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

+

+typedef struct _XtCheckpointTokenRec {

+    int		save_type;

+    int		interact_style;

+    Boolean	shutdown;

+    Boolean	fast;

+    Boolean	cancel_shutdown;

+    int		phase;

+    int		interact_dialog_type;	/* return */

+    Boolean	request_cancel;		/* return */

+    Boolean	request_next_phase;	/* return */

+    Boolean	save_success;		/* return */

+    int		type;		/* implementation private */

+    Widget	widget;		/* implementation private */

+} XtCheckpointTokenRec, *XtCheckpointToken;

+

+XtCheckpointToken XtSessionGetToken(

+    Widget		/* widget */

+);

+

+void XtSessionReturnToken(

+    XtCheckpointToken	/* token */

+);

+

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

+ *

+ * Error Handling

+ *

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

+

+extern XtErrorMsgHandler XtAppSetErrorMsgHandler(

+    XtAppContext 	/* app_context */,

+    XtErrorMsgHandler 	/* handler */

+);

+

+extern void XtSetErrorMsgHandler( /* obsolete */

+    XtErrorMsgHandler 	/* handler */

+);

+

+extern XtErrorMsgHandler XtAppSetWarningMsgHandler(

+    XtAppContext 	/* app_context */,

+    XtErrorMsgHandler 	/* handler */

+);

+

+extern void XtSetWarningMsgHandler( /* obsolete */

+    XtErrorMsgHandler 	/* handler */

+);

+

+extern void XtAppErrorMsg(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString 	/* name */,

+    _Xconst _XtString	/* type */,

+    _Xconst _XtString	/* class */,

+    _Xconst _XtString	/* default */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern void XtErrorMsg( /* obsolete */

+    _Xconst _XtString 	/* name */,

+    _Xconst _XtString	/* type */,

+    _Xconst _XtString	/* class */,

+    _Xconst _XtString	/* default */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern void XtAppWarningMsg(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString 	/* name */,

+    _Xconst _XtString 	/* type */,

+    _Xconst _XtString 	/* class */,

+    _Xconst _XtString 	/* default */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern void XtWarningMsg( /* obsolete */

+    _Xconst _XtString	/* name */,

+    _Xconst _XtString	/* type */,

+    _Xconst _XtString	/* class */,

+    _Xconst _XtString	/* default */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern XtErrorHandler XtAppSetErrorHandler(

+    XtAppContext 	/* app_context */,

+    XtErrorHandler 	/* handler */

+);

+

+extern void XtSetErrorHandler( /* obsolete */

+    XtErrorHandler 	/* handler */

+);

+

+extern XtErrorHandler XtAppSetWarningHandler(

+    XtAppContext 	/* app_context */,

+    XtErrorHandler 	/* handler */

+);

+

+extern void XtSetWarningHandler( /* obsolete */

+    XtErrorHandler 	/* handler */

+);

+

+extern void XtAppError(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString	/* message */

+);

+

+extern void XtError( /* obsolete */

+    _Xconst _XtString	/* message */

+);

+

+extern void XtAppWarning(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString	/* message */

+);

+

+extern void XtWarning( /* obsolete */

+    _Xconst _XtString	/* message */

+);

+

+extern XrmDatabase *XtAppGetErrorDatabase(

+    XtAppContext 	/* app_context */

+);

+

+extern XrmDatabase *XtGetErrorDatabase( /* obsolete */

+    void

+);

+

+extern void XtAppGetErrorDatabaseText(

+    XtAppContext 	/* app_context */,

+    _Xconst _XtString	/* name */,

+    _Xconst _XtString	/* type */,

+    _Xconst _XtString	/* class */,

+    _Xconst _XtString 	/* default */,

+    String 		/* buffer_return */,

+    int 		/* nbytes */,

+    XrmDatabase 	/* database */

+);

+

+extern void XtGetErrorDatabaseText( /* obsolete */

+    _Xconst _XtString	/* name */,

+    _Xconst _XtString	/* type */,

+    _Xconst _XtString	/* class */,

+    _Xconst _XtString 	/* default */,

+    String 		/* buffer_return */,

+    int 		/* nbytes */

+);

+

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

+ *

+ * Memory Management

+ *

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

+

+extern char *XtMalloc(

+    Cardinal 		/* size */

+);

+

+extern char *XtCalloc(

+    Cardinal		/* num */,

+    Cardinal 		/* size */

+);

+

+extern char *XtRealloc(

+    char* 		/* ptr */,

+    Cardinal 		/* num */

+);

+

+extern void XtFree(

+    char*		/* ptr */

+);

+

+#ifndef _X_RESTRICT_KYWD

+# define _X_RESTRICT_KYWD

+#endif

+extern Cardinal XtAsprintf(

+    String *new_string,

+    _Xconst char * _X_RESTRICT_KYWD format,

+    ...

+) _X_ATTRIBUTE_PRINTF(2,3);

+

+#ifdef XTTRACEMEMORY

+

+extern char *_XtMalloc( /* implementation-private */

+    Cardinal	/* size */,

+    char *	/* file */,

+    int	        /* line */

+);

+

+extern char *_XtRealloc( /* implementation-private */

+    char *	/* ptr */,

+    Cardinal    /* size */,

+    char *	/* file */,

+    int		/* line */

+);

+

+extern char *_XtCalloc( /* implementation-private */

+    Cardinal	/* num */,

+    Cardinal 	/* size */,

+    char *	/* file */,

+    int		/* line */

+);

+

+extern void _XtFree( /* implementation-private */

+    char *	/* ptr */

+);

+

+#define XtMalloc(size) _XtMalloc(size, __FILE__, __LINE__)

+#define XtRealloc(ptr,size) _XtRealloc(ptr, size, __FILE__, __LINE__)

+#define XtCalloc(num,size) _XtCalloc(num, size, __FILE__, __LINE__)

+#define XtFree(ptr) _XtFree(ptr)

+

+#endif /* ifdef XTTRACEMEMORY */

+

+#define XtNew(type) ((type *) XtMalloc((unsigned) sizeof(type)))

+

+#undef XtNewString

+extern String XtNewString(String /* str */);

+#define XtNewString(str) \

+    ((str) != NULL ? (strcpy(XtMalloc((unsigned)strlen(str) + 1), str)) : NULL)

+

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

+ *

+ *  Work procs

+ *

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

+

+extern XtWorkProcId XtAddWorkProc( /* obsolete */

+    XtWorkProc 		/* proc */,

+    XtPointer 		/* closure */

+);

+

+extern XtWorkProcId XtAppAddWorkProc(

+    XtAppContext 	/* app_context */,

+    XtWorkProc 		/* proc */,

+    XtPointer 		/* closure */

+);

+

+extern void  XtRemoveWorkProc(

+    XtWorkProcId 	/* id */

+);

+

+

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

+ *

+ * Graphic Context Management

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

+

+extern GC XtGetGC(

+    Widget 		/* widget */,

+    XtGCMask 		/* valueMask */,

+    XGCValues* 		/* values */

+);

+

+extern GC XtAllocateGC(

+    Widget 		/* widget */,

+    Cardinal		/* depth */,

+    XtGCMask 		/* valueMask */,

+    XGCValues* 		/* values */,

+    XtGCMask		/* dynamicMask */,

+    XtGCMask		/* unusedMask */

+);

+

+/* This implementation of XtDestroyGC differs from the formal specification

+ * for historic backwards compatibility reasons.  As other implementations

+ * may conform to the spec, use of XtReleaseGC is strongly encouraged.

+ */

+extern void XtDestroyGC( /* obsolete */

+    GC 			/* gc */

+);

+

+extern void XtReleaseGC(

+    Widget 		/* object */,

+    GC 			/* gc */

+);

+

+

+

+extern void XtAppReleaseCacheRefs(

+    XtAppContext	/* app_context */,

+    XtCacheRef*		/* cache_ref */

+);

+

+extern void XtCallbackReleaseCacheRef(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,	/* XtCacheRef */

+    XtPointer 		/* call_data */

+);

+

+extern void XtCallbackReleaseCacheRefList(

+    Widget 		/* widget */,

+    XtPointer 		/* closure */,	/* XtCacheRef* */

+    XtPointer 		/* call_data */

+);

+

+extern void XtSetWMColormapWindows(

+    Widget 		/* widget */,

+    Widget*		/* list */,

+    Cardinal		/* count */

+);

+

+extern String XtFindFile(

+    _Xconst _XtString	/* path */,

+    Substitution	/* substitutions */,

+    Cardinal 		/* num_substitutions */,

+    XtFilePredicate	/* predicate */

+);

+

+extern String XtResolvePathname(

+    Display*		/* dpy */,

+    _Xconst _XtString	/* type */,

+    _Xconst _XtString	/* filename */,

+    _Xconst _XtString	/* suffix */,

+    _Xconst _XtString	/* path */,

+    Substitution	/* substitutions */,

+    Cardinal		/* num_substitutions */,

+    XtFilePredicate 	/* predicate */

+);

+

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

+ *

+ * Selections

+ *

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

+

+#define XT_CONVERT_FAIL (Atom)0x80000001

+

+extern void XtDisownSelection(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Time 		/* time */

+);

+

+extern void XtGetSelectionValue(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Atom 		/* target */,

+    XtSelectionCallbackProc /* callback */,

+    XtPointer 		/* closure */,

+    Time 		/* time */

+);

+

+extern void XtGetSelectionValues(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Atom*		/* targets */,

+    int 		/* count */,

+    XtSelectionCallbackProc /* callback */,

+    XtPointer*		/* closures */,

+    Time 		/* time */

+);

+

+extern void XtAppSetSelectionTimeout(

+    XtAppContext 	/* app_context */,

+    unsigned long 	/* timeout */

+);

+

+extern void XtSetSelectionTimeout( /* obsolete */

+    unsigned long 	/* timeout */

+);

+

+extern unsigned long XtAppGetSelectionTimeout(

+    XtAppContext 	/* app_context */

+);

+

+extern unsigned long XtGetSelectionTimeout( /* obsolete */

+    void

+);

+

+extern XSelectionRequestEvent *XtGetSelectionRequest(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    XtRequestId 	/* request_id */

+);

+

+extern void XtGetSelectionValueIncremental(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Atom 		/* target */,

+    XtSelectionCallbackProc /* selection_callback */,

+    XtPointer 		/* client_data */,

+    Time 		/* time */

+);

+

+extern void XtGetSelectionValuesIncremental(

+    Widget 		/* widget */,

+    Atom 		/* selection */,

+    Atom*		/* targets */,

+    int 		/* count */,

+    XtSelectionCallbackProc /* callback */,

+    XtPointer*		/* client_data */,

+    Time 		/* time */

+);

+

+extern void XtSetSelectionParameters(

+    Widget		/* requestor */,

+    Atom		/* selection */,

+    Atom		/* type */,

+    XtPointer		/* value */,

+    unsigned long	/* length */,

+    int			/* format */

+);

+

+extern void XtGetSelectionParameters(

+    Widget		/* owner */,

+    Atom		/* selection */,

+    XtRequestId		/* request_id */,

+    Atom*		/* type_return */,

+    XtPointer*		/* value_return */,

+    unsigned long*	/* length_return */,

+    int*		/* format_return */

+);

+

+extern void XtCreateSelectionRequest(

+    Widget		/* requestor */,

+    Atom		/* selection */

+);

+

+extern void XtSendSelectionRequest(

+    Widget		/* requestor */,

+    Atom		/* selection */,

+    Time		/* time */

+);

+

+extern void XtCancelSelectionRequest(

+    Widget		/* requestor */,

+    Atom		/* selection */

+);

+

+extern Atom XtReservePropertyAtom(

+    Widget		/* widget */

+);

+

+extern void XtReleasePropertyAtom(

+    Widget		/* widget */,

+    Atom		/* selection */

+);

+

+extern void XtGrabKey(

+    Widget 		/* widget */,

+    _XtKeyCode 		/* keycode */,

+    Modifiers	 	/* modifiers */,

+    _XtBoolean 		/* owner_events */,

+    int 		/* pointer_mode */,

+    int 		/* keyboard_mode */

+);

+

+extern void XtUngrabKey(

+    Widget 		/* widget */,

+    _XtKeyCode 		/* keycode */,

+    Modifiers	 	/* modifiers */

+);

+

+extern int XtGrabKeyboard(

+    Widget 		/* widget */,

+    _XtBoolean 		/* owner_events */,

+    int 		/* pointer_mode */,

+    int 		/* keyboard_mode */,

+    Time 		/* time */

+);

+

+extern void XtUngrabKeyboard(

+    Widget 		/* widget */,

+    Time 		/* time */

+);

+

+extern void XtGrabButton(

+    Widget 		/* widget */,

+    int 		/* button */,

+    Modifiers	 	/* modifiers */,

+    _XtBoolean 		/* owner_events */,

+    unsigned int	/* event_mask */,

+    int 		/* pointer_mode */,

+    int 		/* keyboard_mode */,

+    Window 		/* confine_to */,

+    Cursor 		/* cursor */

+);

+

+extern void XtUngrabButton(

+    Widget 		/* widget */,

+    unsigned int	/* button */,

+    Modifiers	 	/* modifiers */

+);

+

+extern int XtGrabPointer(

+    Widget 		/* widget */,

+    _XtBoolean 		/* owner_events */,

+    unsigned int	/* event_mask */,

+    int 		/* pointer_mode */,

+    int 		/* keyboard_mode */,

+    Window 		/* confine_to */,

+    Cursor 		/* cursor */,

+    Time 		/* time */

+);

+

+extern void XtUngrabPointer(

+    Widget 		/* widget */,

+    Time 		/* time */

+);

+

+extern void XtGetApplicationNameAndClass(

+    Display*		/* dpy */,

+    String*		/* name_return */,

+    String*		/* class_return */

+);

+

+extern void XtRegisterDrawable(

+    Display*		/* dpy */,

+    Drawable		/* drawable */,

+    Widget		/* widget */

+);

+

+extern void XtUnregisterDrawable(

+    Display*		/* dpy */,

+    Drawable		/* drawable */

+);

+

+extern Widget XtHooksOfDisplay(

+    Display*		/* dpy */

+);

+

+typedef struct {

+    String type;

+    Widget widget;

+    ArgList args;

+    Cardinal num_args;

+} XtCreateHookDataRec, *XtCreateHookData;

+

+typedef struct {

+    String type;

+    Widget widget;

+    XtPointer event_data;

+    Cardinal num_event_data;

+} XtChangeHookDataRec, *XtChangeHookData;

+

+typedef struct {

+    Widget old, req;

+    ArgList args;

+    Cardinal num_args;

+} XtChangeHookSetValuesDataRec, *XtChangeHookSetValuesData;

+

+typedef struct {

+    String type;

+    Widget widget;

+    XtGeometryMask changeMask;

+    XWindowChanges changes;

+} XtConfigureHookDataRec, *XtConfigureHookData;

+

+typedef struct {

+    String type;

+    Widget widget;

+    XtWidgetGeometry* request;

+    XtWidgetGeometry* reply;

+    XtGeometryResult result;

+} XtGeometryHookDataRec, *XtGeometryHookData;

+

+typedef struct {

+    String type;

+    Widget widget;

+} XtDestroyHookDataRec, *XtDestroyHookData;

+

+extern void XtGetDisplays(

+    XtAppContext	/* app_context */,

+    Display***		/* dpy_return */,

+    Cardinal*		/* num_dpy_return */

+);

+

+extern Boolean XtToolkitThreadInitialize(

+    void

+);

+

+extern void XtAppSetExitFlag(

+    XtAppContext	/* app_context */

+);

+

+extern Boolean XtAppGetExitFlag(

+    XtAppContext	/* app_context */

+);

+

+extern void XtAppLock(

+    XtAppContext	/* app_context */

+);

+

+extern void XtAppUnlock(

+    XtAppContext	/* app_context */

+);

+

+/*

+ *	Predefined Resource Converters

+ */

+

+

+/* String converters */

+

+extern Boolean XtCvtStringToAcceleratorTable(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToAtom(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Display */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToBool(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToBoolean(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToCommandArgArray(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToCursor(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Display */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToDimension(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToDirectoryString(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToDisplay(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToFile(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToFloat(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToFont(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Display */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToFontSet(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Display, locale */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToFontStruct(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Display */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToGravity(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToInitialState(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToInt(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToPixel(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Screen, Colormap */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+#define XtCvtStringToPosition XtCvtStringToShort

+

+extern Boolean XtCvtStringToRestartStyle(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToShort(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToTranslationTable(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToUnsignedChar(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtStringToVisual(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Screen, depth */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+/* int converters */

+

+extern Boolean XtCvtIntToBool(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtIntToBoolean(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtIntToColor(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* Screen, Colormap */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+#define XtCvtIntToDimension XtCvtIntToShort

+

+extern Boolean XtCvtIntToFloat(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtIntToFont(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtIntToPixel(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtIntToPixmap(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+#define XtCvtIntToPosition XtCvtIntToShort

+

+extern Boolean XtCvtIntToShort(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+extern Boolean XtCvtIntToUnsignedChar(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+/* Color converter */

+

+extern Boolean XtCvtColorToPixel(

+    Display*	/* dpy */,

+    XrmValuePtr /* args */,	/* none */

+    Cardinal*   /* num_args */,

+    XrmValuePtr	/* fromVal */,

+    XrmValuePtr	/* toVal */,

+    XtPointer*	/* closure_ret */

+);

+

+/* Pixel converter */

+

+#define XtCvtPixelToColor XtCvtIntToColor

+

+

+_XFUNCPROTOEND

+

+#endif /*_XtIntrinsic_h*/

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/IntrinsicI.h b/X11/IntrinsicI.h
index d88166fc3..5f852388a 100644
--- a/X11/IntrinsicI.h
+++ b/X11/IntrinsicI.h
@@ -1,265 +1,229 @@
-/* $Xorg: IntrinsicI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.8 2001/12/14 19:56:25 dawes Exp $ */
-
-#ifndef _XtintrinsicI_h
-#define _XtintrinsicI_h
-
-#include "Xtos.h"
-#include "IntrinsicP.h"
-#ifdef WIN32
-#define _WILLWINSOCK_
-#endif
-#include <X11/Xos.h>
-
-#include "Object.h"
-#include "RectObj.h"
-#include "ObjectP.h"
-#include "RectObjP.h"
-
-#include "ConvertI.h"
-#include "TranslateI.h"
-
-#define RectObjClassFlag	0x02
-#define WidgetClassFlag		0x04
-#define CompositeClassFlag	0x08
-#define ConstraintClassFlag	0x10
-#define ShellClassFlag		0x20
-#define WMShellClassFlag	0x40
-#define TopLevelClassFlag	0x80
-
-/*
- * The following macros, though very handy, are not suitable for
- * IntrinsicP.h as they violate the rule that arguments are to
- * be evaluated exactly once.
- */
-
-#define XtDisplayOfObject(object) \
-    (XtIsWidget(object) ? (object)->core.screen->display : \
-    _XtIsHookObject(object) ? ((HookObject)(object))->hooks.screen->display : \
-    _XtWindowedAncestor(object)->core.screen->display)
-
-#define XtScreenOfObject(object) \
-    (XtIsWidget(object) ? (object)->core.screen : \
-    _XtIsHookObject(object) ? ((HookObject)(object))->hooks.screen : \
-    _XtWindowedAncestor(object)->core.screen)
-
-#define XtWindowOfObject(object) \
-    ((XtIsWidget(object) ? (object) : _XtWindowedAncestor(object)) \
-     ->core.window)
-
-#define XtIsManaged(object) \
-    (XtIsRectObj(object) ? (object)->core.managed : False)
-
-#define XtIsSensitive(object) \
-    (XtIsRectObj(object) ? ((object)->core.sensitive && \
-			    (object)->core.ancestor_sensitive) : False)
-
-
-/****************************************************************
- *
- * Byte utilities
- *
- ****************************************************************/
-
-#define _XBCOPYFUNC _XtBcopy
-#include <X11/Xfuncs.h>
-
-/* If the alignment characteristics of your machine are right, these may be
-   faster */
-
-#ifdef UNALIGNED
-
-#define XtMemmove(dst, src, size)			    \
-    if ((char *)(dst) != (char *)(src)) {		    \
-	if (size == sizeof(int))			    \
-	    *((int *) (dst)) = *((int *) (src));	    \
-	else if (size == sizeof(char))			    \
-	    *((char *) (dst)) = *((char *) (src));	    \
-	else if (size == sizeof(short))			    \
-	    *((short *) (dst)) = *((short *) (src));	    \
-	else						    \
-	    (void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
-    }
-
-#define XtBZero(dst, size)				    \
-    if (size == sizeof(int))				    \
-	*((int *) (dst)) = 0;				    \
-    else						    \
-	bzero((char *) (dst), (int) (size))
-
-#define XtMemcmp(b1, b2, size)				    \
-    (size == sizeof(int) ?				    \
-	*((int *) (b1)) != *((int *) (b2))		    \
-    :   memcmp((char *) (b1), (char *) (b2), (int) (size))  \
-    )
-
-#else
-
-#define XtMemmove(dst, src, size)	\
-    if ((char *)(dst) != (char *)(src)) {		    \
-	(void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
-    }
-
-#define XtBZero(dst, size) 	\
-	bzero((char *) (dst), (int) (size))
-
-#define XtMemcmp(b1, b2, size) 		\
-	memcmp((char *) (b1), (char *) (b2), (int) (size))
-
-#endif
-
-
-/****************************************************************
- *
- * Stack cache allocation/free
- *
- ****************************************************************/
-
-#define XtStackAlloc(size, stack_cache_array)     \
-    ((size) <= sizeof(stack_cache_array)	  \
-    ?  (XtPointer)(stack_cache_array)		  \
-    :  XtMalloc((unsigned)(size)))
-
-#define XtStackFree(pointer, stack_cache_array) \
-    { if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); }
-
-/***************************************************************
- *
- * Filename defines
- *
- **************************************************************/
-
-/* used by XtResolvePathname */
-#ifndef XFILESEARCHPATHDEFAULT
-#define XFILESEARCHPATHDEFAULT "/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-#endif
-
-/* the following two were both "X Toolkit " prior to R4 */
-#ifndef XTERROR_PREFIX
-#define XTERROR_PREFIX ""
-#endif
-
-#ifndef XTWARNING_PREFIX
-#define XTWARNING_PREFIX ""
-#endif
-
-#ifndef ERRORDB
-#define ERRORDB "/usr/lib/X11/XtErrorDB"
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern String XtCXtToolkitError;
-
-extern void _XtAllocError(
-    String	/* alloc_type */
-);
-
-extern void _XtCompileResourceList(
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */
-);
-
-extern XtGeometryResult _XtMakeGeometryRequest(
-    Widget 		/* widget */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply_return */,
-    Boolean*		/* clear_rect_obj */
-);
-
-extern Boolean _XtIsHookObject(
-    Widget      /* widget */
-);
-
-extern void _XtAddShellToHookObj(
-    Widget      /* widget */
-);
-
-/* GCManager.c */
-extern void _XtGClistFree(Display *dpy, XtPerDisplay pd);
-
-/** GeoTattler stuff */
-
-#ifdef XT_GEO_TATTLER
-
-extern void _XtGeoTab (int);
-extern void _XtGeoTrace (
-			    Widget widget,
-			    ...
-) _X_ATTRIBUTE_PRINTF(2,3);
-
-#define CALLGEOTAT(f) f
-
-#else /* XT_GEO_TATTLER */
-
-#define CALLGEOTAT(f)
-
-#endif /* XT_GEO_TATTLER */
-
-#ifndef XTTRACEMEMORY
-
-extern char* __XtMalloc (
-    unsigned	/* size */
-);
-extern char* __XtCalloc (
-    unsigned	/* num */,
-    unsigned	/* size */
-);
-
-#else
-
-#define __XtMalloc XtMalloc
-#define __XtCalloc XtCalloc
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtintrinsicI_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XtintrinsicI_h

+#define _XtintrinsicI_h

+

+#include "Xtos.h"

+#include "IntrinsicP.h"

+#ifdef WIN32

+#define _WILLWINSOCK_

+#endif

+#include <X11/Xos.h>

+

+#include "Object.h"

+#include "RectObj.h"

+#include "ObjectP.h"

+#include "RectObjP.h"

+

+#include "ConvertI.h"

+#include "TranslateI.h"

+

+#define RectObjClassFlag	0x02

+#define WidgetClassFlag		0x04

+#define CompositeClassFlag	0x08

+#define ConstraintClassFlag	0x10

+#define ShellClassFlag		0x20

+#define WMShellClassFlag	0x40

+#define TopLevelClassFlag	0x80

+

+/*

+ * The following macros, though very handy, are not suitable for

+ * IntrinsicP.h as they violate the rule that arguments are to

+ * be evaluated exactly once.

+ */

+

+#define XtDisplayOfObject(object) \

+    (XtIsWidget(object) ? (object)->core.screen->display : \

+    _XtIsHookObject(object) ? ((HookObject)(object))->hooks.screen->display : \

+    _XtWindowedAncestor(object)->core.screen->display)

+

+#define XtScreenOfObject(object) \

+    (XtIsWidget(object) ? (object)->core.screen : \

+    _XtIsHookObject(object) ? ((HookObject)(object))->hooks.screen : \

+    _XtWindowedAncestor(object)->core.screen)

+

+#define XtWindowOfObject(object) \

+    ((XtIsWidget(object) ? (object) : _XtWindowedAncestor(object)) \

+     ->core.window)

+

+#define XtIsManaged(object) \

+    (XtIsRectObj(object) ? (object)->core.managed : False)

+

+#define XtIsSensitive(object) \

+    (XtIsRectObj(object) ? ((object)->core.sensitive && \

+			    (object)->core.ancestor_sensitive) : False)

+

+

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

+ *

+ * Byte utilities

+ *

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

+

+#define _XBCOPYFUNC _XtBcopy

+#include <X11/Xfuncs.h>

+

+#define XtMemmove(dst, src, size)	\

+    if ((char *)(dst) != (char *)(src)) {		    \

+	(void) memcpy((char *) (dst), (char *) (src), (int) (size)); \

+    }

+

+#define XtBZero(dst, size) 	\

+	bzero((char *) (dst), (int) (size))

+

+#define XtMemcmp(b1, b2, size) 		\

+	memcmp((char *) (b1), (char *) (b2), (int) (size))

+

+

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

+ *

+ * Stack cache allocation/free

+ *

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

+

+#define XtStackAlloc(size, stack_cache_array)     \

+    ((size) <= sizeof(stack_cache_array)	  \

+    ?  (XtPointer)(stack_cache_array)		  \

+    :  XtMalloc((unsigned)(size)))

+

+#define XtStackFree(pointer, stack_cache_array) \

+    { if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); }

+

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

+ *

+ * Filename defines

+ *

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

+

+/* used by XtResolvePathname */

+#ifndef XFILESEARCHPATHDEFAULT

+#define XFILESEARCHPATHDEFAULT "/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"

+#endif

+

+/* the following two were both "X Toolkit " prior to R4 */

+#ifndef XTERROR_PREFIX

+#define XTERROR_PREFIX ""

+#endif

+

+#ifndef XTWARNING_PREFIX

+#define XTWARNING_PREFIX ""

+#endif

+

+#ifndef ERRORDB

+#define ERRORDB "/usr/lib/X11/XtErrorDB"

+#endif

+

+_XFUNCPROTOBEGIN

+

+extern String XtCXtToolkitError;

+

+extern void _XtAllocError(

+    String	/* alloc_type */

+);

+

+extern void _XtCompileResourceList(

+    XtResourceList 	/* resources */,

+    Cardinal 		/* num_resources */

+);

+

+extern XtGeometryResult _XtMakeGeometryRequest(

+    Widget 		/* widget */,

+    XtWidgetGeometry*	/* request */,

+    XtWidgetGeometry*	/* reply_return */,

+    Boolean*		/* clear_rect_obj */

+);

+

+extern Boolean _XtIsHookObject(

+    Widget      /* widget */

+);

+

+extern void _XtAddShellToHookObj(

+    Widget      /* widget */

+);

+

+/* GCManager.c */

+extern void _XtGClistFree(Display *dpy, XtPerDisplay pd);

+

+/** GeoTattler stuff */

+

+#ifdef XT_GEO_TATTLER

+

+extern void _XtGeoTab (int);

+extern void _XtGeoTrace (

+			    Widget widget,

+			    ...

+) _X_ATTRIBUTE_PRINTF(2,3);

+

+#define CALLGEOTAT(f) f

+

+#else /* XT_GEO_TATTLER */

+

+#define CALLGEOTAT(f)

+

+#endif /* XT_GEO_TATTLER */

+

+#ifndef XTTRACEMEMORY

+

+extern char* __XtMalloc (

+    unsigned	/* size */

+);

+extern char* __XtCalloc (

+    unsigned	/* num */,

+    unsigned	/* size */

+);

+

+#else

+

+#define __XtMalloc XtMalloc

+#define __XtCalloc XtCalloc

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XtintrinsicI_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/IntrinsicP.h b/X11/IntrinsicP.h
index 517c55d2b..3f0b251ac 100644
--- a/X11/IntrinsicP.h
+++ b/X11/IntrinsicP.h
@@ -1,327 +1,324 @@
-/* $Xorg: IntrinsicP.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86$ */
-
-#ifndef _XtintrinsicP_h
-#define _XtintrinsicP_h
-
-#include <X11/Intrinsic.h>
-
-/*
- * Field sizes and offsets of XrmResource must match those of XtResource.
- * Type long is used instead of XrmQuark here because XrmQuark and String
- * are not the same size on all systems.
- */
-typedef struct {
-    long	xrm_name;	  /* Resource name quark		*/
-    long	xrm_class;	  /* Resource class quark		*/
-    long	xrm_type;	  /* Resource representation type quark */
-    Cardinal	xrm_size;	  /* Size in bytes of representation	*/
-    int		xrm_offset;	  /* -offset-1				*/
-    long	xrm_default_type; /* Default representation type quark	*/
-    XtPointer	xrm_default_addr; /* Default resource address		*/
-} XrmResource, *XrmResourceList;
-
-typedef unsigned long XtVersionType;
-
-#define XT_VERSION 11
-#ifndef XT_REVISION
-#define XT_REVISION 6
-#endif
-#define XtVersion (XT_VERSION * 1000 + XT_REVISION)
-#define XtVersionDontCheck 0
-
-typedef void (*XtProc)(
-    void
-);
-
-typedef void (*XtWidgetClassProc)(
-    WidgetClass /* class */
-);
-
-typedef void (*XtWidgetProc)(
-    Widget	/* widget */
-);
-
-typedef Boolean (*XtAcceptFocusProc)(
-    Widget	/* widget */,
-    Time*	/* time */
-);
-
-typedef void (*XtArgsProc)(
-    Widget	/* widget */,
-    ArgList	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef void (*XtInitProc)(
-    Widget	/* request */,
-    Widget	/* new */,
-    ArgList	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef Boolean (*XtSetValuesFunc)(
-    Widget 	/* old */,
-    Widget 	/* request */,
-    Widget 	/* new */,
-    ArgList 	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef Boolean (*XtArgsFunc)(
-    Widget	/* widget */,
-    ArgList	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef void (*XtAlmostProc)(
-    Widget		/* old */,
-    Widget		/* new */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply */
-);
-
-typedef void (*XtExposeProc)(
-    Widget	/* widget */,
-    XEvent*	/* event */,
-    Region	/* region */
-);
-
-/* compress_exposure options*/
-#define XtExposeNoCompress		((XtEnum)False)
-#define XtExposeCompressSeries		((XtEnum)True)
-#define XtExposeCompressMultiple	2
-#define XtExposeCompressMaximal		3
-
-/* modifiers */
-#define XtExposeGraphicsExpose	  	0x10
-#define XtExposeGraphicsExposeMerged	0x20
-#define XtExposeNoExpose	  	0x40
-#define XtExposeNoRegion		0x80
-
-typedef void (*XtRealizeProc)(
-    Widget 		  /* widget */,
-    XtValueMask* 	  /* mask */,
-    XSetWindowAttributes* /* attributes */
-);
-
-typedef XtGeometryResult (*XtGeometryHandler)(
-    Widget		/* widget */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply */
-);
-
-typedef void (*XtStringProc)(
-    Widget	/* widget */,
-    String	/* str */
-);
-
-typedef struct {
-    String	name;	/* resource name */
-    String	type;	/* representation type name */
-    XtArgVal	value;	/* representation */
-    int		size;	/* size of representation */
-} XtTypedArg, *XtTypedArgList;
-
-typedef void (*XtAllocateProc)(
-    WidgetClass		/* widget_class */,
-    Cardinal *		/* constraint_size */,
-    Cardinal *		/* more_bytes */,
-    ArgList		/* args */,
-    Cardinal *		/* num_args */,
-    XtTypedArgList	/* typed_args */,
-    Cardinal *		/* num_typed_args */,
-    Widget *		/* widget_return */,
-    XtPointer *		/* more_bytes_return */
-);
-
-typedef void (*XtDeallocateProc)(
-    Widget		/* widget */,
-    XtPointer		/* more_bytes */
-);
-
-struct _XtStateRec;	/* Forward declare before use for C++ */
-
-typedef struct _XtTMRec {
-    XtTranslations  translations;	/* private to Translation Manager    */
-    XtBoundActions  proc_table;		/* procedure bindings for actions    */
-    struct _XtStateRec *current_state;  /* Translation Manager state ptr     */
-    unsigned long   lastEventTime;
-} XtTMRec, *XtTM;
-
-#include <X11/CoreP.h>
-#include <X11/CompositeP.h>
-#include <X11/ConstrainP.h>
-#include <X11/ObjectP.h>
-#include <X11/RectObjP.h>
-
-#define XtDisplay(widget)	DisplayOfScreen((widget)->core.screen)
-#define XtScreen(widget)	((widget)->core.screen)
-#define XtWindow(widget)	((widget)->core.window)
-
-#define XtClass(widget)		((widget)->core.widget_class)
-#define XtSuperclass(widget)	(XtClass(widget)->core_class.superclass)
-#define XtIsRealized(object)	(XtWindowOfObject(object) != None)
-#define XtParent(widget)	((widget)->core.parent)
-
-#undef XtIsRectObj
-extern Boolean XtIsRectObj(Widget);
-#define XtIsRectObj(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x02)
-
-#undef XtIsWidget
-extern Boolean XtIsWidget(Widget);
-#define XtIsWidget(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x04)
-
-#undef XtIsComposite
-extern Boolean XtIsComposite(Widget);
-#define XtIsComposite(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x08)
-
-#undef XtIsConstraint
-extern Boolean XtIsConstraint(Widget);
-#define XtIsConstraint(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x10)
-
-#undef XtIsShell
-extern Boolean XtIsShell(Widget);
-#define XtIsShell(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x20)
-
-#undef XtIsWMShell
-extern Boolean XtIsWMShell(Widget);
-#define XtIsWMShell(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x40)
-
-#undef XtIsTopLevelShell
-extern Boolean XtIsTopLevelShell(Widget);
-#define XtIsTopLevelShell(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x80)
-
-#ifdef DEBUG
-#define XtCheckSubclass(w, widget_class_ptr, message)	\
-	if (!XtIsSubclass(((Widget)(w)), (widget_class_ptr))) {	\
-	    String params[3];				\
-	    Cardinal num_params = 3;			\
-	    params[0] = ((Widget)(w))->core.widget_class->core_class.class_name;\
-	    params[1] = (widget_class_ptr)->core_class.class_name;	     \
-	    params[2] = (message);					     \
-	    XtAppErrorMsg(XtWidgetToApplicationContext((Widget)(w)),	     \
-		    "subclassMismatch", "xtCheckSubclass", "XtToolkitError", \
-		    "Widget class %s found when subclass of %s expected: %s",\
-		    params, &num_params);		\
-	}
-#else
-#define XtCheckSubclass(w, widget_class, message)	/* nothing */
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */
-    Widget 		/* object */
-);
-
-extern void _XtInherit(
-    void
-);
-
-extern void _XtHandleFocus(
-    Widget		/* widget */,
-    XtPointer		/* client_data */,
-    XEvent *		/* event */,
-    Boolean *		/* cont */);
-
-extern void XtCreateWindow(
-    Widget 		/* widget */,
-    unsigned int 	/* window_class */,
-    Visual*		/* visual */,
-    XtValueMask		/* value_mask */,
-    XSetWindowAttributes* /* attributes */
-);
-
-extern void XtResizeWidget(
-    Widget 		/* widget */,
-    _XtDimension	/* width */,
-    _XtDimension	/* height */,
-    _XtDimension	/* border_width */
-);
-
-extern void XtMoveWidget(
-    Widget 		/* widget */,
-    _XtPosition		/* x */,
-    _XtPosition		/* y */
-);
-
-extern void XtConfigureWidget(
-    Widget 		/* widget */,
-    _XtPosition		/* x */,
-    _XtPosition		/* y */,
-    _XtDimension	/* width */,
-    _XtDimension	/* height */,
-    _XtDimension	/* border_width */
-);
-
-extern void XtResizeWindow(
-    Widget 		/* widget */
-);
-
-extern void XtProcessLock(
-    void
-);
-
-extern void XtProcessUnlock(
-    void
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XtIntrinsicP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XtintrinsicP_h

+#define _XtintrinsicP_h

+

+#include <X11/Intrinsic.h>

+

+/*

+ * Field sizes and offsets of XrmResource must match those of XtResource.

+ * Type long is used instead of XrmQuark here because XrmQuark and String

+ * are not the same size on all systems.

+ */

+typedef struct {

+    long	xrm_name;	  /* Resource name quark		*/

+    long	xrm_class;	  /* Resource class quark		*/

+    long	xrm_type;	  /* Resource representation type quark */

+    Cardinal	xrm_size;	  /* Size in bytes of representation	*/

+    int		xrm_offset;	  /* -offset-1				*/

+    long	xrm_default_type; /* Default representation type quark	*/

+    XtPointer	xrm_default_addr; /* Default resource address		*/

+} XrmResource, *XrmResourceList;

+

+typedef unsigned long XtVersionType;

+

+#define XT_VERSION 11

+#ifndef XT_REVISION

+#define XT_REVISION 6

+#endif

+#define XtVersion (XT_VERSION * 1000 + XT_REVISION)

+#define XtVersionDontCheck 0

+

+typedef void (*XtProc)(

+    void

+);

+

+typedef void (*XtWidgetClassProc)(

+    WidgetClass /* class */

+);

+

+typedef void (*XtWidgetProc)(

+    Widget	/* widget */

+);

+

+typedef Boolean (*XtAcceptFocusProc)(

+    Widget	/* widget */,

+    Time*	/* time */

+);

+

+typedef void (*XtArgsProc)(

+    Widget	/* widget */,

+    ArgList	/* args */,

+    Cardinal*	/* num_args */

+);

+

+typedef void (*XtInitProc)(

+    Widget	/* request */,

+    Widget	/* new */,

+    ArgList	/* args */,

+    Cardinal*	/* num_args */

+);

+

+typedef Boolean (*XtSetValuesFunc)(

+    Widget 	/* old */,

+    Widget 	/* request */,

+    Widget 	/* new */,

+    ArgList 	/* args */,

+    Cardinal*	/* num_args */

+);

+

+typedef Boolean (*XtArgsFunc)(

+    Widget	/* widget */,

+    ArgList	/* args */,

+    Cardinal*	/* num_args */

+);

+

+typedef void (*XtAlmostProc)(

+    Widget		/* old */,

+    Widget		/* new */,

+    XtWidgetGeometry*	/* request */,

+    XtWidgetGeometry*	/* reply */

+);

+

+typedef void (*XtExposeProc)(

+    Widget	/* widget */,

+    XEvent*	/* event */,

+    Region	/* region */

+);

+

+/* compress_exposure options*/

+#define XtExposeNoCompress		((XtEnum)False)

+#define XtExposeCompressSeries		((XtEnum)True)

+#define XtExposeCompressMultiple	2

+#define XtExposeCompressMaximal		3

+

+/* modifiers */

+#define XtExposeGraphicsExpose	  	0x10

+#define XtExposeGraphicsExposeMerged	0x20

+#define XtExposeNoExpose	  	0x40

+#define XtExposeNoRegion		0x80

+

+typedef void (*XtRealizeProc)(

+    Widget 		  /* widget */,

+    XtValueMask* 	  /* mask */,

+    XSetWindowAttributes* /* attributes */

+);

+

+typedef XtGeometryResult (*XtGeometryHandler)(

+    Widget		/* widget */,

+    XtWidgetGeometry*	/* request */,

+    XtWidgetGeometry*	/* reply */

+);

+

+typedef void (*XtStringProc)(

+    Widget	/* widget */,

+    String	/* str */

+);

+

+typedef struct {

+    String	name;	/* resource name */

+    String	type;	/* representation type name */

+    XtArgVal	value;	/* representation */

+    int		size;	/* size of representation */

+} XtTypedArg, *XtTypedArgList;

+

+typedef void (*XtAllocateProc)(

+    WidgetClass		/* widget_class */,

+    Cardinal *		/* constraint_size */,

+    Cardinal *		/* more_bytes */,

+    ArgList		/* args */,

+    Cardinal *		/* num_args */,

+    XtTypedArgList	/* typed_args */,

+    Cardinal *		/* num_typed_args */,

+    Widget *		/* widget_return */,

+    XtPointer *		/* more_bytes_return */

+);

+

+typedef void (*XtDeallocateProc)(

+    Widget		/* widget */,

+    XtPointer		/* more_bytes */

+);

+

+struct _XtStateRec;	/* Forward declare before use for C++ */

+

+typedef struct _XtTMRec {

+    XtTranslations  translations;	/* private to Translation Manager    */

+    XtBoundActions  proc_table;		/* procedure bindings for actions    */

+    struct _XtStateRec *current_state;  /* Translation Manager state ptr     */

+    unsigned long   lastEventTime;

+} XtTMRec, *XtTM;

+

+#include <X11/CoreP.h>

+#include <X11/CompositeP.h>

+#include <X11/ConstrainP.h>

+#include <X11/ObjectP.h>

+#include <X11/RectObjP.h>

+

+#define XtDisplay(widget)	DisplayOfScreen((widget)->core.screen)

+#define XtScreen(widget)	((widget)->core.screen)

+#define XtWindow(widget)	((widget)->core.window)

+

+#define XtClass(widget)		((widget)->core.widget_class)

+#define XtSuperclass(widget)	(XtClass(widget)->core_class.superclass)

+#define XtIsRealized(object)	(XtWindowOfObject(object) != None)

+#define XtParent(widget)	((widget)->core.parent)

+

+#undef XtIsRectObj

+extern Boolean XtIsRectObj(Widget);

+#define XtIsRectObj(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x02)

+

+#undef XtIsWidget

+extern Boolean XtIsWidget(Widget);

+#define XtIsWidget(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x04)

+

+#undef XtIsComposite

+extern Boolean XtIsComposite(Widget);

+#define XtIsComposite(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x08)

+

+#undef XtIsConstraint

+extern Boolean XtIsConstraint(Widget);

+#define XtIsConstraint(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x10)

+

+#undef XtIsShell

+extern Boolean XtIsShell(Widget);

+#define XtIsShell(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x20)

+

+#undef XtIsWMShell

+extern Boolean XtIsWMShell(Widget);

+#define XtIsWMShell(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x40)

+

+#undef XtIsTopLevelShell

+extern Boolean XtIsTopLevelShell(Widget);

+#define XtIsTopLevelShell(obj) \

+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x80)

+

+#ifdef DEBUG

+#define XtCheckSubclass(w, widget_class_ptr, message)	\

+	if (!XtIsSubclass(((Widget)(w)), (widget_class_ptr))) {	\

+	    String params[3];				\

+	    Cardinal num_params = 3;			\

+	    params[0] = ((Widget)(w))->core.widget_class->core_class.class_name;\

+	    params[1] = (widget_class_ptr)->core_class.class_name;	     \

+	    params[2] = (message);					     \

+	    XtAppErrorMsg(XtWidgetToApplicationContext((Widget)(w)),	     \

+		    "subclassMismatch", "xtCheckSubclass", "XtToolkitError", \

+		    "Widget class %s found when subclass of %s expected: %s",\

+		    params, &num_params);		\

+	}

+#else

+#define XtCheckSubclass(w, widget_class, message)	/* nothing */

+#endif

+

+_XFUNCPROTOBEGIN

+

+extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */

+    Widget 		/* object */

+);

+

+extern void _XtInherit(

+    void

+);

+

+extern void _XtHandleFocus(

+    Widget		/* widget */,

+    XtPointer		/* client_data */,

+    XEvent *		/* event */,

+    Boolean *		/* cont */);

+

+extern void XtCreateWindow(

+    Widget 		/* widget */,

+    unsigned int 	/* window_class */,

+    Visual*		/* visual */,

+    XtValueMask		/* value_mask */,

+    XSetWindowAttributes* /* attributes */

+);

+

+extern void XtResizeWidget(

+    Widget 		/* widget */,

+    _XtDimension	/* width */,

+    _XtDimension	/* height */,

+    _XtDimension	/* border_width */

+);

+

+extern void XtMoveWidget(

+    Widget 		/* widget */,

+    _XtPosition		/* x */,

+    _XtPosition		/* y */

+);

+

+extern void XtConfigureWidget(

+    Widget 		/* widget */,

+    _XtPosition		/* x */,

+    _XtPosition		/* y */,

+    _XtDimension	/* width */,

+    _XtDimension	/* height */,

+    _XtDimension	/* border_width */

+);

+

+extern void XtResizeWindow(

+    Widget 		/* widget */

+);

+

+extern void XtProcessLock(

+    void

+);

+

+extern void XtProcessUnlock(

+    void

+);

+

+_XFUNCPROTOEND

+

+#endif /* _XtIntrinsicP_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/Object.h b/X11/Object.h
index 5ef65de3c..666afd357 100644
--- a/X11/Object.h
+++ b/X11/Object.h
@@ -1,65 +1,63 @@
-/* $Xorg: Object.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-/* $oHeader: Object.h,v 1.2 88/08/18 15:55:32 asente 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.
-
-******************************************************************/
-
-#ifndef _XtObject_h
-#define _XtObject_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _ObjectRec *Object;
-typedef struct _ObjectClassRec *ObjectClass;
-
-#ifndef VMS
-externalref WidgetClass objectClass;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtObject_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtObject_h

+#define _XtObject_h

+

+_XFUNCPROTOBEGIN

+

+typedef struct _ObjectRec *Object;

+typedef struct _ObjectClassRec *ObjectClass;

+

+#ifndef VMS

+externalref WidgetClass objectClass;

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XtObject_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/ObjectP.h b/X11/ObjectP.h
index 0f484d2fd..80fb072d4 100644
--- a/X11/ObjectP.h
+++ b/X11/ObjectP.h
@@ -1,143 +1,141 @@
-/* $Xorg: ObjectP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-
-#ifndef _Xt_ObjectP_h_
-#define _Xt_ObjectP_h_
-
-#include <X11/Object.h>
-
-_XFUNCPROTOBEGIN
-
-/**********************************************************
- * Object Instance Data Structures
- *
- **********************************************************/
-/* these fields match CorePart and can not be changed */
-
-typedef struct _ObjectPart {
-    Widget          self;               /* pointer to widget itself          */
-    WidgetClass     widget_class;       /* pointer to Widget's ClassRec      */
-    Widget          parent;             /* parent widget                     */
-    XrmName         xrm_name;           /* widget resource name quarkified   */
-    Boolean         being_destroyed;    /* marked for destroy                */
-    XtCallbackList  destroy_callbacks;  /* who to call when widget destroyed */
-    XtPointer       constraints;        /* constraint record                 */
-} ObjectPart;
-
-typedef struct _ObjectRec {
-    ObjectPart  object;
-} ObjectRec;
-
-/********************************************************
- * Object Class Data Structures
- *
- ********************************************************/
-/* these fields match CoreClassPart and can not be changed */
-/* ideally these structures would only contain the fields required;
-   but because the CoreClassPart cannot be changed at this late date
-   extraneous fields are necessary to make the field offsets match */
-
-typedef struct _ObjectClassPart {
-
-    WidgetClass     superclass;         /* pointer to superclass ClassRec   */
-    String          class_name;         /* widget resource class name       */
-    Cardinal        widget_size;        /* size in bytes of widget record   */
-    XtProc          class_initialize;   /* class initialization proc        */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization      */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;         /* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtProc          obj1;		/* NULL                             */
-    XtPointer       obj2;               /* NULL                             */
-    Cardinal        obj3;               /* NULL                             */
-    XtResourceList  resources;          /* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;          /* resource class quarkified        */
-    Boolean         obj4;               /* NULL                             */
-    XtEnum          obj5;               /* NULL                             */
-    Boolean         obj6;               /* NULL				    */
-    Boolean         obj7;               /* NULL                             */
-    XtWidgetProc    destroy;            /* free data for subclass pointers  */
-    XtProc          obj8;               /* NULL                             */
-    XtProc          obj9;               /* NULL			            */
-    XtSetValuesFunc set_values;         /* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtProc          obj10;              /* NULL                             */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtProc          obj11;              /* NULL                             */
-    XtVersionType   version;            /* version of intrinsics used       */
-    XtPointer       callback_private;   /* list of callback offsets         */
-    String          obj12;              /* NULL                             */
-    XtProc          obj13;              /* NULL                             */
-    XtProc          obj14;              /* NULL                             */
-    XtPointer       extension;          /* pointer to extension record      */
-}ObjectClassPart;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 required for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; when on ObjectClassPart */
-    long version;		/* must be XtObjectExtensionVersion */
-    Cardinal record_size;	/* sizeof(ObjectClassExtensionRec) */
-    XtAllocateProc allocate;
-    XtDeallocateProc deallocate;
-} ObjectClassExtensionRec, *ObjectClassExtension;
-
-typedef struct _ObjectClassRec {
-    ObjectClassPart object_class;
-} ObjectClassRec;
-
-externalref ObjectClassRec objectClassRec;
-
-_XFUNCPROTOEND
-
-#define XtObjectExtensionVersion 1L
-#define XtInheritAllocate ((XtAllocateProc) _XtInherit)
-#define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
-
-#endif /*_Xt_ObjectP_h_*/
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _Xt_ObjectP_h_

+#define _Xt_ObjectP_h_

+

+#include <X11/Object.h>

+

+_XFUNCPROTOBEGIN

+

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

+ * Object Instance Data Structures

+ *

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

+/* these fields match CorePart and can not be changed */

+

+typedef struct _ObjectPart {

+    Widget          self;               /* pointer to widget itself          */

+    WidgetClass     widget_class;       /* pointer to Widget's ClassRec      */

+    Widget          parent;             /* parent widget                     */

+    XrmName         xrm_name;           /* widget resource name quarkified   */

+    Boolean         being_destroyed;    /* marked for destroy                */

+    XtCallbackList  destroy_callbacks;  /* who to call when widget destroyed */

+    XtPointer       constraints;        /* constraint record                 */

+} ObjectPart;

+

+typedef struct _ObjectRec {

+    ObjectPart  object;

+} ObjectRec;

+

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

+ * Object Class Data Structures

+ *

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

+/* these fields match CoreClassPart and can not be changed */

+/* ideally these structures would only contain the fields required;

+   but because the CoreClassPart cannot be changed at this late date

+   extraneous fields are necessary to make the field offsets match */

+

+typedef struct _ObjectClassPart {

+

+    WidgetClass     superclass;         /* pointer to superclass ClassRec   */

+    String          class_name;         /* widget resource class name       */

+    Cardinal        widget_size;        /* size in bytes of widget record   */

+    XtProc          class_initialize;   /* class initialization proc        */

+    XtWidgetClassProc class_part_initialize; /* dynamic initialization      */

+    XtEnum          class_inited;       /* has class been initialized?      */

+    XtInitProc      initialize;         /* initialize subclass fields       */

+    XtArgsProc      initialize_hook;    /* notify that initialize called    */

+    XtProc          obj1;		/* NULL                             */

+    XtPointer       obj2;               /* NULL                             */

+    Cardinal        obj3;               /* NULL                             */

+    XtResourceList  resources;          /* resources for subclass fields    */

+    Cardinal        num_resources;      /* number of entries in resources   */

+    XrmClass        xrm_class;          /* resource class quarkified        */

+    Boolean         obj4;               /* NULL                             */

+    XtEnum          obj5;               /* NULL                             */

+    Boolean         obj6;               /* NULL				    */

+    Boolean         obj7;               /* NULL                             */

+    XtWidgetProc    destroy;            /* free data for subclass pointers  */

+    XtProc          obj8;               /* NULL                             */

+    XtProc          obj9;               /* NULL			            */

+    XtSetValuesFunc set_values;         /* set subclass resource values     */

+    XtArgsFunc      set_values_hook;    /* notify that set_values called    */

+    XtProc          obj10;              /* NULL                             */

+    XtArgsProc      get_values_hook;    /* notify that get_values called    */

+    XtProc          obj11;              /* NULL                             */

+    XtVersionType   version;            /* version of intrinsics used       */

+    XtPointer       callback_private;   /* list of callback offsets         */

+    String          obj12;              /* NULL                             */

+    XtProc          obj13;              /* NULL                             */

+    XtProc          obj14;              /* NULL                             */

+    XtPointer       extension;          /* pointer to extension record      */

+}ObjectClassPart;

+

+typedef struct {

+    XtPointer next_extension;	/* 1st 4 required for all extension records */

+    XrmQuark record_type;	/* NULLQUARK; when on ObjectClassPart */

+    long version;		/* must be XtObjectExtensionVersion */

+    Cardinal record_size;	/* sizeof(ObjectClassExtensionRec) */

+    XtAllocateProc allocate;

+    XtDeallocateProc deallocate;

+} ObjectClassExtensionRec, *ObjectClassExtension;

+

+typedef struct _ObjectClassRec {

+    ObjectClassPart object_class;

+} ObjectClassRec;

+

+externalref ObjectClassRec objectClassRec;

+

+_XFUNCPROTOEND

+

+#define XtObjectExtensionVersion 1L

+#define XtInheritAllocate ((XtAllocateProc) _XtInherit)

+#define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)

+

+#endif /*_Xt_ObjectP_h_*/

diff --git a/X11/PassivGraI.h b/X11/PassivGraI.h
index 10591ac4d..cd401cd46 100644
--- a/X11/PassivGraI.h
+++ b/X11/PassivGraI.h
@@ -1,190 +1,185 @@
-/*
-* $Xorg: PassivGraI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $
-*/
-
-/********************************************************
-
-Copyright 1988 by Hewlett-Packard Company
-Copyright 1987, 1988, 1989 by Digital Equipment Corporation, Maynard
-
-Permission to use, copy, modify, and distribute this software 
-and its documentation for any purpose and without fee is hereby 
-granted, provided that the above copyright notice appear in all 
-copies and that both that copyright notice and this permission 
-notice appear in supporting documentation, and that the names of 
-Hewlett-Packard or 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.
-
-********************************************************/
-
-/*
-
-Copyright 1987, 1988, 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/Xt/PassivGraI.h,v 1.3 2001/12/14 19:56:27 dawes Exp $ */
-
-#ifndef _PDI_h_
-#define _PDI_h_
-
-
-#define KEYBOARD TRUE
-#define POINTER  FALSE
-
-_XFUNCPROTOBEGIN
-
-typedef enum {
-    XtNoServerGrab, 
-    XtPassiveServerGrab,
-    XtActiveServerGrab,
-    XtPseudoPassiveServerGrab,
-    XtPseudoActiveServerGrab
-}XtServerGrabType;
-
-typedef struct _XtServerGrabRec {
-    struct _XtServerGrabRec 	*next;
-    Widget			widget;
-    unsigned int		ownerEvents:1;
-    unsigned int		pointerMode:1;
-    unsigned int		keyboardMode:1;
-    unsigned int		hasExt:1;
-    unsigned int		confineToIsWidgetWin:1;
-    KeyCode			keybut;
-    unsigned short		modifiers;
-    unsigned short		eventMask;
-} XtServerGrabRec, *XtServerGrabPtr;
-
-typedef struct _XtGrabExtRec {
-    Mask			*pKeyButMask;
-    Mask			*pModifiersMask;
-    Window			confineTo;
-    Cursor			cursor;
-} XtServerGrabExtRec, *XtServerGrabExtPtr;
-
-#define GRABEXT(p) ((XtServerGrabExtPtr)((p)+1))
-
-typedef struct _XtDeviceRec{
-    XtServerGrabRec	grab; 	/* need copy in order to protect
-				   during grab */
-    XtServerGrabType	grabType;
-}XtDeviceRec, *XtDevice;
-
-#define XtMyAncestor	0
-#define XtMyDescendant	1
-#define XtMyCousin	2
-#define XtMySelf	3
-#define XtUnrelated	4
-typedef char XtGeneology; /* do not use an enum makes PerWidgetInput larger */
-
-typedef struct {
-    Widget		focusKid;
-    XtServerGrabPtr	keyList, ptrList;
-    Widget		queryEventDescendant;
-    unsigned int	map_handler_added:1;
-    unsigned int	realize_handler_added:1;
-    unsigned int	active_handler_added:1;
-    unsigned int	haveFocus:1;
-    XtGeneology		focalPoint;
-}XtPerWidgetInputRec, *XtPerWidgetInput;
-
-typedef struct XtPerDisplayInputRec{
-    XtGrabList 	grabList;
-    XtDeviceRec keyboard, pointer;
-    KeyCode	activatingKey;
-    Widget 	*trace;
-    int		traceDepth, traceMax;
-    Widget 	focusWidget;
-}XtPerDisplayInputRec, *XtPerDisplayInput;
-
-#define IsServerGrab(g) ((g == XtPassiveServerGrab) ||\
-			 (g == XtActiveServerGrab))
-
-#define IsAnyGrab(g) ((g == XtPassiveServerGrab) ||\
-		      (g == XtActiveServerGrab)  ||\
-		      (g == XtPseudoPassiveServerGrab))
-
-#define IsEitherPassiveGrab(g) ((g == XtPassiveServerGrab) ||\
-				(g == XtPseudoPassiveServerGrab))
-
-#define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab))
-
-extern void _XtDestroyServerGrabs(
-    Widget		/* w */,
-    XtPointer		/* pwi */, /*XtPerWidgetInput*/
-    XtPointer		/* call_data */
-);
-
-extern XtPerWidgetInput _XtGetPerWidgetInput(
-    Widget	/* widget */,
-    _XtBoolean	/* create */
-);
-
-extern XtServerGrabPtr _XtCheckServerGrabsOnWidget(
-    XEvent*		/* event */,
-    Widget		/* widget */,
-    _XtBoolean		/* isKeyboard */
-);
-
-/*
-extern XtGrabList* _XtGetGrabList( XtPerDisplayInput );
-*/
-
-#define _XtGetGrabList(pdi) (&(pdi)->grabList)
-
-extern void _XtFreePerWidgetInput(
-    Widget		/* w */,
-    XtPerWidgetInput	/* pwi */
-);
-
-extern Widget _XtProcessKeyboardEvent(
-    XKeyEvent*		/* event */,
-    Widget		/* widget */,
-    XtPerDisplayInput	/* pdi */
-);
-
-extern Widget _XtProcessPointerEvent(
-    XButtonEvent*	/* event */,
-    Widget		/* widget */,
-    XtPerDisplayInput	/* pdi */
-);
-
-extern void _XtRegisterPassiveGrabs(
-    Widget		/* widget */
-);
-
-extern void _XtClearAncestorCache(
-    Widget		/* widget */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _PDI_h_ */
+/********************************************************

+

+Copyright 1988 by Hewlett-Packard Company

+Copyright 1987, 1988, 1989 by Digital Equipment Corporation, Maynard

+

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

+and its documentation for any purpose and without fee is hereby 

+granted, provided that the above copyright notice appear in all 

+copies and that both that copyright notice and this permission 

+notice appear in supporting documentation, and that the names of 

+Hewlett-Packard or 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.

+

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

+

+/*

+

+Copyright 1987, 1988, 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 _PDI_h_

+#define _PDI_h_

+

+

+#define KEYBOARD TRUE

+#define POINTER  FALSE

+

+_XFUNCPROTOBEGIN

+

+typedef enum {

+    XtNoServerGrab, 

+    XtPassiveServerGrab,

+    XtActiveServerGrab,

+    XtPseudoPassiveServerGrab,

+    XtPseudoActiveServerGrab

+}XtServerGrabType;

+

+typedef struct _XtServerGrabRec {

+    struct _XtServerGrabRec 	*next;

+    Widget			widget;

+    unsigned int		ownerEvents:1;

+    unsigned int		pointerMode:1;

+    unsigned int		keyboardMode:1;

+    unsigned int		hasExt:1;

+    unsigned int		confineToIsWidgetWin:1;

+    KeyCode			keybut;

+    unsigned short		modifiers;

+    unsigned short		eventMask;

+} XtServerGrabRec, *XtServerGrabPtr;

+

+typedef struct _XtGrabExtRec {

+    Mask			*pKeyButMask;

+    Mask			*pModifiersMask;

+    Window			confineTo;

+    Cursor			cursor;

+} XtServerGrabExtRec, *XtServerGrabExtPtr;

+

+#define GRABEXT(p) ((XtServerGrabExtPtr)((p)+1))

+

+typedef struct _XtDeviceRec{

+    XtServerGrabRec	grab; 	/* need copy in order to protect

+				   during grab */

+    XtServerGrabType	grabType;

+}XtDeviceRec, *XtDevice;

+

+#define XtMyAncestor	0

+#define XtMyDescendant	1

+#define XtMyCousin	2

+#define XtMySelf	3

+#define XtUnrelated	4

+typedef char XtGeneology; /* do not use an enum makes PerWidgetInput larger */

+

+typedef struct {

+    Widget		focusKid;

+    XtServerGrabPtr	keyList, ptrList;

+    Widget		queryEventDescendant;

+    unsigned int	map_handler_added:1;

+    unsigned int	realize_handler_added:1;

+    unsigned int	active_handler_added:1;

+    unsigned int	haveFocus:1;

+    XtGeneology		focalPoint;

+}XtPerWidgetInputRec, *XtPerWidgetInput;

+

+typedef struct XtPerDisplayInputRec{

+    XtGrabList 	grabList;

+    XtDeviceRec keyboard, pointer;

+    KeyCode	activatingKey;

+    Widget 	*trace;

+    int		traceDepth, traceMax;

+    Widget 	focusWidget;

+}XtPerDisplayInputRec, *XtPerDisplayInput;

+

+#define IsServerGrab(g) ((g == XtPassiveServerGrab) ||\

+			 (g == XtActiveServerGrab))

+

+#define IsAnyGrab(g) ((g == XtPassiveServerGrab) ||\

+		      (g == XtActiveServerGrab)  ||\

+		      (g == XtPseudoPassiveServerGrab))

+

+#define IsEitherPassiveGrab(g) ((g == XtPassiveServerGrab) ||\

+				(g == XtPseudoPassiveServerGrab))

+

+#define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab))

+

+extern void _XtDestroyServerGrabs(

+    Widget		/* w */,

+    XtPointer		/* pwi */, /*XtPerWidgetInput*/

+    XtPointer		/* call_data */

+);

+

+extern XtPerWidgetInput _XtGetPerWidgetInput(

+    Widget	/* widget */,

+    _XtBoolean	/* create */

+);

+

+extern XtServerGrabPtr _XtCheckServerGrabsOnWidget(

+    XEvent*		/* event */,

+    Widget		/* widget */,

+    _XtBoolean		/* isKeyboard */

+);

+

+/*

+extern XtGrabList* _XtGetGrabList( XtPerDisplayInput );

+*/

+

+#define _XtGetGrabList(pdi) (&(pdi)->grabList)

+

+extern void _XtFreePerWidgetInput(

+    Widget		/* w */,

+    XtPerWidgetInput	/* pwi */

+);

+

+extern Widget _XtProcessKeyboardEvent(

+    XKeyEvent*		/* event */,

+    Widget		/* widget */,

+    XtPerDisplayInput	/* pdi */

+);

+

+extern Widget _XtProcessPointerEvent(

+    XButtonEvent*	/* event */,

+    Widget		/* widget */,

+    XtPerDisplayInput	/* pdi */

+);

+

+extern void _XtRegisterPassiveGrabs(

+    Widget		/* widget */

+);

+

+extern void _XtClearAncestorCache(

+    Widget		/* widget */

+);

+

+_XFUNCPROTOEND

+

+#endif /* _PDI_h_ */

diff --git a/X11/RectObj.h b/X11/RectObj.h
index 81e43a5e2..d53e68ea1 100644
--- a/X11/RectObj.h
+++ b/X11/RectObj.h
@@ -1,65 +1,63 @@
-/* $Xorg: RectObj.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-/* $oHeader: RectObj.h,v 1.2 88/08/18 17:39:17 asente 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.
-
-******************************************************************/
-
-#ifndef _XtRect_h
-#define _XtRect_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _RectObjRec *RectObj;
-typedef struct _RectObjClassRec *RectObjClass;
-
-#ifndef VMS
-externalref WidgetClass rectObjClass;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtRect_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtRect_h

+#define _XtRect_h

+

+_XFUNCPROTOBEGIN

+

+typedef struct _RectObjRec *RectObj;

+typedef struct _RectObjClassRec *RectObjClass;

+

+#ifndef VMS

+externalref WidgetClass rectObjClass;

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XtRect_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/RectObjP.h b/X11/RectObjP.h
index d6ffb7823..9bb528f7d 100644
--- a/X11/RectObjP.h
+++ b/X11/RectObjP.h
@@ -1,133 +1,131 @@
-/* $Xorg: RectObjP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-/* $oHeader: RectObjP.h,v 1.2 88/08/18 15:55:52 asente 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.
-
-******************************************************************/
-
-#ifndef _Xt_RectObjP_h_
-#define _Xt_RectObjP_h_
-
-#include <X11/RectObj.h>
-#include <X11/ObjectP.h>
-
-_XFUNCPROTOBEGIN
-
-/**********************************************************
- * Rectangle Object Instance Data Structures
- *
- **********************************************************/
-/* these fields match CorePart and can not be changed */
-
-typedef struct _RectObjPart {
-    Position        x, y;               /* rectangle position               */
-    Dimension       width, height;      /* rectangle dimensions             */
-    Dimension       border_width;       /* rectangle border width           */
-    Boolean         managed;            /* is widget geometry managed?       */
-    Boolean         sensitive;          /* is widget sensitive to user events*/
-    Boolean         ancestor_sensitive; /* are all ancestors sensitive?      */
-}RectObjPart;
-
-typedef struct _RectObjRec {
-    ObjectPart object;
-    RectObjPart rectangle;
-} RectObjRec;
-
-
-
-/********************************************************
- * Rectangle Object Class Data Structures
- *
- ********************************************************/
-/* these fields match CoreClassPart and can not be changed */
-/* ideally these structures would only contain the fields required;
-   but because the CoreClassPart cannot be changed at this late date
-   extraneous fields are necessary to make the field offsets match */
-
-typedef struct _RectObjClassPart {
-
-    WidgetClass     superclass;         /* pointer to superclass ClassRec   */
-    String          class_name;         /* widget resource class name       */
-    Cardinal        widget_size;        /* size in bytes of widget record   */
-    XtProc          class_initialize;   /* class initialization proc        */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization      */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;         /* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtProc          rect1;		/* NULL                             */
-    XtPointer       rect2;              /* NULL                             */
-    Cardinal        rect3;              /* NULL                             */
-    XtResourceList  resources;          /* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;          /* resource class quarkified        */
-    Boolean         rect4;              /* NULL                             */
-    XtEnum          rect5;              /* NULL                             */
-    Boolean         rect6;              /* NULL				    */
-    Boolean         rect7;              /* NULL                             */
-    XtWidgetProc    destroy;            /* free data for subclass pointers  */
-    XtWidgetProc    resize;             /* geom manager changed widget size */
-    XtExposeProc    expose;             /* rediplay rectangle               */
-    XtSetValuesFunc set_values;         /* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtAlmostProc    set_values_almost;  /* set values almost for geometry   */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtProc          rect9;              /* NULL                             */
-    XtVersionType   version;            /* version of intrinsics used       */
-    XtPointer       callback_private;   /* list of callback offsets         */
-    String          rect10;             /* NULL                             */
-    XtGeometryHandler query_geometry;   /* return preferred geometry        */
-    XtProc          rect11;             /* NULL                             */
-    XtPointer       extension;          /* pointer to extension record      */
-} RectObjClassPart;
-
-typedef struct _RectObjClassRec {
-    RectObjClassPart rect_class;
-} RectObjClassRec;
-
-externalref RectObjClassRec rectObjClassRec;
-
-_XFUNCPROTOEND
-
-#endif /*_Xt_RectObjP_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.

+

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

+

+#ifndef _Xt_RectObjP_h_

+#define _Xt_RectObjP_h_

+

+#include <X11/RectObj.h>

+#include <X11/ObjectP.h>

+

+_XFUNCPROTOBEGIN

+

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

+ * Rectangle Object Instance Data Structures

+ *

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

+/* these fields match CorePart and can not be changed */

+

+typedef struct _RectObjPart {

+    Position        x, y;               /* rectangle position               */

+    Dimension       width, height;      /* rectangle dimensions             */

+    Dimension       border_width;       /* rectangle border width           */

+    Boolean         managed;            /* is widget geometry managed?       */

+    Boolean         sensitive;          /* is widget sensitive to user events*/

+    Boolean         ancestor_sensitive; /* are all ancestors sensitive?      */

+}RectObjPart;

+

+typedef struct _RectObjRec {

+    ObjectPart object;

+    RectObjPart rectangle;

+} RectObjRec;

+

+

+

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

+ * Rectangle Object Class Data Structures

+ *

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

+/* these fields match CoreClassPart and can not be changed */

+/* ideally these structures would only contain the fields required;

+   but because the CoreClassPart cannot be changed at this late date

+   extraneous fields are necessary to make the field offsets match */

+

+typedef struct _RectObjClassPart {

+

+    WidgetClass     superclass;         /* pointer to superclass ClassRec   */

+    String          class_name;         /* widget resource class name       */

+    Cardinal        widget_size;        /* size in bytes of widget record   */

+    XtProc          class_initialize;   /* class initialization proc        */

+    XtWidgetClassProc class_part_initialize; /* dynamic initialization      */

+    XtEnum          class_inited;       /* has class been initialized?      */

+    XtInitProc      initialize;         /* initialize subclass fields       */

+    XtArgsProc      initialize_hook;    /* notify that initialize called    */

+    XtProc          rect1;		/* NULL                             */

+    XtPointer       rect2;              /* NULL                             */

+    Cardinal        rect3;              /* NULL                             */

+    XtResourceList  resources;          /* resources for subclass fields    */

+    Cardinal        num_resources;      /* number of entries in resources   */

+    XrmClass        xrm_class;          /* resource class quarkified        */

+    Boolean         rect4;              /* NULL                             */

+    XtEnum          rect5;              /* NULL                             */

+    Boolean         rect6;              /* NULL				    */

+    Boolean         rect7;              /* NULL                             */

+    XtWidgetProc    destroy;            /* free data for subclass pointers  */

+    XtWidgetProc    resize;             /* geom manager changed widget size */

+    XtExposeProc    expose;             /* rediplay rectangle               */

+    XtSetValuesFunc set_values;         /* set subclass resource values     */

+    XtArgsFunc      set_values_hook;    /* notify that set_values called    */

+    XtAlmostProc    set_values_almost;  /* set values almost for geometry   */

+    XtArgsProc      get_values_hook;    /* notify that get_values called    */

+    XtProc          rect9;              /* NULL                             */

+    XtVersionType   version;            /* version of intrinsics used       */

+    XtPointer       callback_private;   /* list of callback offsets         */

+    String          rect10;             /* NULL                             */

+    XtGeometryHandler query_geometry;   /* return preferred geometry        */

+    XtProc          rect11;             /* NULL                             */

+    XtPointer       extension;          /* pointer to extension record      */

+} RectObjClassPart;

+

+typedef struct _RectObjClassRec {

+    RectObjClassPart rect_class;

+} RectObjClassRec;

+

+externalref RectObjClassRec rectObjClassRec;

+

+_XFUNCPROTOEND

+

+#endif /*_Xt_RectObjP_h_*/

diff --git a/X11/ResConfigP.h b/X11/ResConfigP.h
index a06cda715..ed367a792 100644
--- a/X11/ResConfigP.h
+++ b/X11/ResConfigP.h
@@ -1,78 +1,76 @@
-/* $Xorg: ResConfigP.h,v 1.5 2001/02/09 02:03:56 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.
-
-*/
-/*****************************************************************
-
-(C) COPYRIGHT International Business Machines Corp. 1992,1997
-    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.
-
-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 IBM CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 IBM Corporation 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 IBM
-Corporation.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */
-
-#ifndef _RESCONFIGP_H
-#define _RESCONFIGP_H
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-/*
- * Atom names for resource configuration management customization tool.
- */
-#define RCM_DATA "Custom Data"
-#define RCM_INIT "Custom Init"
-
-extern void _XtResourceConfigurationEH(
-	Widget 		/* w */, 
-	XtPointer 	/* client_data */, 
-	XEvent * 	/* event */
-);
-
-_XFUNCPROTOEND
-
-#endif
+/*

+

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

+

+*/

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

+

+(C) COPYRIGHT International Business Machines Corp. 1992,1997

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

+

+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 IBM CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 IBM Corporation 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 IBM

+Corporation.

+

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

+

+#ifndef _RESCONFIGP_H

+#define _RESCONFIGP_H

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+/*

+ * Atom names for resource configuration management customization tool.

+ */

+#define RCM_DATA "Custom Data"

+#define RCM_INIT "Custom Init"

+

+extern void _XtResourceConfigurationEH(

+	Widget 		/* w */, 

+	XtPointer 	/* client_data */, 

+	XEvent * 	/* event */

+);

+

+_XFUNCPROTOEND

+

+#endif

diff --git a/X11/ResourceI.h b/X11/ResourceI.h
index 3db97f83e..578a835cf 100644
--- a/X11/ResourceI.h
+++ b/X11/ResourceI.h
@@ -1,103 +1,100 @@
-/* $Xorg: ResourceI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */
-
-/****************************************************************
- *
- * Resources
- *
- ****************************************************************/
-
-#ifndef _XtresourceI_h
-#define _XtresourceI_h
-
-#define StringToQuark(string) XrmStringToQuark(string)
-#define StringToName(string) XrmStringToName(string)
-#define StringToClass(string) XrmStringToClass(string)
-
-_XFUNCPROTOBEGIN
-
-extern void _XtDependencies(
-    XtResourceList  * /* class_resp */,
-    Cardinal	    * /* class_num_resp */,
-    XrmResourceList * /* super_res */,
-    Cardinal	     /* super_num_res */,
-    Cardinal	     /* super_widget_size */);
-
-extern void _XtResourceDependencies(
-    WidgetClass  /* wc */
-);
-
-extern void _XtConstraintResDependencies(
-    ConstraintWidgetClass  /* wc */
-);
-
-extern XtCacheRef* _XtGetResources(
-    Widget	    /* w */,
-    ArgList	    /* args */,
-    Cardinal	    /* num_args */,
-    XtTypedArgList  /* typed_args */,
-    Cardinal*	    /* num_typed_args */
-);
-
-extern void _XtCopyFromParent(
-    Widget		/* widget */,
-    int			/* offset */,
-    XrmValue*		/* value */
-);
-
-extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size);
-extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size);
-extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
-						  Cardinal num_resources);
-extern void _XtResourceListInitialize(void);
-
-_XFUNCPROTOEND
-
-#endif /* _XtresourceI_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

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

+ *

+ * Resources

+ *

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

+

+#ifndef _XtresourceI_h

+#define _XtresourceI_h

+

+#define StringToQuark(string) XrmStringToQuark(string)

+#define StringToName(string) XrmStringToName(string)

+#define StringToClass(string) XrmStringToClass(string)

+

+_XFUNCPROTOBEGIN

+

+extern void _XtDependencies(

+    XtResourceList  * /* class_resp */,

+    Cardinal	    * /* class_num_resp */,

+    XrmResourceList * /* super_res */,

+    Cardinal	     /* super_num_res */,

+    Cardinal	     /* super_widget_size */);

+

+extern void _XtResourceDependencies(

+    WidgetClass  /* wc */

+);

+

+extern void _XtConstraintResDependencies(

+    ConstraintWidgetClass  /* wc */

+);

+

+extern XtCacheRef* _XtGetResources(

+    Widget	    /* w */,

+    ArgList	    /* args */,

+    Cardinal	    /* num_args */,

+    XtTypedArgList  /* typed_args */,

+    Cardinal*	    /* num_typed_args */

+);

+

+extern void _XtCopyFromParent(

+    Widget		/* widget */,

+    int			/* offset */,

+    XrmValue*		/* value */

+);

+

+extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size);

+extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size);

+extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,

+						  Cardinal num_resources);

+extern void _XtResourceListInitialize(void);

+

+_XFUNCPROTOEND

+

+#endif /* _XtresourceI_h */

diff --git a/X11/SelectionI.h b/X11/SelectionI.h
index e589aece5..ee819ddb3 100644
--- a/X11/SelectionI.h
+++ b/X11/SelectionI.h
@@ -1,170 +1,168 @@
-/* $Xorg: SelectionI.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-
-#ifndef _XtselectionI_h
-#define _XtselectionI_h
-
-#include "Intrinsic.h"
-
-typedef struct _RequestRec *Request;
-typedef struct _SelectRec *Select;
-
-typedef struct _RequestRec {
-   Select ctx;		      /* logical owner */
-   Widget widget;	      /* widget actually receiving Selection events */
-   Window requestor;
-   Atom property;
-   Atom target;
-   Atom type;
-   int format;
-   XtPointer value;
-   unsigned long bytelength;
-   unsigned long offset;
-   XtIntervalId timeout;
-   XSelectionRequestEvent event; /* for XtGetSelectionRequest */
-   Boolean allSent;
-} RequestRec;
-
-typedef struct {
-  Atom prop;
-  Boolean avail;
-} SelectionPropRec, *SelectionProp;
-
-typedef struct {
-  Display *dpy;
-  Atom incr_atom, indirect_atom, timestamp_atom;
-  int propCount;
-  SelectionProp list;
-} PropListRec, *PropList;
-
-typedef struct _SelectRec {
-    Atom selection; 			/* constant */
-    Display *dpy; 			/* constant */
-    Widget widget;
-    Time time;
-    unsigned long serial;
-    XtConvertSelectionProc convert;
-    XtLoseSelectionProc loses;
-    XtSelectionDoneProc notify;
-    XtCancelConvertSelectionProc owner_cancel;
-    XtPointer owner_closure;
-    PropList prop_list;
-    Request req;			/* state for local non-incr xfer */
-    int ref_count;			/* of active transfers */
-    unsigned int incremental:1;
-    unsigned int free_when_done:1;
-    unsigned int was_disowned:1;
-} SelectRec;
-
-typedef struct _ParamRec {
-    Atom selection;
-    Atom param;
-} ParamRec, *Param;
-
-typedef struct _ParamInfoRec {
-    unsigned int count;
-    Param paramlist;
-} ParamInfoRec, *ParamInfo;
-
-typedef struct _QueuedRequestRec {
-    Atom selection;
-    Atom target;
-    Atom param;
-    XtSelectionCallbackProc callback;
-    XtPointer closure;
-    Time time;
-    Boolean incremental;
-} QueuedRequestRec, *QueuedRequest;
-
-typedef struct _QueuedRequestInfoRec {
-    int count;
-    Atom *selections;
-    QueuedRequest *requests;
-} QueuedRequestInfoRec, *QueuedRequestInfo;
-
-typedef struct {
-    XtSelectionCallbackProc *callbacks;
-    XtPointer *req_closure;
-    Atom property;
-    Atom *target;
-    Atom type;
-    int format;
-    char *value;
-    int bytelength;
-    int offset;
-    XtIntervalId timeout;
-    XtEventHandler proc;
-    Widget widget;
-    Time time;
-    Select ctx;
-    Boolean *incremental;
-    int current;
-} CallBackInfoRec, *CallBackInfo;
-
-typedef struct {
-  Atom target;
-  Atom property;
-} IndirectPair;
-
-#define IndirectPairWordSize 2
-
-typedef struct {
-  int active_transfer_count;
-} RequestWindowRec;
-
-#define MAX_SELECTION_INCR(dpy) (((65536 < XMaxRequestSize(dpy)) ? \
-	(65536 << 2)  : (XMaxRequestSize(dpy) << 2))-100)
-
-#define MATCH_SELECT(event, info) ((event->time == info->time) && \
-	    (event->requestor == XtWindow(info->widget)) && \
-	    (event->selection == info->ctx->selection) && \
-	    (event->target == *info->target))
-
-#endif /* _XtselectionI_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XtselectionI_h

+#define _XtselectionI_h

+

+#include "Intrinsic.h"

+

+typedef struct _RequestRec *Request;

+typedef struct _SelectRec *Select;

+

+typedef struct _RequestRec {

+   Select ctx;		      /* logical owner */

+   Widget widget;	      /* widget actually receiving Selection events */

+   Window requestor;

+   Atom property;

+   Atom target;

+   Atom type;

+   int format;

+   XtPointer value;

+   unsigned long bytelength;

+   unsigned long offset;

+   XtIntervalId timeout;

+   XSelectionRequestEvent event; /* for XtGetSelectionRequest */

+   Boolean allSent;

+} RequestRec;

+

+typedef struct {

+  Atom prop;

+  Boolean avail;

+} SelectionPropRec, *SelectionProp;

+

+typedef struct {

+  Display *dpy;

+  Atom incr_atom, indirect_atom, timestamp_atom;

+  int propCount;

+  SelectionProp list;

+} PropListRec, *PropList;

+

+typedef struct _SelectRec {

+    Atom selection; 			/* constant */

+    Display *dpy; 			/* constant */

+    Widget widget;

+    Time time;

+    unsigned long serial;

+    XtConvertSelectionProc convert;

+    XtLoseSelectionProc loses;

+    XtSelectionDoneProc notify;

+    XtCancelConvertSelectionProc owner_cancel;

+    XtPointer owner_closure;

+    PropList prop_list;

+    Request req;			/* state for local non-incr xfer */

+    int ref_count;			/* of active transfers */

+    unsigned int incremental:1;

+    unsigned int free_when_done:1;

+    unsigned int was_disowned:1;

+} SelectRec;

+

+typedef struct _ParamRec {

+    Atom selection;

+    Atom param;

+} ParamRec, *Param;

+

+typedef struct _ParamInfoRec {

+    unsigned int count;

+    Param paramlist;

+} ParamInfoRec, *ParamInfo;

+

+typedef struct _QueuedRequestRec {

+    Atom selection;

+    Atom target;

+    Atom param;

+    XtSelectionCallbackProc callback;

+    XtPointer closure;

+    Time time;

+    Boolean incremental;

+} QueuedRequestRec, *QueuedRequest;

+

+typedef struct _QueuedRequestInfoRec {

+    int count;

+    Atom *selections;

+    QueuedRequest *requests;

+} QueuedRequestInfoRec, *QueuedRequestInfo;

+

+typedef struct {

+    XtSelectionCallbackProc *callbacks;

+    XtPointer *req_closure;

+    Atom property;

+    Atom *target;

+    Atom type;

+    int format;

+    char *value;

+    int bytelength;

+    int offset;

+    XtIntervalId timeout;

+    XtEventHandler proc;

+    Widget widget;

+    Time time;

+    Select ctx;

+    Boolean *incremental;

+    int current;

+} CallBackInfoRec, *CallBackInfo;

+

+typedef struct {

+  Atom target;

+  Atom property;

+} IndirectPair;

+

+#define IndirectPairWordSize 2

+

+typedef struct {

+  int active_transfer_count;

+} RequestWindowRec;

+

+#define MAX_SELECTION_INCR(dpy) (((65536 < XMaxRequestSize(dpy)) ? \

+	(65536 << 2)  : (XMaxRequestSize(dpy) << 2))-100)

+

+#define MATCH_SELECT(event, info) ((event->time == info->time) && \

+	    (event->requestor == XtWindow(info->widget)) && \

+	    (event->selection == info->ctx->selection) && \

+	    (event->target == *info->target))

+

+#endif /* _XtselectionI_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/Shell.h b/X11/Shell.h
index c864eb55e..129ac3953 100644
--- a/X11/Shell.h
+++ b/X11/Shell.h
@@ -1,5 +1,3 @@
-/* $Xorg: Shell.ht,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $ */

-

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

 

 Copyright 1987, 1988, 1994, 1998  The Open Group

@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 

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

-/* $XFree86: xc/lib/Xt/util/Shell.ht,v 3.4 2001/07/29 05:01:12 tsi Exp $ */

 

 #ifndef _XtShell_h

 #define _XtShell_h

@@ -72,8 +69,6 @@ SOFTWARE.
 /* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */

 /* This file is automatically generated. */

 /* Default ABI version -- Do not edit */

-/* Xorg: string.list,v 1.3 2000/08/17 19:46:22 cpqbld Exp */

-

 #ifdef XTSTRINGDEFINES

 #define XtNiconName "iconName"

 #define XtCIconName "IconName"

diff --git a/X11/ShellI.h b/X11/ShellI.h
index 6a093d791..34db03648 100644
--- a/X11/ShellI.h
+++ b/X11/ShellI.h
@@ -1,12 +1,10 @@
-/* $XFree86$ */
-
-#ifndef _XtShellInternal_h
-#define _XtShellInternal_h
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-extern void _XtShellGetCoordinates(Widget widget, Position *x, Position *y);
-
-#endif /* _XtShellInternal_h */
+#ifndef _XtShellInternal_h

+#define _XtShellInternal_h

+

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+extern void _XtShellGetCoordinates(Widget widget, Position *x, Position *y);

+

+#endif /* _XtShellInternal_h */

diff --git a/X11/ShellP.h b/X11/ShellP.h
index 6d2b44bae..ce7ae3785 100644
--- a/X11/ShellP.h
+++ b/X11/ShellP.h
@@ -1,438 +1,436 @@
-/* $Xorg: ShellP.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-
-/* 
- * ShellP.h - Private definitions for Shell widget
- * 
- * Author:	Paul Asente
- * 		Digital Equipment Corporation
- * 		Western Software Laboratory
- * Date:	Thu Dec 3, 1987
- */
-
-#ifndef _XtShellPrivate_h
-#define _XtShellPrivate_h
-
-#include <X11/Shell.h>
-
-/* *****
- * ***** VendorP.h is included later on; it needs fields defined in the first
- * ***** part of this header file
- * *****
- */
-
-_XFUNCPROTOBEGIN
-
-/***********************************************************************
- *
- * Shell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the Shell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} ShellClassPart;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 mandated for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; on ShellClassPart */
-    long version;		/* must be XtShellExtensionVersion */
-    Cardinal record_size;	/* sizeof(ShellClassExtensionRec) */
-    XtGeometryHandler root_geometry_manager;
-} ShellClassExtensionRec, *ShellClassExtension;
-
-#define XtShellExtensionVersion 1L
-#define XtInheritRootGeometryManager ((XtGeometryHandler)_XtInherit)
-
-typedef struct _ShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-} ShellClassRec;
-
-externalref ShellClassRec shellClassRec;
-
-/* New fields for the shell widget */
-
-typedef struct {
-	char       *geometry;
-	XtCreatePopupChildProc	create_popup_child_proc;
-	XtGrabKind	grab_kind;
-	Boolean	    spring_loaded;
-	Boolean	    popped_up;
-	Boolean	    allow_shell_resize;
-	Boolean     client_specified; /* re-using old name */
-#define _XtShellPositionValid	((Boolean)(1<<0))
-#define _XtShellNotReparented	((Boolean)(1<<1))
-#define _XtShellPPositionOK	((Boolean)(1<<2))
-#define _XtShellGeometryParsed	((Boolean)(1<<3))
-	Boolean	    save_under;
-	Boolean	    override_redirect;
-
-	XtCallbackList popup_callback;
-	XtCallbackList popdown_callback;
-	Visual*     visual;
-} ShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-} ShellRec, *ShellWidget;
-
-/***********************************************************************
- *
- * OverrideShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the OverrideShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} OverrideShellClassPart;
-
-typedef struct _OverrideShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	OverrideShellClassPart  override_shell_class;
-} OverrideShellClassRec;
-
-externalref OverrideShellClassRec overrideShellClassRec;
-
-/* No new fields for the override shell widget */
-
-typedef struct {int frabjous;} OverrideShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	OverrideShellPart override;
-} OverrideShellRec, *OverrideShellWidget;
-
-/***********************************************************************
- *
- * WMShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the WMShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} WMShellClassPart;
-
-typedef struct _WMShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart wm_shell_class;
-} WMShellClassRec;
-
-externalref WMShellClassRec wmShellClassRec;
-
-/* New fields for the WM shell widget */
-
-typedef struct {
-	char	   *title;
-	int 	    wm_timeout;
-	Boolean	    wait_for_wm;
-	Boolean	    transient;
-	Boolean     urgency;
-	Widget      client_leader;
-	String      window_role;
-	struct _OldXSizeHints {	/* pre-R4 Xlib structure */
-	    long flags;
-	    int x, y;
-	    int width, height;
-	    int min_width, min_height;
-	    int max_width, max_height;
-	    int width_inc, height_inc;
-	    struct {
-		    int x;
-		    int y;
-	    } min_aspect, max_aspect;
-	} size_hints;
-	XWMHints    wm_hints;
-	int base_width, base_height;
-	int win_gravity;
-	Atom title_encoding;
-} WMShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-} WMShellRec, *WMShellWidget;
-
-_XFUNCPROTOEND
-
-#include <X11/VendorP.h>
-
-_XFUNCPROTOBEGIN
-
-/***********************************************************************
- *
- * TransientShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the TransientShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} TransientShellClassPart;
-
-typedef struct _TransientShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TransientShellClassPart transient_shell_class;
-} TransientShellClassRec;
-
-externalref TransientShellClassRec transientShellClassRec;
-
-/* New fields for the transient shell widget */
-
-typedef struct {
-	Widget transient_for;
-} TransientShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TransientShellPart transient;	
-} TransientShellRec, *TransientShellWidget;
-
-/***********************************************************************
- *
- * TopLevelShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the TopLevelShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} TopLevelShellClassPart;
-
-typedef struct _TopLevelShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TopLevelShellClassPart top_level_shell_class;
-} TopLevelShellClassRec;
-
-externalref TopLevelShellClassRec topLevelShellClassRec;
-
-/* New fields for the top level shell widget */
-
-typedef struct {
-	char	   *icon_name;
-	Boolean	    iconic;
-	Atom	    icon_name_encoding;
-} TopLevelShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TopLevelShellPart topLevel;
-} TopLevelShellRec, *TopLevelShellWidget;
-
-/***********************************************************************
- *
- * ApplicationShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the ApplicationShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} ApplicationShellClassPart;
-
-typedef struct _ApplicationShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TopLevelShellClassPart top_level_shell_class;
-	ApplicationShellClassPart application_shell_class;
-} ApplicationShellClassRec;
-
-externalref ApplicationShellClassRec applicationShellClassRec;
-
-/* New fields for the application shell widget */
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    char *c_class;
-#else
-    char *class;
-#endif
-    XrmClass xrm_class;
-    int argc;
-    char **argv;
-} ApplicationShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TopLevelShellPart topLevel;
-	ApplicationShellPart application;
-} ApplicationShellRec, *ApplicationShellWidget;
-
-/***********************************************************************
- *
- * SessionShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the SessionShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record */
-} SessionShellClassPart;
-
-typedef struct _SessionShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TopLevelShellClassPart top_level_shell_class;
-	ApplicationShellClassPart application_shell_class;
-	SessionShellClassPart session_shell_class;
-} SessionShellClassRec;
-
-externalref SessionShellClassRec sessionShellClassRec;
-
-typedef struct _XtSaveYourselfRec *XtSaveYourself; /* implementation-private */
-
-/* New fields for the session shell widget */
-
-typedef struct {
-#ifndef XT_NO_SM
-    SmcConn         connection;
-#endif
-    String          session_id;
-    String*         restart_command;
-    String*         clone_command;
-    String*         discard_command;
-    String*         resign_command;
-    String*         shutdown_command;
-    String*         environment;
-    String          current_dir;
-    String          program_path;
-    unsigned char   restart_style;
-    unsigned char   checkpoint_state;
-    Boolean         join_session;
-    XtCallbackList  save_callbacks;
-    XtCallbackList  interact_callbacks;
-    XtCallbackList  cancel_callbacks;
-    XtCallbackList  save_complete_callbacks;
-    XtCallbackList  die_callbacks;
-    XtCallbackList  error_callbacks;
-    XtSaveYourself  save;
-    XtInputId       input_id;
-    XtPointer       ses20;
-    XtPointer       ses19;
-    XtPointer       ses18;
-    XtPointer       ses17;
-    XtPointer       ses16;
-    XtPointer       ses15;
-    XtPointer       ses14;
-    XtPointer       ses13;
-    XtPointer       ses12;
-    XtPointer       ses11;
-    XtPointer       ses10;
-    XtPointer       ses9;
-    XtPointer       ses8;
-    XtPointer       ses7;
-    XtPointer       ses6;
-    XtPointer       ses5;
-    XtPointer       ses4;
-    XtPointer       ses3;
-    XtPointer       ses2;
-    XtPointer       ses1;
-} SessionShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TopLevelShellPart topLevel;
-	ApplicationShellPart application;
-	SessionShellPart session;
-} SessionShellRec, *SessionShellWidget;
-
-_XFUNCPROTOEND
-
-#endif /* _XtShellPrivate_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+/* 

+ * ShellP.h - Private definitions for Shell widget

+ * 

+ * Author:	Paul Asente

+ * 		Digital Equipment Corporation

+ * 		Western Software Laboratory

+ * Date:	Thu Dec 3, 1987

+ */

+

+#ifndef _XtShellPrivate_h

+#define _XtShellPrivate_h

+

+#include <X11/Shell.h>

+

+/* *****

+ * ***** VendorP.h is included later on; it needs fields defined in the first

+ * ***** part of this header file

+ * *****

+ */

+

+_XFUNCPROTOBEGIN

+

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

+ *

+ * Shell Widget Private Data

+ *

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

+

+/* New fields for the Shell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} ShellClassPart;

+

+typedef struct {

+    XtPointer next_extension;	/* 1st 4 mandated for all extension records */

+    XrmQuark record_type;	/* NULLQUARK; on ShellClassPart */

+    long version;		/* must be XtShellExtensionVersion */

+    Cardinal record_size;	/* sizeof(ShellClassExtensionRec) */

+    XtGeometryHandler root_geometry_manager;

+} ShellClassExtensionRec, *ShellClassExtension;

+

+#define XtShellExtensionVersion 1L

+#define XtInheritRootGeometryManager ((XtGeometryHandler)_XtInherit)

+

+typedef struct _ShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+} ShellClassRec;

+

+externalref ShellClassRec shellClassRec;

+

+/* New fields for the shell widget */

+

+typedef struct {

+	char       *geometry;

+	XtCreatePopupChildProc	create_popup_child_proc;

+	XtGrabKind	grab_kind;

+	Boolean	    spring_loaded;

+	Boolean	    popped_up;

+	Boolean	    allow_shell_resize;

+	Boolean     client_specified; /* re-using old name */

+#define _XtShellPositionValid	((Boolean)(1<<0))

+#define _XtShellNotReparented	((Boolean)(1<<1))

+#define _XtShellPPositionOK	((Boolean)(1<<2))

+#define _XtShellGeometryParsed	((Boolean)(1<<3))

+	Boolean	    save_under;

+	Boolean	    override_redirect;

+

+	XtCallbackList popup_callback;

+	XtCallbackList popdown_callback;

+	Visual*     visual;

+} ShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+} ShellRec, *ShellWidget;

+

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

+ *

+ * OverrideShell Widget Private Data

+ *

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

+

+/* New fields for the OverrideShell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} OverrideShellClassPart;

+

+typedef struct _OverrideShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	OverrideShellClassPart  override_shell_class;

+} OverrideShellClassRec;

+

+externalref OverrideShellClassRec overrideShellClassRec;

+

+/* No new fields for the override shell widget */

+

+typedef struct {int frabjous;} OverrideShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	OverrideShellPart override;

+} OverrideShellRec, *OverrideShellWidget;

+

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

+ *

+ * WMShell Widget Private Data

+ *

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

+

+/* New fields for the WMShell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} WMShellClassPart;

+

+typedef struct _WMShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	WMShellClassPart wm_shell_class;

+} WMShellClassRec;

+

+externalref WMShellClassRec wmShellClassRec;

+

+/* New fields for the WM shell widget */

+

+typedef struct {

+	char	   *title;

+	int 	    wm_timeout;

+	Boolean	    wait_for_wm;

+	Boolean	    transient;

+	Boolean     urgency;

+	Widget      client_leader;

+	String      window_role;

+	struct _OldXSizeHints {	/* pre-R4 Xlib structure */

+	    long flags;

+	    int x, y;

+	    int width, height;

+	    int min_width, min_height;

+	    int max_width, max_height;

+	    int width_inc, height_inc;

+	    struct {

+		    int x;

+		    int y;

+	    } min_aspect, max_aspect;

+	} size_hints;

+	XWMHints    wm_hints;

+	int base_width, base_height;

+	int win_gravity;

+	Atom title_encoding;

+} WMShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	WMShellPart	wm;

+} WMShellRec, *WMShellWidget;

+

+_XFUNCPROTOEND

+

+#include <X11/VendorP.h>

+

+_XFUNCPROTOBEGIN

+

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

+ *

+ * TransientShell Widget Private Data

+ *

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

+

+/* New fields for the TransientShell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} TransientShellClassPart;

+

+typedef struct _TransientShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	WMShellClassPart   wm_shell_class;

+	VendorShellClassPart vendor_shell_class;

+	TransientShellClassPart transient_shell_class;

+} TransientShellClassRec;

+

+externalref TransientShellClassRec transientShellClassRec;

+

+/* New fields for the transient shell widget */

+

+typedef struct {

+	Widget transient_for;

+} TransientShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	WMShellPart	wm;

+	VendorShellPart	vendor;

+	TransientShellPart transient;	

+} TransientShellRec, *TransientShellWidget;

+

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

+ *

+ * TopLevelShell Widget Private Data

+ *

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

+

+/* New fields for the TopLevelShell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} TopLevelShellClassPart;

+

+typedef struct _TopLevelShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	WMShellClassPart   wm_shell_class;

+	VendorShellClassPart vendor_shell_class;

+	TopLevelShellClassPart top_level_shell_class;

+} TopLevelShellClassRec;

+

+externalref TopLevelShellClassRec topLevelShellClassRec;

+

+/* New fields for the top level shell widget */

+

+typedef struct {

+	char	   *icon_name;

+	Boolean	    iconic;

+	Atom	    icon_name_encoding;

+} TopLevelShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	WMShellPart	wm;

+	VendorShellPart	vendor;

+	TopLevelShellPart topLevel;

+} TopLevelShellRec, *TopLevelShellWidget;

+

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

+ *

+ * ApplicationShell Widget Private Data

+ *

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

+

+/* New fields for the ApplicationShell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} ApplicationShellClassPart;

+

+typedef struct _ApplicationShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	WMShellClassPart   wm_shell_class;

+	VendorShellClassPart vendor_shell_class;

+	TopLevelShellClassPart top_level_shell_class;

+	ApplicationShellClassPart application_shell_class;

+} ApplicationShellClassRec;

+

+externalref ApplicationShellClassRec applicationShellClassRec;

+

+/* New fields for the application shell widget */

+

+typedef struct {

+#if defined(__cplusplus) || defined(c_plusplus)

+    char *c_class;

+#else

+    char *class;

+#endif

+    XrmClass xrm_class;

+    int argc;

+    char **argv;

+} ApplicationShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	WMShellPart	wm;

+	VendorShellPart	vendor;

+	TopLevelShellPart topLevel;

+	ApplicationShellPart application;

+} ApplicationShellRec, *ApplicationShellWidget;

+

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

+ *

+ * SessionShell Widget Private Data

+ *

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

+

+/* New fields for the SessionShell widget class record */

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record */

+} SessionShellClassPart;

+

+typedef struct _SessionShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	WMShellClassPart   wm_shell_class;

+	VendorShellClassPart vendor_shell_class;

+	TopLevelShellClassPart top_level_shell_class;

+	ApplicationShellClassPart application_shell_class;

+	SessionShellClassPart session_shell_class;

+} SessionShellClassRec;

+

+externalref SessionShellClassRec sessionShellClassRec;

+

+typedef struct _XtSaveYourselfRec *XtSaveYourself; /* implementation-private */

+

+/* New fields for the session shell widget */

+

+typedef struct {

+#ifndef XT_NO_SM

+    SmcConn         connection;

+#endif

+    String          session_id;

+    String*         restart_command;

+    String*         clone_command;

+    String*         discard_command;

+    String*         resign_command;

+    String*         shutdown_command;

+    String*         environment;

+    String          current_dir;

+    String          program_path;

+    unsigned char   restart_style;

+    unsigned char   checkpoint_state;

+    Boolean         join_session;

+    XtCallbackList  save_callbacks;

+    XtCallbackList  interact_callbacks;

+    XtCallbackList  cancel_callbacks;

+    XtCallbackList  save_complete_callbacks;

+    XtCallbackList  die_callbacks;

+    XtCallbackList  error_callbacks;

+    XtSaveYourself  save;

+    XtInputId       input_id;

+    XtPointer       ses20;

+    XtPointer       ses19;

+    XtPointer       ses18;

+    XtPointer       ses17;

+    XtPointer       ses16;

+    XtPointer       ses15;

+    XtPointer       ses14;

+    XtPointer       ses13;

+    XtPointer       ses12;

+    XtPointer       ses11;

+    XtPointer       ses10;

+    XtPointer       ses9;

+    XtPointer       ses8;

+    XtPointer       ses7;

+    XtPointer       ses6;

+    XtPointer       ses5;

+    XtPointer       ses4;

+    XtPointer       ses3;

+    XtPointer       ses2;

+    XtPointer       ses1;

+} SessionShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	WMShellPart	wm;

+	VendorShellPart	vendor;

+	TopLevelShellPart topLevel;

+	ApplicationShellPart application;

+	SessionShellPart session;

+} SessionShellRec, *SessionShellWidget;

+

+_XFUNCPROTOEND

+

+#endif /* _XtShellPrivate_h */

diff --git a/X11/StringDefs.h b/X11/StringDefs.h
index 353a1be69..9f6c436e2 100644
--- a/X11/StringDefs.h
+++ b/X11/StringDefs.h
@@ -1,5 +1,3 @@
-/* $Xorg: StrDefs.ht,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */

-

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

 

 Copyright 1987, 1988, 1994, 1998  The Open Group

@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 

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

-/* $XFree86: xc/lib/Xt/util/StrDefs.ht,v 3.4 2001/07/29 05:01:12 tsi Exp $ */

 

 #ifndef _XtStringDefs_h_

 #define _XtStringDefs_h_

@@ -58,8 +55,6 @@ SOFTWARE.
 /* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */

 /* This file is automatically generated. */

 /* Default ABI version -- Do not edit */

-/* Xorg: string.list,v 1.3 2000/08/17 19:46:22 cpqbld Exp */

-

 #ifdef XTSTRINGDEFINES

 #define XtNaccelerators "accelerators"

 #define XtNallowHoriz "allowHoriz"

diff --git a/X11/ThreadsI.h b/X11/ThreadsI.h
index b1c51e73f..b6c6b7bac 100644
--- a/X11/ThreadsI.h
+++ b/X11/ThreadsI.h
@@ -1,131 +1,129 @@
-/* $Xorg: ThreadsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
-/************************************************************
-
-Copyright 1993 Sun Microsystems, Inc.  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 (including the next
-paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-
-********************************************************/
-
-/*
-
-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/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */
-
-#ifndef _XtThreadsI_h
-#define _XtThreadsI_h
-
-#include <X11/XlibConf.h>
-
-#ifdef XTHREADS
-
-typedef struct _LockRec *LockPtr;
-
-typedef void (*ThreadAppProc)(
-    XtAppContext /* app */
-);
-
-typedef void (*ThreadAppYieldLockProc)(
-    XtAppContext, /* app */
-    Boolean*, /* push_thread */
-    Boolean*, /* pushed_thread */
-    int* /* level */
-);
-
-typedef void (*ThreadAppRestoreLockProc)(
-    XtAppContext /* app */,
-    int, /* level */
-    Boolean* /* pushed_thread */
-);
-
-_XFUNCPROTOBEGIN
-
-extern void (*_XtProcessLock)(
-    void
-);
-
-extern void (*_XtProcessUnlock)(
-    void
-);
-
-extern void (*_XtInitAppLock)(
-    XtAppContext /* app */
-);
-
-_XFUNCPROTOEND
-
-#define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
-#define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
-
-#define LOCK_PROCESS if(_XtProcessLock)(*_XtProcessLock)()
-#define UNLOCK_PROCESS if(_XtProcessUnlock)(*_XtProcessUnlock)()
-#define LOCK_APP(app) if(app && app->lock)(*app->lock)(app)
-#define UNLOCK_APP(app) if(app && app->unlock)(*app->unlock)(app)
-
-#define YIELD_APP_LOCK(app,push,pushed,level)\
-	 if(app && app->yield_lock) (*app->yield_lock)(app,push,pushed,level)
-#define RESTORE_APP_LOCK(app,level,pushed)\
-	 if(app && app->restore_lock) (*app->restore_lock)(app,level,pushed)
-
-#define WIDGET_TO_APPCON(w) \
-    XtAppContext app = (w && _XtProcessLock ? \
-	XtWidgetToApplicationContext(w) : NULL)
-
-#define DPY_TO_APPCON(d) \
-    XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): NULL)
-
-#else /* defined(XTHREADS) */
-
-#define LOCK_PROCESS
-#define UNLOCK_PROCESS
-#define LOCK_APP(app)
-#define UNLOCK_APP(app)
-
-#define INIT_APP_LOCK(app)
-#define FREE_APP_LOCK(app)
-
-#define WIDGET_TO_APPCON(w)
-#define DPY_TO_APPCON(d)
-
-#endif /* !defined(XTHREADS) */
-#endif /* _XtThreadsI_h */
+/************************************************************

+

+Copyright (c) 1993, Oracle and/or its affiliates. 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 (including the next

+paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

+

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

+

+/*

+

+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/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */

+

+#ifndef _XtThreadsI_h

+#define _XtThreadsI_h

+

+#include <X11/XlibConf.h>

+

+#ifdef XTHREADS

+

+typedef struct _LockRec *LockPtr;

+

+typedef void (*ThreadAppProc)(

+    XtAppContext /* app */

+);

+

+typedef void (*ThreadAppYieldLockProc)(

+    XtAppContext, /* app */

+    Boolean*, /* push_thread */

+    Boolean*, /* pushed_thread */

+    int* /* level */

+);

+

+typedef void (*ThreadAppRestoreLockProc)(

+    XtAppContext /* app */,

+    int, /* level */

+    Boolean* /* pushed_thread */

+);

+

+_XFUNCPROTOBEGIN

+

+extern void (*_XtProcessLock)(

+    void

+);

+

+extern void (*_XtProcessUnlock)(

+    void

+);

+

+extern void (*_XtInitAppLock)(

+    XtAppContext /* app */

+);

+

+_XFUNCPROTOEND

+

+#define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)

+#define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)

+

+#define LOCK_PROCESS if(_XtProcessLock)(*_XtProcessLock)()

+#define UNLOCK_PROCESS if(_XtProcessUnlock)(*_XtProcessUnlock)()

+#define LOCK_APP(app) if(app && app->lock)(*app->lock)(app)

+#define UNLOCK_APP(app) if(app && app->unlock)(*app->unlock)(app)

+

+#define YIELD_APP_LOCK(app,push,pushed,level)\

+	 if(app && app->yield_lock) (*app->yield_lock)(app,push,pushed,level)

+#define RESTORE_APP_LOCK(app,level,pushed)\

+	 if(app && app->restore_lock) (*app->restore_lock)(app,level,pushed)

+

+#define WIDGET_TO_APPCON(w) \

+    XtAppContext app = (w && _XtProcessLock ? \

+	XtWidgetToApplicationContext(w) : NULL)

+

+#define DPY_TO_APPCON(d) \

+    XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): NULL)

+

+#else /* defined(XTHREADS) */

+

+#define LOCK_PROCESS

+#define UNLOCK_PROCESS

+#define LOCK_APP(app)

+#define UNLOCK_APP(app)

+

+#define INIT_APP_LOCK(app)

+#define FREE_APP_LOCK(app)

+

+#define WIDGET_TO_APPCON(w)

+#define DPY_TO_APPCON(d)

+

+#endif /* !defined(XTHREADS) */

+#endif /* _XtThreadsI_h */

diff --git a/X11/TranslateI.h b/X11/TranslateI.h
index 6cc3099cf..9894c3dd4 100644
--- a/X11/TranslateI.h
+++ b/X11/TranslateI.h
@@ -1,609 +1,606 @@
-/* $Xorg: TranslateI.h,v 1.4 2001/02/09 02:03:59 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.3 2001/12/14 19:56:32 dawes Exp $ */
-
-/* 
- * TranslateI.h - Header file private to translation management
- * 
- * Author:	Gabe Beged-Dov, HP
- *
- * Former Author:	Charles Haynes
- * 		Digital Equipment Corporation
- * 		Western Research Laboratory
- * Date:	Sat Aug 29 1987
- */
-
-/*#define REFCNT_TRANSLATIONS*/
-#define CACHE_TRANSLATIONS
-
-#define TM_NO_MATCH (-2)
-
-#define _XtRStateTablePair "_XtStateTablePair"
-
-typedef unsigned char TMByteCard;
-typedef unsigned short TMShortCard;
-typedef unsigned long TMLongCard;
-typedef short TMShortInt;
-
-typedef struct _TMTypeMatchRec *TMTypeMatch;
-typedef struct _TMModifierMatchRec *TMModifierMatch;
-typedef struct _TMEventRec *TMEventPtr;
-
-typedef Boolean (*MatchProc)(TMTypeMatch typeMatch,
-			     TMModifierMatch modMatch,
-			     TMEventPtr eventSeq);
-
-typedef struct _ModToKeysymTable {
-    Modifiers mask;
-    int count;
-    int idx;
-} ModToKeysymTable;
-
-typedef struct _LateBindings {
-    unsigned int knot:1;
-    unsigned int pair:1;
-    unsigned short ref_count;	/* garbage collection */
-    KeySym keysym;
-} LateBindings, *LateBindingsPtr;
-
-typedef short ModifierMask;
-
-typedef struct _ActionsRec *ActionPtr;
-typedef struct _ActionsRec {
-    int idx;			/* index into quarkTable to find proc */
-    String *params;		/* pointer to array of params */
-    Cardinal num_params;	/* number of params */
-    ActionPtr next;		/* next action to perform */
-} ActionRec;
-
-typedef struct _XtStateRec *StatePtr;
-typedef struct _XtStateRec {
-    unsigned int	isCycleStart:1;
-    unsigned int	isCycleEnd:1;
-    TMShortCard		typeIndex;
-    TMShortCard		modIndex;
-    ActionPtr		actions;	/* rhs list of actions to perform */
-    StatePtr 		nextLevel;
-}StateRec;
-
-
-#define XtTableReplace	0
-#define XtTableAugment	1
-#define XtTableOverride	2
-#define XtTableUnmerge  3
-
-typedef unsigned int _XtTranslateOp;
-
-/*
- * New Definitions
- */
-typedef struct _TMModifierMatchRec{
-    TMLongCard	 modifiers;
-    TMLongCard	 modifierMask;
-    LateBindingsPtr lateModifiers;
-    Boolean	 standard;
-}TMModifierMatchRec;
-
-typedef struct _TMTypeMatchRec{
-    TMLongCard	 eventType;
-    TMLongCard	 eventCode;
-    TMLongCard	 eventCodeMask;
-    MatchProc	 matchEvent;
-}TMTypeMatchRec;
-
-typedef struct _TMBranchHeadRec {
-    unsigned int	isSimple:1;
-    unsigned int	hasActions:1;
-    unsigned int	hasCycles:1;
-    unsigned int	more:13;
-    TMShortCard		typeIndex;
-    TMShortCard		modIndex;
-}TMBranchHeadRec, *TMBranchHead;
-
-/* NOTE: elements of this structure must match those of
- * TMComplexStateTreeRec and TMParseStateTreeRec.
- */
-typedef struct _TMSimpleStateTreeRec{
-    unsigned int	isSimple:1;
-    unsigned int	isAccelerator:1;
-    unsigned int	mappingNotifyInterest:1;
-    unsigned int	refCount:13;
-    TMShortCard		numBranchHeads;
-    TMShortCard		numQuarks;   /* # of entries in quarkTbl */
-    TMShortCard		unused;	     /* to ensure same alignment */
-    TMBranchHeadRec	*branchHeadTbl;
-    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/
-}TMSimpleStateTreeRec, *TMSimpleStateTree;
-
-/* NOTE: elements of this structure must match those of
- * TMSimpleStateTreeRec and TMParseStateTreeRec.
- */
-typedef struct _TMComplexStateTreeRec{
-    unsigned int	isSimple:1;
-    unsigned int	isAccelerator:1;
-    unsigned int	mappingNotifyInterest:1;
-    unsigned int	refCount:13;
-    TMShortCard		numBranchHeads;
-    TMShortCard		numQuarks;   /* # of entries in quarkTbl */
-    TMShortCard		numComplexBranchHeads;
-    TMBranchHeadRec	*branchHeadTbl;
-    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/
-    StatePtr		*complexBranchHeadTbl;
-}TMComplexStateTreeRec, *TMComplexStateTree;
-
-/* NOTE: elements of this structure must match those of
- * TMSimpleStateTreeRec and TMComplexStateTreeRec.
- */
-typedef struct _TMParseStateTreeRec{
-    unsigned int	isSimple:1;
-    unsigned int	isAccelerator:1;
-    unsigned int	mappingNotifyInterest:1;
-    unsigned int	isStackQuarks:1;
-    unsigned int	isStackBranchHeads:1;
-    unsigned int	isStackComplexBranchHeads:1;
-    unsigned int	unused:10; /* to ensure correct alignment */
-    TMShortCard		numBranchHeads;
-    TMShortCard		numQuarks;   /* # of entries in quarkTbl */
-    TMShortCard		numComplexBranchHeads;
-    TMBranchHeadRec	*branchHeadTbl;
-    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/
-    StatePtr		*complexBranchHeadTbl;
-    TMShortCard		branchHeadTblSize;
-    TMShortCard		quarkTblSize; /*total size of quarkTbl */
-    TMShortCard		complexBranchHeadTblSize;
-    StatePtr		head;
-}TMParseStateTreeRec, *TMParseStateTree;
-
-typedef union _TMStateTreeRec{
-    TMSimpleStateTreeRec	simple;
-    TMParseStateTreeRec		parse;
-    TMComplexStateTreeRec	complex;
-}*TMStateTree, **TMStateTreePtr, **TMStateTreeList;
-
-typedef struct _TMSimpleBindProcsRec {
-    XtActionProc	*procs;
-}TMSimpleBindProcsRec, *TMSimpleBindProcs;
-
-typedef struct _TMComplexBindProcsRec {
-    Widget	 	widget;		/*widgetID to pass to action Proc*/
-    XtTranslations	aXlations;
-    XtActionProc	*procs;
-}TMComplexBindProcsRec, *TMComplexBindProcs;
-
-typedef struct _TMSimpleBindDataRec {
-    unsigned int		isComplex:1;	/* must be first */
-    TMSimpleBindProcsRec	bindTbl[1];	/* variable length */
-}TMSimpleBindDataRec, *TMSimpleBindData;
-
-typedef struct _TMComplexBindDataRec {
-    unsigned int		isComplex:1;	/* must be first */
-    struct _ATranslationData	*accel_context;	/* for GetValues */
-    TMComplexBindProcsRec	bindTbl[1]; 	/* variable length */
-}TMComplexBindDataRec, *TMComplexBindData;
-
-typedef union _TMBindDataRec{
-    TMSimpleBindDataRec		simple;
-    TMComplexBindDataRec	complex;
-}*TMBindData;
-
-typedef struct _TranslationData{
-    unsigned char		hasBindings;	/* must be first */
-    unsigned char		operation; /*replace,augment,override*/
-    TMShortCard			numStateTrees;
-    struct _TranslationData    	*composers[2];
-    EventMask			eventMask;
-    TMStateTree			stateTreeTbl[1]; /* variable length */
-}TranslationData;
-
-/*
- * ATranslations is returned by GetValues for translations that contain
- * accelerators.  The TM can differentiate between this and TranslationData
- * (that don't have a bindTbl) by looking at the first field (hasBindings)
- * of either structure.  All ATranslationData structures associated with a
- * widget are chained off the BindData record of the widget.
- */
-typedef struct _ATranslationData{
-    unsigned char		hasBindings;	/* must be first */
-    unsigned char		operation;
-    struct _TranslationData	*xlations;  /* actual translations */
-    struct _ATranslationData	*next;      /* chain the contexts together */
-    TMComplexBindProcsRec	bindTbl[1]; /* accelerator bindings */
-}ATranslationData, *ATranslations;
-
-typedef struct _TMConvertRec {
-    XtTranslations	old; /* table to merge into */
-    XtTranslations	new; /* table to merge from */
-} TMConvertRec;
-
-#define _XtEventTimerEventType ((TMLongCard)~0L)
-#define KeysymModMask		(1L<<27) /* private to TM */
-#define AnyButtonMask		(1L<<28) /* private to TM */
-
-typedef struct _EventRec {
-    TMLongCard modifiers;
-    TMLongCard modifierMask;
-    LateBindingsPtr lateModifiers;
-    TMLongCard eventType;
-    TMLongCard eventCode;
-    TMLongCard eventCodeMask;
-    MatchProc matchEvent;
-    Boolean standard;
-} Event;
-
-typedef struct _EventSeqRec *EventSeqPtr;
-typedef struct _EventSeqRec {
-    Event event;	/* X event description */
-    StatePtr state;	/* private to state table builder */
-    EventSeqPtr next;	/* next event on line */
-    ActionPtr actions;	/* r.h.s.   list of actions to perform */
-} EventSeqRec;
-
-typedef EventSeqRec EventRec;
-typedef EventSeqPtr EventPtr;
-
-typedef struct _TMEventRec {
-    XEvent *xev;
-    Event event;
-}TMEventRec;
-
-typedef struct _ActionHookRec {
-    struct _ActionHookRec* next; /* must remain first */
-    XtAppContext app;
-    XtActionHookProc proc;
-    XtPointer closure;
-} ActionHookRec, *ActionHook;
-
-/* choose a number between 2 and 8 */
-#define TMKEYCACHELOG2 6
-#define TMKEYCACHESIZE (1<<TMKEYCACHELOG2)
-
-typedef struct _KeyCacheRec {
-    unsigned char modifiers_return[256]; /* constant per KeyCode, key proc */
-    KeyCode keycode[TMKEYCACHESIZE];
-    unsigned char modifiers[TMKEYCACHESIZE];
-    KeySym keysym[TMKEYCACHESIZE];
-} TMKeyCache;
-
-typedef struct _TMKeyContextRec {
-    XEvent *event;
-    unsigned long serial;
-    KeySym keysym;
-    Modifiers modifiers;
-    TMKeyCache keycache;  /* keep this last, to keep offsets to others small */
-} TMKeyContextRec, *TMKeyContext;
-
-typedef struct _TMGlobalRec{
-    TMTypeMatchRec 		**typeMatchSegmentTbl;
-    TMShortCard			numTypeMatches;
-    TMShortCard			numTypeMatchSegments;
-    TMShortCard			typeMatchSegmentTblSize;
-    TMModifierMatchRec 		**modMatchSegmentTbl;
-    TMShortCard			numModMatches;
-    TMShortCard			numModMatchSegments;
-    TMShortCard			modMatchSegmentTblSize;
-    Boolean			newMatchSemantics;
-#ifdef TRACE_TM
-    XtTranslations		*tmTbl;
-    TMShortCard			numTms;
-    TMShortCard			tmTblSize;
-    struct _TMBindCacheRec	**bindCacheTbl;
-    TMShortCard			numBindCache;
-    TMShortCard			bindCacheTblSize;
-    TMShortCard			numLateBindings;
-    TMShortCard			numBranchHeads;
-    TMShortCard			numComplexStates;
-    TMShortCard			numComplexActions;
-#endif /* TRACE_TM */
-}TMGlobalRec;
-
-_XFUNCPROTOBEGIN
-
-extern TMGlobalRec _XtGlobalTM;
-
-#define TM_MOD_SEGMENT_SIZE 	16
-#define TM_TYPE_SEGMENT_SIZE 	16
-
-#define TMGetTypeMatch(idx) \
-  ((TMTypeMatch) \
-   &((_XtGlobalTM.typeMatchSegmentTbl[((idx) >> 4)])[(idx) & 15]))
-#define TMGetModifierMatch(idx) \
-  ((TMModifierMatch) \
-   &((_XtGlobalTM.modMatchSegmentTbl[(idx) >> 4])[(idx) & 15]))
-
-/* Useful Access Macros */
-#define TMNewMatchSemantics() (_XtGlobalTM.newMatchSemantics)
-#define TMBranchMore(branch) (branch->more)
-#define TMComplexBranchHead(tree, br) \
-  (((TMComplexStateTree)tree)->complexBranchHeadTbl[TMBranchMore(br)])
-
-#define TMGetComplexBindEntry(bindData, idx) \
-  ((TMComplexBindProcs)&(((TMComplexBindData)bindData)->bindTbl[idx]))
-
-#define TMGetSimpleBindEntry(bindData, idx) \
-  ((TMSimpleBindProcs)&(((TMSimpleBindData)bindData)->bindTbl[idx]))
-
-
-#define _InitializeKeysymTables(dpy, pd) \
-    if (pd->keysyms == NULL) \
-        _XtBuildKeysymTables(dpy, pd)
-
-/*
- * Internal Functions
- */
-
-extern void _XtPopup(
-    Widget      /* widget */,
-    XtGrabKind  /* grab_kind */,
-    _XtBoolean	/* spring_loaded */
-);
-
-extern String _XtPrintXlations(
-    Widget		/* w */,
-    XtTranslations 	/* xlations */,
-    Widget		/* accelWidget */,
-    _XtBoolean		/* includeRHS */
-);
-
-extern void _XtRegisterGrabs(
-    Widget	/* widget */
-);
-
-extern XtPointer _XtInitializeActionData(
-    struct _XtActionsRec *	/* actions */,
-    Cardinal 			/* count */,
-    _XtBoolean			/* inPlace */
-);
-
-extern void _XtAddEventSeqToStateTree(
-    EventSeqPtr		/* eventSeq */,
-    TMParseStateTree	/* stateTree */
-);
-
-extern Boolean _XtMatchUsingStandardMods(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern Boolean _XtMatchUsingDontCareMods(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern Boolean _XtRegularMatch(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern Boolean _XtMatchAtom(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern void _XtTranslateEvent(
-    Widget		/* widget */,
-    XEvent*		/* event */
-);
-
-#include "CallbackI.h"
-#include "EventI.h"
-#include "HookObjI.h"
-#include "PassivGraI.h"
-#include "ThreadsI.h"
-#include "InitialI.h"
-#include "ResourceI.h"
-#include "StringDefs.h"
-
-extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd);
-
-#ifndef NO_MIT_HACKS
-extern void  _XtDisplayTranslations(
-    Widget		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void  _XtDisplayAccelerators(
-    Widget		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void _XtDisplayInstalledAccelerators(
-    Widget		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-#endif /* ifndef NO_MIT_HACKS */
-
-extern void _XtPopupInitialize(
-    XtAppContext	/* app_context */
-);
-
-extern void _XtBindActions(
-    Widget	/* widget */,
-    XtTM 	/* tm_rec */
-);
-
-extern Boolean _XtComputeLateBindings(
-    Display*		/* dpy */,
-    LateBindingsPtr	/* lateModifiers */,
-    Modifiers*		/* computed */,
-    Modifiers*		/* computedMask */
-);
-
-extern XtTranslations _XtCreateXlations(
-    TMStateTree *	/* stateTrees */,
-    TMShortCard		/* numStateTrees */,
-    XtTranslations 	/* first */,
-    XtTranslations	/* second */
-);
-
-extern Boolean _XtCvtMergeTranslations(
-    Display*	/* dpy */,
-    XrmValuePtr	/* args */,
-    Cardinal*	/* num_args */,
-    XrmValuePtr	/* from */,
-    XrmValuePtr	/* to */,
-    XtPointer*	/* closure_ret */
-);
-
-void _XtRemoveStateTreeByIndex(
-    XtTranslations	/* xlations */,
-    TMShortCard	/* i */);
-
-void _XtFreeTranslations(
-    XtAppContext	/* app */,
-    XrmValuePtr		/* toVal */,
-    XtPointer		/* closure */,
-    XrmValuePtr		/* args */,
-    Cardinal*		/* num_args */
-);
-
-extern TMShortCard _XtGetModifierIndex(
-    Event*	/* event */
-);
-
-extern TMShortCard _XtGetQuarkIndex(
-    TMParseStateTree	/* stateTreePtr */,
-    XrmQuark		/* quark */
-);
-
-extern XtTranslations _XtGetTranslationValue(
-    Widget		/* widget */
-);
-
-extern TMShortCard _XtGetTypeIndex(
-    Event*	/* event */
-);
-
-extern void _XtGrabInitialize(
-    XtAppContext	/* app */
-);
-
-extern void _XtInstallTranslations(
-    Widget		/* widget */
-);
-
-extern void _XtRemoveTranslations(
-    Widget		/* widget */
-);
-
-extern void _XtDestroyTMData(
-    Widget		/* widget */
-);
-
-extern void _XtMergeTranslations(
-    Widget		/* widget */,
-    XtTranslations	/* newXlations */,
-    _XtTranslateOp	/* operation */
-);
-
-extern void _XtActionInitialize(
-    XtAppContext	/* app */
-);
-
-extern TMStateTree _XtParseTreeToStateTree(
-    TMParseStateTree 	/* parseTree */
-);
-
-extern String _XtPrintActions(
-    ActionRec*	/* actions */,
-    XrmQuark*	/* quarkTbl */
-);
-
-extern String _XtPrintState(
-    TMStateTree	/* stateTree */,
-    TMBranchHead /* branchHead */);
-
-extern String _XtPrintEventSeq(
-    EventSeqPtr	/* eventSeq */,
-    Display*	/* dpy */
-);
-
-typedef Boolean (*_XtTraversalProc)(
-    StatePtr	/* state */,
-    XtPointer	/* data */
-);
-
-extern void _XtTraverseStateTree(
-    TMStateTree		/* tree */,
-    _XtTraversalProc	/* func */,
-    XtPointer		/* data */
-);
-
-extern void _XtTranslateInitialize(
-    void
-);
-
-extern void _XtAddTMConverters(
-    ConverterTable	/* table */
-);
-
-extern void _XtUnbindActions(
-    Widget		/* widget */,
-    XtTranslations	/* xlations */,
-    TMBindData		/* bindData */
-);
-
-extern void _XtUnmergeTranslations(
-    Widget		/* widget */,
-    XtTranslations 	/* xlations */
-);
-
-/* TMKey.c */
-extern void _XtAllocTMContext(XtPerDisplay pd);
-
-_XFUNCPROTOEND
+/***********************************************************

+

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

+

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

+

+/* 

+ * TranslateI.h - Header file private to translation management

+ * 

+ * Author:	Gabe Beged-Dov, HP

+ *

+ * Former Author:	Charles Haynes

+ * 		Digital Equipment Corporation

+ * 		Western Research Laboratory

+ * Date:	Sat Aug 29 1987

+ */

+

+/*#define REFCNT_TRANSLATIONS*/

+#define CACHE_TRANSLATIONS

+

+#define TM_NO_MATCH (-2)

+

+#define _XtRStateTablePair "_XtStateTablePair"

+

+typedef unsigned char TMByteCard;

+typedef unsigned short TMShortCard;

+typedef unsigned long TMLongCard;

+typedef short TMShortInt;

+

+typedef struct _TMTypeMatchRec *TMTypeMatch;

+typedef struct _TMModifierMatchRec *TMModifierMatch;

+typedef struct _TMEventRec *TMEventPtr;

+

+typedef Boolean (*MatchProc)(TMTypeMatch typeMatch,

+			     TMModifierMatch modMatch,

+			     TMEventPtr eventSeq);

+

+typedef struct _ModToKeysymTable {

+    Modifiers mask;

+    int count;

+    int idx;

+} ModToKeysymTable;

+

+typedef struct _LateBindings {

+    unsigned int knot:1;

+    unsigned int pair:1;

+    unsigned short ref_count;	/* garbage collection */

+    KeySym keysym;

+} LateBindings, *LateBindingsPtr;

+

+typedef short ModifierMask;

+

+typedef struct _ActionsRec *ActionPtr;

+typedef struct _ActionsRec {

+    int idx;			/* index into quarkTable to find proc */

+    String *params;		/* pointer to array of params */

+    Cardinal num_params;	/* number of params */

+    ActionPtr next;		/* next action to perform */

+} ActionRec;

+

+typedef struct _XtStateRec *StatePtr;

+typedef struct _XtStateRec {

+    unsigned int	isCycleStart:1;

+    unsigned int	isCycleEnd:1;

+    TMShortCard		typeIndex;

+    TMShortCard		modIndex;

+    ActionPtr		actions;	/* rhs list of actions to perform */

+    StatePtr 		nextLevel;

+}StateRec;

+

+

+#define XtTableReplace	0

+#define XtTableAugment	1

+#define XtTableOverride	2

+#define XtTableUnmerge  3

+

+typedef unsigned int _XtTranslateOp;

+

+/*

+ * New Definitions

+ */

+typedef struct _TMModifierMatchRec{

+    TMLongCard	 modifiers;

+    TMLongCard	 modifierMask;

+    LateBindingsPtr lateModifiers;

+    Boolean	 standard;

+}TMModifierMatchRec;

+

+typedef struct _TMTypeMatchRec{

+    TMLongCard	 eventType;

+    TMLongCard	 eventCode;

+    TMLongCard	 eventCodeMask;

+    MatchProc	 matchEvent;

+}TMTypeMatchRec;

+

+typedef struct _TMBranchHeadRec {

+    unsigned int	isSimple:1;

+    unsigned int	hasActions:1;

+    unsigned int	hasCycles:1;

+    unsigned int	more:13;

+    TMShortCard		typeIndex;

+    TMShortCard		modIndex;

+}TMBranchHeadRec, *TMBranchHead;

+

+/* NOTE: elements of this structure must match those of

+ * TMComplexStateTreeRec and TMParseStateTreeRec.

+ */

+typedef struct _TMSimpleStateTreeRec{

+    unsigned int	isSimple:1;

+    unsigned int	isAccelerator:1;

+    unsigned int	mappingNotifyInterest:1;

+    unsigned int	refCount:13;

+    TMShortCard		numBranchHeads;

+    TMShortCard		numQuarks;   /* # of entries in quarkTbl */

+    TMShortCard		unused;	     /* to ensure same alignment */

+    TMBranchHeadRec	*branchHeadTbl;

+    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/

+}TMSimpleStateTreeRec, *TMSimpleStateTree;

+

+/* NOTE: elements of this structure must match those of

+ * TMSimpleStateTreeRec and TMParseStateTreeRec.

+ */

+typedef struct _TMComplexStateTreeRec{

+    unsigned int	isSimple:1;

+    unsigned int	isAccelerator:1;

+    unsigned int	mappingNotifyInterest:1;

+    unsigned int	refCount:13;

+    TMShortCard		numBranchHeads;

+    TMShortCard		numQuarks;   /* # of entries in quarkTbl */

+    TMShortCard		numComplexBranchHeads;

+    TMBranchHeadRec	*branchHeadTbl;

+    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/

+    StatePtr		*complexBranchHeadTbl;

+}TMComplexStateTreeRec, *TMComplexStateTree;

+

+/* NOTE: elements of this structure must match those of

+ * TMSimpleStateTreeRec and TMComplexStateTreeRec.

+ */

+typedef struct _TMParseStateTreeRec{

+    unsigned int	isSimple:1;

+    unsigned int	isAccelerator:1;

+    unsigned int	mappingNotifyInterest:1;

+    unsigned int	isStackQuarks:1;

+    unsigned int	isStackBranchHeads:1;

+    unsigned int	isStackComplexBranchHeads:1;

+    unsigned int	unused:10; /* to ensure correct alignment */

+    TMShortCard		numBranchHeads;

+    TMShortCard		numQuarks;   /* # of entries in quarkTbl */

+    TMShortCard		numComplexBranchHeads;

+    TMBranchHeadRec	*branchHeadTbl;

+    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/

+    StatePtr		*complexBranchHeadTbl;

+    TMShortCard		branchHeadTblSize;

+    TMShortCard		quarkTblSize; /*total size of quarkTbl */

+    TMShortCard		complexBranchHeadTblSize;

+    StatePtr		head;

+}TMParseStateTreeRec, *TMParseStateTree;

+

+typedef union _TMStateTreeRec{

+    TMSimpleStateTreeRec	simple;

+    TMParseStateTreeRec		parse;

+    TMComplexStateTreeRec	complex;

+}*TMStateTree, **TMStateTreePtr, **TMStateTreeList;

+

+typedef struct _TMSimpleBindProcsRec {

+    XtActionProc	*procs;

+}TMSimpleBindProcsRec, *TMSimpleBindProcs;

+

+typedef struct _TMComplexBindProcsRec {

+    Widget	 	widget;		/*widgetID to pass to action Proc*/

+    XtTranslations	aXlations;

+    XtActionProc	*procs;

+}TMComplexBindProcsRec, *TMComplexBindProcs;

+

+typedef struct _TMSimpleBindDataRec {

+    unsigned int		isComplex:1;	/* must be first */

+    TMSimpleBindProcsRec	bindTbl[1];	/* variable length */

+}TMSimpleBindDataRec, *TMSimpleBindData;

+

+typedef struct _TMComplexBindDataRec {

+    unsigned int		isComplex:1;	/* must be first */

+    struct _ATranslationData	*accel_context;	/* for GetValues */

+    TMComplexBindProcsRec	bindTbl[1]; 	/* variable length */

+}TMComplexBindDataRec, *TMComplexBindData;

+

+typedef union _TMBindDataRec{

+    TMSimpleBindDataRec		simple;

+    TMComplexBindDataRec	complex;

+}*TMBindData;

+

+typedef struct _TranslationData{

+    unsigned char		hasBindings;	/* must be first */

+    unsigned char		operation; /*replace,augment,override*/

+    TMShortCard			numStateTrees;

+    struct _TranslationData    	*composers[2];

+    EventMask			eventMask;

+    TMStateTree			stateTreeTbl[1]; /* variable length */

+}TranslationData;

+

+/*

+ * ATranslations is returned by GetValues for translations that contain

+ * accelerators.  The TM can differentiate between this and TranslationData

+ * (that don't have a bindTbl) by looking at the first field (hasBindings)

+ * of either structure.  All ATranslationData structures associated with a

+ * widget are chained off the BindData record of the widget.

+ */

+typedef struct _ATranslationData{

+    unsigned char		hasBindings;	/* must be first */

+    unsigned char		operation;

+    struct _TranslationData	*xlations;  /* actual translations */

+    struct _ATranslationData	*next;      /* chain the contexts together */

+    TMComplexBindProcsRec	bindTbl[1]; /* accelerator bindings */

+}ATranslationData, *ATranslations;

+

+typedef struct _TMConvertRec {

+    XtTranslations	old; /* table to merge into */

+    XtTranslations	new; /* table to merge from */

+} TMConvertRec;

+

+#define _XtEventTimerEventType ((TMLongCard)~0L)

+#define KeysymModMask		(1L<<27) /* private to TM */

+#define AnyButtonMask		(1L<<28) /* private to TM */

+

+typedef struct _EventRec {

+    TMLongCard modifiers;

+    TMLongCard modifierMask;

+    LateBindingsPtr lateModifiers;

+    TMLongCard eventType;

+    TMLongCard eventCode;

+    TMLongCard eventCodeMask;

+    MatchProc matchEvent;

+    Boolean standard;

+} Event;

+

+typedef struct _EventSeqRec *EventSeqPtr;

+typedef struct _EventSeqRec {

+    Event event;	/* X event description */

+    StatePtr state;	/* private to state table builder */

+    EventSeqPtr next;	/* next event on line */

+    ActionPtr actions;	/* r.h.s.   list of actions to perform */

+} EventSeqRec;

+

+typedef EventSeqRec EventRec;

+typedef EventSeqPtr EventPtr;

+

+typedef struct _TMEventRec {

+    XEvent *xev;

+    Event event;

+}TMEventRec;

+

+typedef struct _ActionHookRec {

+    struct _ActionHookRec* next; /* must remain first */

+    XtAppContext app;

+    XtActionHookProc proc;

+    XtPointer closure;

+} ActionHookRec, *ActionHook;

+

+/* choose a number between 2 and 8 */

+#define TMKEYCACHELOG2 6

+#define TMKEYCACHESIZE (1<<TMKEYCACHELOG2)

+

+typedef struct _KeyCacheRec {

+    unsigned char modifiers_return[256]; /* constant per KeyCode, key proc */

+    KeyCode keycode[TMKEYCACHESIZE];

+    unsigned char modifiers[TMKEYCACHESIZE];

+    KeySym keysym[TMKEYCACHESIZE];

+} TMKeyCache;

+

+typedef struct _TMKeyContextRec {

+    XEvent *event;

+    unsigned long serial;

+    KeySym keysym;

+    Modifiers modifiers;

+    TMKeyCache keycache;  /* keep this last, to keep offsets to others small */

+} TMKeyContextRec, *TMKeyContext;

+

+typedef struct _TMGlobalRec{

+    TMTypeMatchRec 		**typeMatchSegmentTbl;

+    TMShortCard			numTypeMatches;

+    TMShortCard			numTypeMatchSegments;

+    TMShortCard			typeMatchSegmentTblSize;

+    TMModifierMatchRec 		**modMatchSegmentTbl;

+    TMShortCard			numModMatches;

+    TMShortCard			numModMatchSegments;

+    TMShortCard			modMatchSegmentTblSize;

+    Boolean			newMatchSemantics;

+#ifdef TRACE_TM

+    XtTranslations		*tmTbl;

+    TMShortCard			numTms;

+    TMShortCard			tmTblSize;

+    struct _TMBindCacheRec	**bindCacheTbl;

+    TMShortCard			numBindCache;

+    TMShortCard			bindCacheTblSize;

+    TMShortCard			numLateBindings;

+    TMShortCard			numBranchHeads;

+    TMShortCard			numComplexStates;

+    TMShortCard			numComplexActions;

+#endif /* TRACE_TM */

+}TMGlobalRec;

+

+_XFUNCPROTOBEGIN

+

+extern TMGlobalRec _XtGlobalTM;

+

+#define TM_MOD_SEGMENT_SIZE 	16

+#define TM_TYPE_SEGMENT_SIZE 	16

+

+#define TMGetTypeMatch(idx) \

+  ((TMTypeMatch) \

+   &((_XtGlobalTM.typeMatchSegmentTbl[((idx) >> 4)])[(idx) & 15]))

+#define TMGetModifierMatch(idx) \

+  ((TMModifierMatch) \

+   &((_XtGlobalTM.modMatchSegmentTbl[(idx) >> 4])[(idx) & 15]))

+

+/* Useful Access Macros */

+#define TMNewMatchSemantics() (_XtGlobalTM.newMatchSemantics)

+#define TMBranchMore(branch) (branch->more)

+#define TMComplexBranchHead(tree, br) \

+  (((TMComplexStateTree)tree)->complexBranchHeadTbl[TMBranchMore(br)])

+

+#define TMGetComplexBindEntry(bindData, idx) \

+  ((TMComplexBindProcs)&(((TMComplexBindData)bindData)->bindTbl[idx]))

+

+#define TMGetSimpleBindEntry(bindData, idx) \

+  ((TMSimpleBindProcs)&(((TMSimpleBindData)bindData)->bindTbl[idx]))

+

+

+#define _InitializeKeysymTables(dpy, pd) \

+    if (pd->keysyms == NULL) \

+        _XtBuildKeysymTables(dpy, pd)

+

+/*

+ * Internal Functions

+ */

+

+extern void _XtPopup(

+    Widget      /* widget */,

+    XtGrabKind  /* grab_kind */,

+    _XtBoolean	/* spring_loaded */

+);

+

+extern String _XtPrintXlations(

+    Widget		/* w */,

+    XtTranslations 	/* xlations */,

+    Widget		/* accelWidget */,

+    _XtBoolean		/* includeRHS */

+);

+

+extern void _XtRegisterGrabs(

+    Widget	/* widget */

+);

+

+extern XtPointer _XtInitializeActionData(

+    struct _XtActionsRec *	/* actions */,

+    Cardinal 			/* count */,

+    _XtBoolean			/* inPlace */

+);

+

+extern void _XtAddEventSeqToStateTree(

+    EventSeqPtr		/* eventSeq */,

+    TMParseStateTree	/* stateTree */

+);

+

+extern Boolean _XtMatchUsingStandardMods(

+    TMTypeMatch		/* typeMatch */,

+    TMModifierMatch	/* modMatch */,

+    TMEventPtr		/* eventSeq */

+);

+

+extern Boolean _XtMatchUsingDontCareMods(

+    TMTypeMatch		/* typeMatch */,

+    TMModifierMatch	/* modMatch */,

+    TMEventPtr		/* eventSeq */

+);

+

+extern Boolean _XtRegularMatch(

+    TMTypeMatch		/* typeMatch */,

+    TMModifierMatch	/* modMatch */,

+    TMEventPtr		/* eventSeq */

+);

+

+extern Boolean _XtMatchAtom(

+    TMTypeMatch		/* typeMatch */,

+    TMModifierMatch	/* modMatch */,

+    TMEventPtr		/* eventSeq */

+);

+

+extern void _XtTranslateEvent(

+    Widget		/* widget */,

+    XEvent*		/* event */

+);

+

+#include "CallbackI.h"

+#include "EventI.h"

+#include "HookObjI.h"

+#include "PassivGraI.h"

+#include "ThreadsI.h"

+#include "InitialI.h"

+#include "ResourceI.h"

+#include "StringDefs.h"

+

+extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd);

+

+#ifndef NO_MIT_HACKS

+extern void  _XtDisplayTranslations(

+    Widget		/* widget */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern void  _XtDisplayAccelerators(

+    Widget		/* widget */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+

+extern void _XtDisplayInstalledAccelerators(

+    Widget		/* widget */,

+    XEvent*		/* event */,

+    String*		/* params */,

+    Cardinal*		/* num_params */

+);

+#endif /* ifndef NO_MIT_HACKS */

+

+extern void _XtPopupInitialize(

+    XtAppContext	/* app_context */

+);

+

+extern void _XtBindActions(

+    Widget	/* widget */,

+    XtTM 	/* tm_rec */

+);

+

+extern Boolean _XtComputeLateBindings(

+    Display*		/* dpy */,

+    LateBindingsPtr	/* lateModifiers */,

+    Modifiers*		/* computed */,

+    Modifiers*		/* computedMask */

+);

+

+extern XtTranslations _XtCreateXlations(

+    TMStateTree *	/* stateTrees */,

+    TMShortCard		/* numStateTrees */,

+    XtTranslations 	/* first */,

+    XtTranslations	/* second */

+);

+

+extern Boolean _XtCvtMergeTranslations(

+    Display*	/* dpy */,

+    XrmValuePtr	/* args */,

+    Cardinal*	/* num_args */,

+    XrmValuePtr	/* from */,

+    XrmValuePtr	/* to */,

+    XtPointer*	/* closure_ret */

+);

+

+void _XtRemoveStateTreeByIndex(

+    XtTranslations	/* xlations */,

+    TMShortCard	/* i */);

+

+void _XtFreeTranslations(

+    XtAppContext	/* app */,

+    XrmValuePtr		/* toVal */,

+    XtPointer		/* closure */,

+    XrmValuePtr		/* args */,

+    Cardinal*		/* num_args */

+);

+

+extern TMShortCard _XtGetModifierIndex(

+    Event*	/* event */

+);

+

+extern TMShortCard _XtGetQuarkIndex(

+    TMParseStateTree	/* stateTreePtr */,

+    XrmQuark		/* quark */

+);

+

+extern XtTranslations _XtGetTranslationValue(

+    Widget		/* widget */

+);

+

+extern TMShortCard _XtGetTypeIndex(

+    Event*	/* event */

+);

+

+extern void _XtGrabInitialize(

+    XtAppContext	/* app */

+);

+

+extern void _XtInstallTranslations(

+    Widget		/* widget */

+);

+

+extern void _XtRemoveTranslations(

+    Widget		/* widget */

+);

+

+extern void _XtDestroyTMData(

+    Widget		/* widget */

+);

+

+extern void _XtMergeTranslations(

+    Widget		/* widget */,

+    XtTranslations	/* newXlations */,

+    _XtTranslateOp	/* operation */

+);

+

+extern void _XtActionInitialize(

+    XtAppContext	/* app */

+);

+

+extern TMStateTree _XtParseTreeToStateTree(

+    TMParseStateTree 	/* parseTree */

+);

+

+extern String _XtPrintActions(

+    ActionRec*	/* actions */,

+    XrmQuark*	/* quarkTbl */

+);

+

+extern String _XtPrintState(

+    TMStateTree	/* stateTree */,

+    TMBranchHead /* branchHead */);

+

+extern String _XtPrintEventSeq(

+    EventSeqPtr	/* eventSeq */,

+    Display*	/* dpy */

+);

+

+typedef Boolean (*_XtTraversalProc)(

+    StatePtr	/* state */,

+    XtPointer	/* data */

+);

+

+extern void _XtTraverseStateTree(

+    TMStateTree		/* tree */,

+    _XtTraversalProc	/* func */,

+    XtPointer		/* data */

+);

+

+extern void _XtTranslateInitialize(

+    void

+);

+

+extern void _XtAddTMConverters(

+    ConverterTable	/* table */

+);

+

+extern void _XtUnbindActions(

+    Widget		/* widget */,

+    XtTranslations	/* xlations */,

+    TMBindData		/* bindData */

+);

+

+extern void _XtUnmergeTranslations(

+    Widget		/* widget */,

+    XtTranslations 	/* xlations */

+);

+

+/* TMKey.c */

+extern void _XtAllocTMContext(XtPerDisplay pd);

+

+_XFUNCPROTOEND

diff --git a/X11/VarargsI.h b/X11/VarargsI.h
index 76ce9bc7e..21884e463 100644
--- a/X11/VarargsI.h
+++ b/X11/VarargsI.h
@@ -1,69 +1,66 @@
-/* $Xorg: VarargsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
-/*
-
-Copyright 1985, 1986, 1987, 1988, 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/Xt/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */
-
-#ifndef _VarargsI_h_ 
-#define _VarargsI_h_ 
-
-#include <stdarg.h>
- 
-/* private routines */
-
-_XFUNCPROTOBEGIN
-
-extern void _XtCountVaList(
-    va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
-);
-
-extern void _XtVaToArgList(
-   Widget /*widget*/, va_list /*var*/, int /*max_count*/, ArgList* /*args_return*/, Cardinal* /*num_args_return*/
-);
-
-extern void _XtVaToTypedArgList(
-    va_list /*var*/, int /*count*/, XtTypedArgList* /*args_return*/, Cardinal* /*num_args_return*/
-);
-
-extern XtTypedArgList _XtVaCreateTypedArgList(
-    va_list /*var*/, int /*count*/
-);
-
-extern void _XtFreeArgList(
-    ArgList /*args*/, int /*total_count*/, int /*typed_count*/
-);
-
-extern void _XtGetApplicationResources(
-    Widget /*w*/, XtPointer /*base*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
-);
-
-extern void _XtGetSubresources(
-    Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
-);
-
-_XFUNCPROTOEND
-
-#endif /* _VarargsI_h_ */
+/*

+

+Copyright 1985, 1986, 1987, 1988, 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 _VarargsI_h_ 

+#define _VarargsI_h_ 

+

+#include <stdarg.h>

+ 

+/* private routines */

+

+_XFUNCPROTOBEGIN

+

+extern void _XtCountVaList(

+    va_list /*var*/, int* /*total_count*/, int* /*typed_count*/

+);

+

+extern void _XtVaToArgList(

+   Widget /*widget*/, va_list /*var*/, int /*max_count*/, ArgList* /*args_return*/, Cardinal* /*num_args_return*/

+);

+

+extern void _XtVaToTypedArgList(

+    va_list /*var*/, int /*count*/, XtTypedArgList* /*args_return*/, Cardinal* /*num_args_return*/

+);

+

+extern XtTypedArgList _XtVaCreateTypedArgList(

+    va_list /*var*/, int /*count*/

+);

+

+extern void _XtFreeArgList(

+    ArgList /*args*/, int /*total_count*/, int /*typed_count*/

+);

+

+extern void _XtGetApplicationResources(

+    Widget /*w*/, XtPointer /*base*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/

+);

+

+extern void _XtGetSubresources(

+    Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/

+);

+

+_XFUNCPROTOEND

+

+#endif /* _VarargsI_h_ */

diff --git a/X11/Vendor.h b/X11/Vendor.h
index 633d17aa1..b6791b155 100644
--- a/X11/Vendor.h
+++ b/X11/Vendor.h
@@ -1,75 +1,70 @@
-/*
-* $Xorg: Vendor.h,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $
-* $oHeader: Vendor.h,v 1.2 88/08/18 15:56:44 asente 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.
-
-******************************************************************/
-
-#ifndef _XtVendor_h
-#define _XtVendor_h
-
-#include <X11/Intrinsic.h>
-
-/***********************************************************************
- *
- * VendorShell Widget
- *
- ***********************************************************************/
-
-/* Class record constants */
-
-typedef struct _VendorShellClassRec *VendorShellWidgetClass;
-
-_XFUNCPROTOBEGIN
-
-externalref WidgetClass vendorShellWidgetClass;
-
-_XFUNCPROTOEND
-
-#endif /* _XtVendor_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

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

+

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

+

+#ifndef _XtVendor_h

+#define _XtVendor_h

+

+#include <X11/Intrinsic.h>

+

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

+ *

+ * VendorShell Widget

+ *

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

+

+/* Class record constants */

+

+typedef struct _VendorShellClassRec *VendorShellWidgetClass;

+

+_XFUNCPROTOBEGIN

+

+externalref WidgetClass vendorShellWidgetClass;

+

+_XFUNCPROTOEND

+

+#endif /* _XtVendor_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/X11/VendorP.h b/X11/VendorP.h
index e60857d9e..7b4d6dab9 100644
--- a/X11/VendorP.h
+++ b/X11/VendorP.h
@@ -1,107 +1,102 @@
-/*
-* $Xorg: VendorP.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $
-* $oHeader: VendorP.h,v 1.2 88/08/18 15:56:48 asente 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.
-
-******************************************************************/
-
-/* 
- * VendorP.h - Private definitions for VendorShell widget
- * 
- * Author:	Paul Asente
- * 		Digital Equipment Corporation
- * 		Western Software Laboratory
- * Date:	Thu Dec 3, 1987
- */
-
-/***********************************************************************
- *
- * VendorShell Widget Private Data
- *
- ***********************************************************************/
-
-#ifndef  _XtVendorPrivate_h
-#define _XtVendorPrivate_h
-
-#include <X11/Vendor.h>
-
-/* New fields for the VendorShell widget class record */
-
-_XFUNCPROTOBEGIN
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} VendorShellClassPart;
-
-typedef struct _VendorShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-} VendorShellClassRec;
-
-externalref VendorShellClassRec vendorShellClassRec;
-
-/* New fields for the vendor shell widget. */
-
-typedef struct {
-	int		vendor_specific;
-} VendorShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-} VendorShellRec, *VendorShellWidget;
-
-_XFUNCPROTOEND
-
-#endif  /* _XtVendorPrivate_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.

+

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

+

+/* 

+ * VendorP.h - Private definitions for VendorShell widget

+ * 

+ * Author:	Paul Asente

+ * 		Digital Equipment Corporation

+ * 		Western Software Laboratory

+ * Date:	Thu Dec 3, 1987

+ */

+

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

+ *

+ * VendorShell Widget Private Data

+ *

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

+

+#ifndef  _XtVendorPrivate_h

+#define _XtVendorPrivate_h

+

+#include <X11/Vendor.h>

+

+/* New fields for the VendorShell widget class record */

+

+_XFUNCPROTOBEGIN

+

+typedef struct {

+    XtPointer       extension;          /* pointer to extension record      */

+} VendorShellClassPart;

+

+typedef struct _VendorShellClassRec {

+  	CoreClassPart      core_class;

+	CompositeClassPart composite_class;

+	ShellClassPart  shell_class;

+	WMShellClassPart   wm_shell_class;

+	VendorShellClassPart vendor_shell_class;

+} VendorShellClassRec;

+

+externalref VendorShellClassRec vendorShellClassRec;

+

+/* New fields for the vendor shell widget. */

+

+typedef struct {

+	int		vendor_specific;

+} VendorShellPart;

+

+typedef  struct {

+	CorePart 	core;

+	CompositePart 	composite;

+	ShellPart 	shell;

+	WMShellPart	wm;

+	VendorShellPart	vendor;

+} VendorShellRec, *VendorShellWidget;

+

+_XFUNCPROTOEND

+

+#endif  /* _XtVendorPrivate_h */

diff --git a/X11/Xaw/AllWidgets.h b/X11/Xaw/AllWidgets.h
index 0200ac4cc..4c81cc0ce 100644
--- a/X11/Xaw/AllWidgets.h
+++ b/X11/Xaw/AllWidgets.h
@@ -1,38 +1,37 @@
-/*
- * $Xorg: AllWidgets.h,v 1.5 2001/02/09 02:03:42 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.
- */
-
-#ifndef _XawAllWidgets_h
-#define _XawAllWidgets_h
-
-#include <X11/Xmu/WidgetNode.h>
-
-/*
- * This file matches the generated AllWidgets.c
- */
-extern XmuWidgetNode XawWidgetArray[];
-extern int           XawWidgetCount;
-
-#endif /* _XawAllWidgets_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.

+ */

+

+#ifndef _XawAllWidgets_h

+#define _XawAllWidgets_h

+

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

+

+/*

+ * This file matches the generated AllWidgets.c

+ */

+extern XmuWidgetNode XawWidgetArray[];

+extern int           XawWidgetCount;

+

+#endif /* _XawAllWidgets_h */

diff --git a/X11/Xaw/AsciiSink.h b/X11/Xaw/AsciiSink.h
index 234927493..e60056bc9 100644
--- a/X11/Xaw/AsciiSink.h
+++ b/X11/Xaw/AsciiSink.h
@@ -1,82 +1,77 @@
-/*
- * $Xorg: AsciiSink.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */
-
-#ifndef _XawAsciiSink_h
-#define _XawAsciiSink_h
-
-/*
- * AsciiSink Object
- */
-
-#include <X11/Xaw/TextSink.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- echo                Output             Boolean         True
- displayNonprinting  Output             Boolean         True
-
-*/
-
-#define XtCOutput "Output"
-
-#define XtNdisplayNonprinting "displayNonprinting"
-#define XtNecho "echo"
-
-/* Class record constants */
-extern WidgetClass asciiSinkObjectClass;
-
-typedef struct _AsciiSinkClassRec *AsciiSinkObjectClass;
-typedef struct _AsciiSinkRec      *AsciiSinkObject;
-
-#endif /* _XawAsciiSink_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawAsciiSink_h

+#define _XawAsciiSink_h

+

+/*

+ * AsciiSink Object

+ */

+

+#include <X11/Xaw/TextSink.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ echo                Output             Boolean         True

+ displayNonprinting  Output             Boolean         True

+

+*/

+

+#define XtCOutput "Output"

+

+#define XtNdisplayNonprinting "displayNonprinting"

+#define XtNecho "echo"

+

+/* Class record constants */

+extern WidgetClass asciiSinkObjectClass;

+

+typedef struct _AsciiSinkClassRec *AsciiSinkObjectClass;

+typedef struct _AsciiSinkRec      *AsciiSinkObject;

+

+#endif /* _XawAsciiSink_h */

diff --git a/X11/Xaw/AsciiSinkP.h b/X11/Xaw/AsciiSinkP.h
index b160092f3..f2256db77 100644
--- a/X11/Xaw/AsciiSinkP.h
+++ b/X11/Xaw/AsciiSinkP.h
@@ -1,101 +1,95 @@
-/*
-* $Xorg: AsciiSinkP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.9 2001/01/17 19:42:25 dawes Exp $ */
-
-#ifndef _XawAsciiSinkP_h
-#define _XawAsciiSinkP_h
-
-/*
- * AsciiSink Object Private Data
- */
-#include <X11/Xaw/TextSinkP.h> 
-#include <X11/Xaw/AsciiSink.h> 
-
-/* New fields for the AsciiSink object class record */
-typedef struct _AsciiSinkClassPart {
-    XtPointer extension;
-} AsciiSinkClassPart;
-
-/* Full class record declaration */
-typedef struct _AsciiSinkClassRec {
-    ObjectClassPart     object_class;
-    TextSinkClassPart	text_sink_class;
-    AsciiSinkClassPart	ascii_sink_class;
-} AsciiSinkClassRec;
-
-extern AsciiSinkClassRec asciiSinkClassRec;
-
-/* New fields for the AsciiSink object record */
-typedef struct {
-    /* resources */
-    XFontStruct *font;          /* Font to draw in. */
-    Boolean echo;
-    Boolean display_nonprinting;
-
-    /* private */
-    GC normgc, invgc, xorgc;
-    XawTextPosition cursor_position;
-    XawTextInsertState laststate;
-    short cursor_x, cursor_y;	/* Cursor Location. */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} AsciiSinkPart;
-
-/* Full instance record declaration */
-typedef struct _AsciiSinkRec {
-    ObjectPart          object;
-    TextSinkPart	text_sink;
-    AsciiSinkPart	ascii_sink;
-} AsciiSinkRec;
-
-#endif /* _XawAsciiSinkP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawAsciiSinkP_h

+#define _XawAsciiSinkP_h

+

+/*

+ * AsciiSink Object Private Data

+ */

+#include <X11/Xaw/TextSinkP.h> 

+#include <X11/Xaw/AsciiSink.h> 

+

+/* New fields for the AsciiSink object class record */

+typedef struct _AsciiSinkClassPart {

+    XtPointer extension;

+} AsciiSinkClassPart;

+

+/* Full class record declaration */

+typedef struct _AsciiSinkClassRec {

+    ObjectClassPart     object_class;

+    TextSinkClassPart	text_sink_class;

+    AsciiSinkClassPart	ascii_sink_class;

+} AsciiSinkClassRec;

+

+extern AsciiSinkClassRec asciiSinkClassRec;

+

+/* New fields for the AsciiSink object record */

+typedef struct {

+    /* resources */

+    XFontStruct *font;          /* Font to draw in. */

+    Boolean echo;

+    Boolean display_nonprinting;

+

+    /* private */

+    GC normgc, invgc, xorgc;

+    XawTextPosition cursor_position;

+    XawTextInsertState laststate;

+    short cursor_x, cursor_y;	/* Cursor Location. */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} AsciiSinkPart;

+

+/* Full instance record declaration */

+typedef struct _AsciiSinkRec {

+    ObjectPart          object;

+    TextSinkPart	text_sink;

+    AsciiSinkPart	ascii_sink;

+} AsciiSinkRec;

+

+#endif /* _XawAsciiSinkP_h */

diff --git a/X11/Xaw/AsciiSrc.h b/X11/Xaw/AsciiSrc.h
index 8728dd9ea..eb80eebcd 100644
--- a/X11/Xaw/AsciiSrc.h
+++ b/X11/Xaw/AsciiSrc.h
@@ -1,175 +1,172 @@
-/* $Xorg: AsciiSrc.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
-
-/*
-
-Copyright 1989, 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/Xaw/AsciiSrc.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */
-
-
-/*
- * AsciiSrc.h - Public Header file for Ascii Text Source.
- *
- * This is the public header file for the Ascii Text Source.
- * It is intended to be used with the Text widget, the simplest way to use
- * this text source is to use the AsciiText Object.
- *
- * Date:    June 29, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-
-#ifndef _XawAsciiSrc_h
-#define _XawAsciiSrc_h
-
-#include <X11/Xaw/TextSrc.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- dataCompression     DataCompression	Boolean		True
- length		     Length		int		(internal)
- pieceSize	     PieceSize		int		BUFSIZ
- string		     String		String		NULL
- type		     Type		XawAsciiType	XawAsciiString
- useStringInPlace    UseStringInPlace	Boolean		False
-
-*/
- 
-extern WidgetClass asciiSrcObjectClass;
-
-typedef struct _AsciiSrcClassRec *AsciiSrcObjectClass;
-typedef struct _AsciiSrcRec      *AsciiSrcObject;
-
-#define AsciiSourceObjectClass AsciiSrcObjectClass
-#define AsciiSourceObject      AsciiSrcObject
-
-/*
- * Resource Definitions
- */
-#define XtCDataCompression "DataCompression"
-#define XtCPieceSize "PieceSize"
-#define XtCType "Type"
-#define XtCUseStringInPlace "UseStringInPlace"
-
-#define XtNdataCompression "dataCompression"
-#define XtNpieceSize "pieceSize"
-#define XtNtype "type"
-#define XtNuseStringInPlace "useStringInPlace"
-
-#define XtRAsciiType "AsciiType"
-
-#define XtEstring "string"
-#define XtEfile "file"
-
-typedef enum {
-  XawAsciiFile,
-  XawAsciiString
-} XawAsciiType;
-
-/*
- * Public routines
- */
-
-_XFUNCPROTOBEGIN
-
-/*
- * Function:
- *	XawAsciiSourceFreeString
- *
- * Parameters:
- *	w - AsciiSrc object
- *
- * Description:
- *	  Frees the string returned by a get values call
- *		     on the string when the source is of type string.
- */
-void XawAsciiSourceFreeString
-(
- Widget		w
- );
-
-/*
- * Function:
- *	XawAsciiSave
- *
- * Arguments:
- *	w - asciiSrc Object.
- *
- * Description:
- *	Saves all the pieces into a file or string as required.
- *
- * Returns:
- *	True if the save was successful
- */
-Bool XawAsciiSave
-(
- Widget		w
- );
-
-/*
- * Function:
- *	XawAsciiSaveAsFile
- *
- * Parameters:
- *	w    - asciiSrc object
- *	name - name of the file to save this file into
- *
- * Description:
- *	Save the current buffer as a file.
- *
- * Returns:
- *	True if the save was successful
- */
-Bool XawAsciiSaveAsFile
-(
- Widget		w,
- _Xconst char	*name
- );
-
-/*
- * Function:
- *	XawAsciiSourceChanged
- *
- * Parameters:
- *	w - asciiSource object
- *
- * Description:
- *	Returns true if the source has changed since last saved.
- *
- * Returns:
- *	a Boolean (see description)
- */
-Bool XawAsciiSourceChanged
-(
- Widget		w
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawAsciiSrc_h */
+/*

+

+Copyright 1989, 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.

+

+*/

+

+

+/*

+ * AsciiSrc.h - Public Header file for Ascii Text Source.

+ *

+ * This is the public header file for the Ascii Text Source.

+ * It is intended to be used with the Text widget, the simplest way to use

+ * this text source is to use the AsciiText Object.

+ *

+ * Date:    June 29, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+

+#ifndef _XawAsciiSrc_h

+#define _XawAsciiSrc_h

+

+#include <X11/Xaw/TextSrc.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ dataCompression     DataCompression	Boolean		True

+ length		     Length		int		(internal)

+ pieceSize	     PieceSize		int		BUFSIZ

+ string		     String		String		NULL

+ type		     Type		XawAsciiType	XawAsciiString

+ useStringInPlace    UseStringInPlace	Boolean		False

+

+*/

+ 

+extern WidgetClass asciiSrcObjectClass;

+

+typedef struct _AsciiSrcClassRec *AsciiSrcObjectClass;

+typedef struct _AsciiSrcRec      *AsciiSrcObject;

+

+#define AsciiSourceObjectClass AsciiSrcObjectClass

+#define AsciiSourceObject      AsciiSrcObject

+

+/*

+ * Resource Definitions

+ */

+#define XtCDataCompression "DataCompression"

+#define XtCPieceSize "PieceSize"

+#define XtCType "Type"

+#define XtCUseStringInPlace "UseStringInPlace"

+

+#define XtNdataCompression "dataCompression"

+#define XtNpieceSize "pieceSize"

+#define XtNtype "type"

+#define XtNuseStringInPlace "useStringInPlace"

+

+#define XtRAsciiType "AsciiType"

+

+#define XtEstring "string"

+#define XtEfile "file"

+

+typedef enum {

+  XawAsciiFile,

+  XawAsciiString

+} XawAsciiType;

+

+/*

+ * Public routines

+ */

+

+_XFUNCPROTOBEGIN

+

+/*

+ * Function:

+ *	XawAsciiSourceFreeString

+ *

+ * Parameters:

+ *	w - AsciiSrc object

+ *

+ * Description:

+ *	  Frees the string returned by a get values call

+ *		     on the string when the source is of type string.

+ */

+void XawAsciiSourceFreeString

+(

+ Widget		w

+ );

+

+/*

+ * Function:

+ *	XawAsciiSave

+ *

+ * Arguments:

+ *	w - asciiSrc Object.

+ *

+ * Description:

+ *	Saves all the pieces into a file or string as required.

+ *

+ * Returns:

+ *	True if the save was successful

+ */

+Bool XawAsciiSave

+(

+ Widget		w

+ );

+

+/*

+ * Function:

+ *	XawAsciiSaveAsFile

+ *

+ * Parameters:

+ *	w    - asciiSrc object

+ *	name - name of the file to save this file into

+ *

+ * Description:

+ *	Save the current buffer as a file.

+ *

+ * Returns:

+ *	True if the save was successful

+ */

+Bool XawAsciiSaveAsFile

+(

+ Widget		w,

+ _Xconst char	*name

+ );

+

+/*

+ * Function:

+ *	XawAsciiSourceChanged

+ *

+ * Parameters:

+ *	w - asciiSource object

+ *

+ * Description:

+ *	Returns true if the source has changed since last saved.

+ *

+ * Returns:

+ *	a Boolean (see description)

+ */

+Bool XawAsciiSourceChanged

+(

+ Widget		w

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawAsciiSrc_h */

diff --git a/X11/Xaw/AsciiSrcP.h b/X11/Xaw/AsciiSrcP.h
index 22d30082a..910e42ebb 100644
--- a/X11/Xaw/AsciiSrcP.h
+++ b/X11/Xaw/AsciiSrcP.h
@@ -1,145 +1,139 @@
-/*
-* $Xorg: AsciiSrcP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.8 2001/01/17 19:42:25 dawes Exp $ */
-
-/*
- * AsciiSrcP.h - Private Header for Ascii Text Source.
- *
- * This is the private header file for the Ascii Text Source.
- * It is intended to be used with the Text widget, the simplest way to use
- * this text source is to use the AsciiText Object.
- *
- * Date:    June 29, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawAsciiSrcP_h
-#define _XawAsciiSrcP_h
-
-#include <X11/Xaw/TextSrcP.h>
-#include <X11/Xaw/AsciiSrc.h>
-
-#ifdef L_tmpnam
-#define TMPSIZ L_tmpnam
-#else
-#ifdef PATH_MAX
-#define TMPSIZ PATH_MAX
-#else
-#define TMPSIZ 1024		/* bytes to allocate for tmpnam */
-#endif
-#endif
-
-typedef struct _Piece {		/* Piece of the text file of BUFSIZ allocated 
-				   characters */
-    char *text;			/* The text in this buffer */
-    XawTextPosition used;	/* The number of characters of this buffer 
-				   that have been used */
-    struct _Piece *prev, *next;	/* linked list pointers */
-} Piece;
-
-typedef struct _AsciiSrcClassPart {
-    XtPointer extension;
-} AsciiSrcClassPart;
-
-/* Full class record */
-typedef struct _AsciiSrcClassRec {
-    ObjectClassPart     object_class;
-    TextSrcClassPart	text_src_class;
-    AsciiSrcClassPart	ascii_src_class;
-} AsciiSrcClassRec;
-
-extern AsciiSrcClassRec asciiSrcClassRec;
-
-/* New fields for the AsciiSrc object */
-typedef struct _AsciiSrcPart {
-    /* resources */
-    char *string;		/* either the string, or the
-				   file name, depending upon the type */
-    XawAsciiType type;		/* either string or disk */
-    XawTextPosition piece_size;	/* Size of text buffer for each piece */
-    Boolean data_compression;	/* compress to minimum memory automatically
-				   on save? */
-#ifdef OLDXAW
-    XtCallbackList callback;
-#endif
-    Boolean use_string_in_place;/* Use the string passed in place */
-    int ascii_length;		/* length field for ascii string emulation */
-
-#ifdef ASCII_DISK
-    String filename;		/* name of file for Compatability */
-#endif /* ASCII_DISK */
-
-    /* private */
-    Boolean is_tempfile;	/* Is this a temporary file? */
-#ifdef OLDXAW
-    Boolean changes;
-#endif
-    Boolean allocated_string;	/* Have I allocated the
-				   string in ascii_src->string? */
-    XawTextPosition length; 	/* length of file */
-    Piece *first_piece;		/* first piece of the text */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} AsciiSrcPart;
-
-/* instance record */
-typedef struct _AsciiSrcRec {
-    ObjectPart    object;
-    TextSrcPart   text_src;
-    AsciiSrcPart  ascii_src;
-} AsciiSrcRec;
-
-#endif /* _XawAsciiSrcP_h */ 
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+/*

+ * AsciiSrcP.h - Private Header for Ascii Text Source.

+ *

+ * This is the private header file for the Ascii Text Source.

+ * It is intended to be used with the Text widget, the simplest way to use

+ * this text source is to use the AsciiText Object.

+ *

+ * Date:    June 29, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawAsciiSrcP_h

+#define _XawAsciiSrcP_h

+

+#include <X11/Xaw/TextSrcP.h>

+#include <X11/Xaw/AsciiSrc.h>

+

+#ifdef L_tmpnam

+#define TMPSIZ L_tmpnam

+#else

+#ifdef PATH_MAX

+#define TMPSIZ PATH_MAX

+#else

+#define TMPSIZ 1024		/* bytes to allocate for tmpnam */

+#endif

+#endif

+

+typedef struct _Piece {		/* Piece of the text file of BUFSIZ allocated 

+				   characters */

+    char *text;			/* The text in this buffer */

+    XawTextPosition used;	/* The number of characters of this buffer 

+				   that have been used */

+    struct _Piece *prev, *next;	/* linked list pointers */

+} Piece;

+

+typedef struct _AsciiSrcClassPart {

+    XtPointer extension;

+} AsciiSrcClassPart;

+

+/* Full class record */

+typedef struct _AsciiSrcClassRec {

+    ObjectClassPart     object_class;

+    TextSrcClassPart	text_src_class;

+    AsciiSrcClassPart	ascii_src_class;

+} AsciiSrcClassRec;

+

+extern AsciiSrcClassRec asciiSrcClassRec;

+

+/* New fields for the AsciiSrc object */

+typedef struct _AsciiSrcPart {

+    /* resources */

+    char *string;		/* either the string, or the

+				   file name, depending upon the type */

+    XawAsciiType type;		/* either string or disk */

+    XawTextPosition piece_size;	/* Size of text buffer for each piece */

+    Boolean data_compression;	/* compress to minimum memory automatically

+				   on save? */

+#ifdef OLDXAW

+    XtCallbackList callback;

+#endif

+    Boolean use_string_in_place;/* Use the string passed in place */

+    int ascii_length;		/* length field for ascii string emulation */

+

+#ifdef ASCII_DISK

+    String filename;		/* name of file for Compatability */

+#endif /* ASCII_DISK */

+

+    /* private */

+    Boolean is_tempfile;	/* Is this a temporary file? */

+#ifdef OLDXAW

+    Boolean changes;

+#endif

+    Boolean allocated_string;	/* Have I allocated the

+				   string in ascii_src->string? */

+    XawTextPosition length; 	/* length of file */

+    Piece *first_piece;		/* first piece of the text */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} AsciiSrcPart;

+

+/* instance record */

+typedef struct _AsciiSrcRec {

+    ObjectPart    object;

+    TextSrcPart   text_src;

+    AsciiSrcPart  ascii_src;

+} AsciiSrcRec;

+

+#endif /* _XawAsciiSrcP_h */ 

diff --git a/X11/Xaw/AsciiText.h b/X11/Xaw/AsciiText.h
index e6b4bc863..a874d9778 100644
--- a/X11/Xaw/AsciiText.h
+++ b/X11/Xaw/AsciiText.h
@@ -1,128 +1,123 @@
-/*
- * $Xorg: AsciiText.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */
-
-/*
- * AsciiText.h - Public header file for AsciiText Widget
- *
- * This Widget is intended to be used as a simple front end to the 
- * text widget with an ascii source and ascii sink attached to it
- *
- * Date:    June 29, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-#ifndef _AsciiText_h
-#define _AsciiText_h
-
-#include <X11/Xaw/Text.h>
-#include <X11/Xaw/AsciiSrc.h>
-#include <X11/Xaw/MultiSrc.h>
-
-/* Resources:
-
- Name		     Class		RepType		  Default Value
- ----		     -----		-------		  -------------
- autoFill	     AutoFill		Boolean		  False
- background	     Background		Pixel		  XtDefaultBackground
- border		     BorderColor	Pixel		  XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	  1
- bottomMargin	     Margin		Position	  2
- cursor		     Cursor		Cursor		  xterm
- destroyCallback     Callback		Pointer		  NULL
- displayCaret	     Output		Boolean		  True
- displayPosition     TextPosition	int		  0
- editType	     EditType		XawTextEditType	  XawtextRead
- font		     Font		XFontStruct*	  Fixed
- foreground	     Foreground		Pixel		  Black
- height		     Height		Dimension	  font height
- insertPosition	     TextPosition	int		  0
- international	     International		Boolean		false
- leftMargin	     Margin		Position	  2
- mappedWhenManaged   MappedWhenManaged	Boolean		  True
- resize		     Resize		XawTextResizeMode XawtextResizeNever
- rightMargin	     Margin		Position	  4
- scrollHorizontal    Scroll		XawTextScrollMode XawtextScrollNever
- scrollVertical	     Scroll		XawTextScrollMode XawtextScrollNever
- selectTypes	     SelectTypes	Pointer		  pos/word/line/par/all
- selection	     Selection		Pointer		  (empty selection)
- sensitive	     Sensitive		Boolean		  True
- sink		     TextSink		Widget		  (none)
- source		     TextSource		Widget		  (none)
- string		     String		String		  NULL
- topMargin	     Margin		Position	  2
- width		     Width		Dimension	  100
- wrap		     Wrap		XawTextWrapMode	  XawtextWrapNever
- x		     Position		Position	  0
- y		     Position		Position	  0
-
- (see also *Src.h and *Sink.h)
-*/
-
-typedef struct _AsciiTextClassRec	*AsciiTextWidgetClass;
-typedef struct _AsciiRec	        *AsciiWidget;
-
-extern WidgetClass asciiTextWidgetClass;
-
-/*
- * Disk and String Emulation Info
- */
-#ifdef ASCII_STRING
-extern WidgetClass asciiStringWidgetClass;
-#endif
-
-#ifdef ASCII_DISK
-extern WidgetClass asciiDiskWidgetClass;
-#endif
-
-#endif /* _AsciiText_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+/*

+ * AsciiText.h - Public header file for AsciiText Widget

+ *

+ * This Widget is intended to be used as a simple front end to the 

+ * text widget with an ascii source and ascii sink attached to it

+ *

+ * Date:    June 29, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+#ifndef _AsciiText_h

+#define _AsciiText_h

+

+#include <X11/Xaw/Text.h>

+#include <X11/Xaw/AsciiSrc.h>

+#include <X11/Xaw/MultiSrc.h>

+

+/* Resources:

+

+ Name		     Class		RepType		  Default Value

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

+ autoFill	     AutoFill		Boolean		  False

+ background	     Background		Pixel		  XtDefaultBackground

+ border		     BorderColor	Pixel		  XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	  1

+ bottomMargin	     Margin		Position	  2

+ cursor		     Cursor		Cursor		  xterm

+ destroyCallback     Callback		Pointer		  NULL

+ displayCaret	     Output		Boolean		  True

+ displayPosition     TextPosition	int		  0

+ editType	     EditType		XawTextEditType	  XawtextRead

+ font		     Font		XFontStruct*	  Fixed

+ foreground	     Foreground		Pixel		  Black

+ height		     Height		Dimension	  font height

+ insertPosition	     TextPosition	int		  0

+ international	     International		Boolean		false

+ leftMargin	     Margin		Position	  2

+ mappedWhenManaged   MappedWhenManaged	Boolean		  True

+ resize		     Resize		XawTextResizeMode XawtextResizeNever

+ rightMargin	     Margin		Position	  4

+ scrollHorizontal    Scroll		XawTextScrollMode XawtextScrollNever

+ scrollVertical	     Scroll		XawTextScrollMode XawtextScrollNever

+ selectTypes	     SelectTypes	Pointer		  pos/word/line/par/all

+ selection	     Selection		Pointer		  (empty selection)

+ sensitive	     Sensitive		Boolean		  True

+ sink		     TextSink		Widget		  (none)

+ source		     TextSource		Widget		  (none)

+ string		     String		String		  NULL

+ topMargin	     Margin		Position	  2

+ width		     Width		Dimension	  100

+ wrap		     Wrap		XawTextWrapMode	  XawtextWrapNever

+ x		     Position		Position	  0

+ y		     Position		Position	  0

+

+ (see also *Src.h and *Sink.h)

+*/

+

+typedef struct _AsciiTextClassRec	*AsciiTextWidgetClass;

+typedef struct _AsciiRec	        *AsciiWidget;

+

+extern WidgetClass asciiTextWidgetClass;

+

+/*

+ * Disk and String Emulation Info

+ */

+#ifdef ASCII_STRING

+extern WidgetClass asciiStringWidgetClass;

+#endif

+

+#ifdef ASCII_DISK

+extern WidgetClass asciiDiskWidgetClass;

+#endif

+

+#endif /* _AsciiText_h */

diff --git a/X11/Xaw/AsciiTextP.h b/X11/Xaw/AsciiTextP.h
index 25e3eeeab..91efd1607 100644
--- a/X11/Xaw/AsciiTextP.h
+++ b/X11/Xaw/AsciiTextP.h
@@ -1,169 +1,164 @@
-/*
- * $Xorg: AsciiTextP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.8 2001/01/17 19:42:25 dawes Exp $ */
-
-/*
- * AsciiText.c - Private header file for AsciiText Widget.
- *
- * This Widget is intended to be used as a simple front end to the 
- * text widget with an ascii source and ascii sink attached to it.
- *
- * Date:    June 29, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _AsciiTextP_h
-#define _AsciiTextP_h
-
-#include <X11/Xaw/TextP.h>
-#include <X11/Xaw/AsciiText.h>
-#include <X11/Xaw/AsciiSrc.h>
-#include <X11/Xaw/MultiSrc.h>
-
-typedef struct {
-  XtPointer extension;
-} AsciiClassPart;
-
-typedef struct _AsciiTextClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    TextClassPart	text_class;
-    AsciiClassPart	ascii_class;
-} AsciiTextClassRec;
-
-extern AsciiTextClassRec asciiTextClassRec;
-
-typedef struct {
-    int resource;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} AsciiPart;
-
-typedef struct _AsciiRec {
-    CorePart		core;
-    SimplePart		simple;
-    TextPart		text;
-    AsciiPart		ascii;
-} AsciiRec;
-
-/*
- * Ascii String Emulation widget
- */
-#ifdef ASCII_STRING
-typedef struct {
-  XtPointer extension;
-} AsciiStringClassPart;
-
-typedef struct _AsciiStringClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    TextClassPart	text_class;
-    AsciiClassPart	ascii_class;
-    AsciiStringClassPart string_class;
-} AsciiStringClassRec;
-
-extern AsciiStringClassRec asciiStringClassRec;
-
-typedef struct {
-    int resource;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} AsciiStringPart;
-
-typedef struct _AsciiStringRec {
-    CorePart		core;
-    SimplePart		simple;
-    TextPart		text;
-    AsciiPart           ascii;
-    AsciiStringPart     ascii_str;
-} AsciiStringRec;
-#endif /* ASCII_STRING */
-
-#ifdef ASCII_DISK
-/*
- * Ascii Disk Emulation widget
- */
-typedef struct {
-    XtPointer extension;
-} AsciiDiskClassPart;
-
-typedef struct _AsciiDiskClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    TextClassPart	text_class;
-    AsciiClassPart	ascii_class;
-    AsciiDiskClassPart	disk_class;
-} AsciiDiskClassRec;
-
-extern AsciiDiskClassRec asciiDiskClassRec;
-
-typedef struct {
-    char resource;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} AsciiDiskPart;
-
-typedef struct _AsciiDiskRec {
-    CorePart		core;
-    SimplePart		simple;
-    TextPart		text;
-    AsciiPart           ascii;
-    AsciiDiskPart       ascii_disk;
-} AsciiDiskRec;
-#endif /* ASCII_DISK */
-
-#endif /* _AsciiTextP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+/*

+ * AsciiText.c - Private header file for AsciiText Widget.

+ *

+ * This Widget is intended to be used as a simple front end to the 

+ * text widget with an ascii source and ascii sink attached to it.

+ *

+ * Date:    June 29, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _AsciiTextP_h

+#define _AsciiTextP_h

+

+#include <X11/Xaw/TextP.h>

+#include <X11/Xaw/AsciiText.h>

+#include <X11/Xaw/AsciiSrc.h>

+#include <X11/Xaw/MultiSrc.h>

+

+typedef struct {

+  XtPointer extension;

+} AsciiClassPart;

+

+typedef struct _AsciiTextClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    TextClassPart	text_class;

+    AsciiClassPart	ascii_class;

+} AsciiTextClassRec;

+

+extern AsciiTextClassRec asciiTextClassRec;

+

+typedef struct {

+    int resource;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} AsciiPart;

+

+typedef struct _AsciiRec {

+    CorePart		core;

+    SimplePart		simple;

+    TextPart		text;

+    AsciiPart		ascii;

+} AsciiRec;

+

+/*

+ * Ascii String Emulation widget

+ */

+#ifdef ASCII_STRING

+typedef struct {

+  XtPointer extension;

+} AsciiStringClassPart;

+

+typedef struct _AsciiStringClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    TextClassPart	text_class;

+    AsciiClassPart	ascii_class;

+    AsciiStringClassPart string_class;

+} AsciiStringClassRec;

+

+extern AsciiStringClassRec asciiStringClassRec;

+

+typedef struct {

+    int resource;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} AsciiStringPart;

+

+typedef struct _AsciiStringRec {

+    CorePart		core;

+    SimplePart		simple;

+    TextPart		text;

+    AsciiPart           ascii;

+    AsciiStringPart     ascii_str;

+} AsciiStringRec;

+#endif /* ASCII_STRING */

+

+#ifdef ASCII_DISK

+/*

+ * Ascii Disk Emulation widget

+ */

+typedef struct {

+    XtPointer extension;

+} AsciiDiskClassPart;

+

+typedef struct _AsciiDiskClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    TextClassPart	text_class;

+    AsciiClassPart	ascii_class;

+    AsciiDiskClassPart	disk_class;

+} AsciiDiskClassRec;

+

+extern AsciiDiskClassRec asciiDiskClassRec;

+

+typedef struct {

+    char resource;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} AsciiDiskPart;

+

+typedef struct _AsciiDiskRec {

+    CorePart		core;

+    SimplePart		simple;

+    TextPart		text;

+    AsciiPart           ascii;

+    AsciiDiskPart       ascii_disk;

+} AsciiDiskRec;

+#endif /* ASCII_DISK */

+

+#endif /* _AsciiTextP_h */

diff --git a/X11/Xaw/Box.h b/X11/Xaw/Box.h
index 17db281d6..ccf746852 100644
--- a/X11/Xaw/Box.h
+++ b/X11/Xaw/Box.h
@@ -1,108 +1,102 @@
-/*
-* $Xorg: Box.h,v 1.4 2001/02/09 02:03:43 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Box.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */
-
-#ifndef _XawBox_h
-#define _XawBox_h
-
-#include <X11/Xmu/Converters.h>
-
-/*
- * Box Widget (subclass of CompositeClass)
- */
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- destroyCallback     Callback		Pointer		NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- hSpace 	     HSpace		Dimension	4
- height		     Height		Dimension	0
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- orientation	     Orientation	XtOrientation	vertical
- vSpace 	     VSpace		Dimension	4
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#ifndef _XtStringDefs_h_
-#define XtNhSpace "hSpace"
-#define XtNvSpace "vSpace"
-#endif
-
-#ifndef OLDXAW
-#ifndef XawNdisplayList
-#define XawNdisplayList "displayList"
-#endif
- 
-#ifndef XawCDisplayList
-#define XawCDisplayList "DisplayList"
-#endif
-
-#ifndef XawRDisplayList
-#define XawRDisplayList "XawDisplayList"
-#endif
-#endif /* OLDXAW */
-
-/* Class record constants */
-extern WidgetClass boxWidgetClass;
-
-typedef struct _BoxClassRec *BoxWidgetClass;
-typedef struct _BoxRec      *BoxWidget;
-
-#endif /* _XawBox_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.

+

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

+

+#ifndef _XawBox_h

+#define _XawBox_h

+

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

+

+/*

+ * Box Widget (subclass of CompositeClass)

+ */

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ destroyCallback     Callback		Pointer		NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ hSpace 	     HSpace		Dimension	4

+ height		     Height		Dimension	0

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ orientation	     Orientation	XtOrientation	vertical

+ vSpace 	     VSpace		Dimension	4

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#ifndef _XtStringDefs_h_

+#define XtNhSpace "hSpace"

+#define XtNvSpace "vSpace"

+#endif

+

+#ifndef OLDXAW

+#ifndef XawNdisplayList

+#define XawNdisplayList "displayList"

+#endif

+ 

+#ifndef XawCDisplayList

+#define XawCDisplayList "DisplayList"

+#endif

+

+#ifndef XawRDisplayList

+#define XawRDisplayList "XawDisplayList"

+#endif

+#endif /* OLDXAW */

+

+/* Class record constants */

+extern WidgetClass boxWidgetClass;

+

+typedef struct _BoxClassRec *BoxWidgetClass;

+typedef struct _BoxRec      *BoxWidget;

+

+#endif /* _XawBox_h */

diff --git a/X11/Xaw/BoxP.h b/X11/Xaw/BoxP.h
index a64142e7d..be230bcf8 100644
--- a/X11/Xaw/BoxP.h
+++ b/X11/Xaw/BoxP.h
@@ -1,103 +1,97 @@
-/*
-* $Xorg: BoxP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.10 2001/01/17 19:42:25 dawes Exp $ */
-
-#ifndef _XawBoxP_h
-#define _XawBoxP_h
-
-/*
- * Box Widget Private Data
- */
-#include <X11/Xaw/Box.h>
-#include <X11/Xmu/Converters.h>
-#include <X11/Xaw/XawInit.h>
-
-/* New fields for the Box widget class record */
-typedef struct {
-    XtPointer extension;
-} BoxClassPart;
-
-/* Full class record declaration */
-typedef struct _BoxClassRec {
-    CoreClassPart	core_class;
-    CompositeClassPart  composite_class;
-    BoxClassPart	box_class;
-} BoxClassRec;
-
-extern BoxClassRec boxClassRec;
-
-/* New fields for the Box widget record */
-typedef struct {
-    /* resources */
-    Dimension h_space, v_space;
-    XtOrientation orientation;
-
-    /* private state */
-    Dimension preferred_width, preferred_height;
-    Dimension last_query_width, last_query_height;
-    XtGeometryMask last_query_mode;
-#ifndef OLDXAW
-    XawDisplayList *display_list;
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} BoxPart;
-
-/*
- * Full instance record declaration
- */
-typedef struct _BoxRec {
-    CorePart	    core;
-    CompositePart   composite;
-    BoxPart 	    box;
-} BoxRec;
-
-#endif /* _XawBoxP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawBoxP_h

+#define _XawBoxP_h

+

+/*

+ * Box Widget Private Data

+ */

+#include <X11/Xaw/Box.h>

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

+#include <X11/Xaw/XawInit.h>

+

+/* New fields for the Box widget class record */

+typedef struct {

+    XtPointer extension;

+} BoxClassPart;

+

+/* Full class record declaration */

+typedef struct _BoxClassRec {

+    CoreClassPart	core_class;

+    CompositeClassPart  composite_class;

+    BoxClassPart	box_class;

+} BoxClassRec;

+

+extern BoxClassRec boxClassRec;

+

+/* New fields for the Box widget record */

+typedef struct {

+    /* resources */

+    Dimension h_space, v_space;

+    XtOrientation orientation;

+

+    /* private state */

+    Dimension preferred_width, preferred_height;

+    Dimension last_query_width, last_query_height;

+    XtGeometryMask last_query_mode;

+#ifndef OLDXAW

+    XawDisplayList *display_list;

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} BoxPart;

+

+/*

+ * Full instance record declaration

+ */

+typedef struct _BoxRec {

+    CorePart	    core;

+    CompositePart   composite;

+    BoxPart 	    box;

+} BoxRec;

+

+#endif /* _XawBoxP_h */

diff --git a/X11/Xaw/Cardinals.h b/X11/Xaw/Cardinals.h
index a8b3dfc41..1c536208e 100644
--- a/X11/Xaw/Cardinals.h
+++ b/X11/Xaw/Cardinals.h
@@ -1,43 +1,42 @@
-/* $Xorg: Cardinals.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */
-/*
-
-Copyright 1985, 1986, 1987, 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 _Cardinals_h
-#define _Cardinals_h
-
-#define ZERO	((Cardinal)0)
-#define ONE	((Cardinal)1)
-#define TWO	((Cardinal)2)
-#define THREE	((Cardinal)3)
-#define FOUR	((Cardinal)4)
-#define FIVE	((Cardinal)5)
-#define SIX	((Cardinal)6)
-#define SEVEN	((Cardinal)7)
-#define EIGHT	((Cardinal)8)
-#define NINE	((Cardinal)9)
-#define TEN	((Cardinal)10)
-
-#endif /* _Cardinals_h */
+/*

+

+Copyright 1985, 1986, 1987, 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 _Cardinals_h

+#define _Cardinals_h

+

+#define ZERO	((Cardinal)0)

+#define ONE	((Cardinal)1)

+#define TWO	((Cardinal)2)

+#define THREE	((Cardinal)3)

+#define FOUR	((Cardinal)4)

+#define FIVE	((Cardinal)5)

+#define SIX	((Cardinal)6)

+#define SEVEN	((Cardinal)7)

+#define EIGHT	((Cardinal)8)

+#define NINE	((Cardinal)9)

+#define TEN	((Cardinal)10)

+

+#endif /* _Cardinals_h */

diff --git a/X11/Xaw/Command.h b/X11/Xaw/Command.h
index 49eb99122..ba21a1e9c 100644
--- a/X11/Xaw/Command.h
+++ b/X11/Xaw/Command.h
@@ -1,119 +1,116 @@
-/* $Xorg: Command.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Command.h,v 1.5 2001/01/17 19:42:26 dawes Exp $ */
-
-#ifndef _XawCommand_h
-#define _XawCommand_h
-
-#include <X11/Xaw/Label.h>
-
-/* Command widget resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- accelerators	     Accelerators	AcceleratorTable NULL
- ancestorSensitive   AncestorSensitive	Boolean		True
- background	     Background		Pixel		XtDefaultBackground
- backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap
- bitmap		     Pixmap		Pixmap		None
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderPixmap	     Pixmap		Pixmap		XtUnspecifiedPixmap
- borderWidth	     BorderWidth	Dimension	1
- callback	     Callback		XtCallbackList	NULL
- colormap	     Colormap		Colormap	parent's colormap
- cornerRoundPercent  CornerRoundPercent	Dimension	25
- cursor		     Cursor		Cursor		None
- cursorName	     Cursor		String		NULL
- depth		     Depth		int		parent's depth
- destroyCallback     Callback		XtCallbackList	NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- encoding	     Encoding		UnsignedChar	XawTextEncoding8bit
- font		     Font		XFontStruct*	XtDefaultFont
- foreground	     Foreground		Pixel		XtDefaultForeground
- height		     Height		Dimension	text height
- highlightThickness  Thickness		Dimension	0 if shaped, else 2
- insensitiveBorder   Insensitive	Pixmap		Gray
- internalHeight	     Height		Dimension	2
- internalWidth	     Width		Dimension	4
- justify	     Justify		XtJustify	XtJustifyCenter
- label		     Label		String		NULL
- leftBitmap	     LeftBitmap		Pixmap		None
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- pointerColor	     Foreground		Pixel		XtDefaultForeground
- pointerColorBackground Background	Pixel		XtDefaultBackground
- resize		     Resize		Boolean		True
- screen		     Screen		Screen		parent's Screen
- sensitive	     Sensitive		Boolean		True
- shapeStyle	     ShapeStyle		ShapeStyle	Rectangle
- translations	     Translations	TranslationTable see doc or source
- width		     Width		Dimension	text width
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtNhighlightThickness "highlightThickness"
-
-#define XtNshapeStyle "shapeStyle"
-#define XtCShapeStyle "ShapeStyle"
-#define XtRShapeStyle "ShapeStyle"
-#define XtNcornerRoundPercent "cornerRoundPercent"
-#define XtCCornerRoundPercent "CornerRoundPercent"
-
-#define XawShapeRectangle XmuShapeRectangle
-#define XawShapeOval XmuShapeOval
-#define XawShapeEllipse XmuShapeEllipse
-#define XawShapeRoundedRectangle XmuShapeRoundedRectangle
-
-extern WidgetClass     commandWidgetClass;
-
-typedef struct _CommandClassRec   *CommandWidgetClass;
-typedef struct _CommandRec        *CommandWidget;
-
-#endif /* _XawCommand_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawCommand_h

+#define _XawCommand_h

+

+#include <X11/Xaw/Label.h>

+

+/* Command widget resources:

+

+ Name		     Class		RepType		Default Value

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

+ accelerators	     Accelerators	AcceleratorTable NULL

+ ancestorSensitive   AncestorSensitive	Boolean		True

+ background	     Background		Pixel		XtDefaultBackground

+ backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap

+ bitmap		     Pixmap		Pixmap		None

+ borderColor	     BorderColor	Pixel		XtDefaultForeground

+ borderPixmap	     Pixmap		Pixmap		XtUnspecifiedPixmap

+ borderWidth	     BorderWidth	Dimension	1

+ callback	     Callback		XtCallbackList	NULL

+ colormap	     Colormap		Colormap	parent's colormap

+ cornerRoundPercent  CornerRoundPercent	Dimension	25

+ cursor		     Cursor		Cursor		None

+ cursorName	     Cursor		String		NULL

+ depth		     Depth		int		parent's depth

+ destroyCallback     Callback		XtCallbackList	NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ encoding	     Encoding		UnsignedChar	XawTextEncoding8bit

+ font		     Font		XFontStruct*	XtDefaultFont

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ height		     Height		Dimension	text height

+ highlightThickness  Thickness		Dimension	0 if shaped, else 2

+ insensitiveBorder   Insensitive	Pixmap		Gray

+ internalHeight	     Height		Dimension	2

+ internalWidth	     Width		Dimension	4

+ justify	     Justify		XtJustify	XtJustifyCenter

+ label		     Label		String		NULL

+ leftBitmap	     LeftBitmap		Pixmap		None

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ pointerColor	     Foreground		Pixel		XtDefaultForeground

+ pointerColorBackground Background	Pixel		XtDefaultBackground

+ resize		     Resize		Boolean		True

+ screen		     Screen		Screen		parent's Screen

+ sensitive	     Sensitive		Boolean		True

+ shapeStyle	     ShapeStyle		ShapeStyle	Rectangle

+ translations	     Translations	TranslationTable see doc or source

+ width		     Width		Dimension	text width

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtNhighlightThickness "highlightThickness"

+

+#define XtNshapeStyle "shapeStyle"

+#define XtCShapeStyle "ShapeStyle"

+#define XtRShapeStyle "ShapeStyle"

+#define XtNcornerRoundPercent "cornerRoundPercent"

+#define XtCCornerRoundPercent "CornerRoundPercent"

+

+#define XawShapeRectangle XmuShapeRectangle

+#define XawShapeOval XmuShapeOval

+#define XawShapeEllipse XmuShapeEllipse

+#define XawShapeRoundedRectangle XmuShapeRoundedRectangle

+

+extern WidgetClass     commandWidgetClass;

+

+typedef struct _CommandClassRec   *CommandWidgetClass;

+typedef struct _CommandRec        *CommandWidget;

+

+#endif /* _XawCommand_h */

diff --git a/X11/Xaw/CommandP.h b/X11/Xaw/CommandP.h
index bc639f825..6e6e1d42b 100644
--- a/X11/Xaw/CommandP.h
+++ b/X11/Xaw/CommandP.h
@@ -1,117 +1,111 @@
-/*
-* $Xorg: CommandP.h,v 1.4 2001/02/09 02:03:43 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.7 2001/01/17 19:42:26 dawes Exp $ */
-
-#ifndef _XawCommandP_h
-#define _XawCommandP_h
-
-/*
- * Command Widget Private Data
- */
-#include <X11/Xaw/Command.h>
-#include <X11/Xaw/LabelP.h>
-
-typedef enum {
-    HighlightNone,		/* Do not highlight */
-    HighlightWhenUnset,		/* Highlight only when unset, this is
-				   to preserve current command widget 
-				   functionality */
-    HighlightAlways		/* Always highlight, lets the toggle widget
-				   and other subclasses do the right thing */
-} XtCommandHighlight;
-
-/* New fields for the Command widget class record */
-typedef struct _CommandClass {
-    XtPointer extension;
-} CommandClassPart;
-
-/* Full class record declaration */
-typedef struct _CommandClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    LabelClassPart	label_class;
-    CommandClassPart    command_class;
-} CommandClassRec;
-
-extern CommandClassRec commandClassRec;
-
-/* New fields for the Command widget record */
-typedef struct {
-    /* resources */
-    Dimension   highlight_thickness;
-    XtCallbackList callbacks;
-
-    /* private state */
-    Pixmap      	gray_pixmap;
-    GC          	normal_GC;
-    GC          	inverse_GC;
-    Boolean     	set;
-    XtCommandHighlight	highlighted;
-
-    /* more resources */
-    int			shape_style;    
-    Dimension		corner_round;
-
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} CommandPart;
-
-/* Full widget declaration */
-typedef struct _CommandRec {
-    CorePart         core;
-    SimplePart	     simple;
-    LabelPart	     label;
-    CommandPart      command;
-} CommandRec;
-
-#endif /* _XawCommandP_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.

+

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

+

+#ifndef _XawCommandP_h

+#define _XawCommandP_h

+

+/*

+ * Command Widget Private Data

+ */

+#include <X11/Xaw/Command.h>

+#include <X11/Xaw/LabelP.h>

+

+typedef enum {

+    HighlightNone,		/* Do not highlight */

+    HighlightWhenUnset,		/* Highlight only when unset, this is

+				   to preserve current command widget 

+				   functionality */

+    HighlightAlways		/* Always highlight, lets the toggle widget

+				   and other subclasses do the right thing */

+} XtCommandHighlight;

+

+/* New fields for the Command widget class record */

+typedef struct _CommandClass {

+    XtPointer extension;

+} CommandClassPart;

+

+/* Full class record declaration */

+typedef struct _CommandClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    LabelClassPart	label_class;

+    CommandClassPart    command_class;

+} CommandClassRec;

+

+extern CommandClassRec commandClassRec;

+

+/* New fields for the Command widget record */

+typedef struct {

+    /* resources */

+    Dimension   highlight_thickness;

+    XtCallbackList callbacks;

+

+    /* private state */

+    Pixmap      	gray_pixmap;

+    GC          	normal_GC;

+    GC          	inverse_GC;

+    Boolean     	set;

+    XtCommandHighlight	highlighted;

+

+    /* more resources */

+    int			shape_style;    

+    Dimension		corner_round;

+

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} CommandPart;

+

+/* Full widget declaration */

+typedef struct _CommandRec {

+    CorePart         core;

+    SimplePart	     simple;

+    LabelPart	     label;

+    CommandPart      command;

+} CommandRec;

+

+#endif /* _XawCommandP_h */

diff --git a/X11/Xaw/Dialog.h b/X11/Xaw/Dialog.h
index 96fd36d38..2d84c0d4d 100644
--- a/X11/Xaw/Dialog.h
+++ b/X11/Xaw/Dialog.h
@@ -1,101 +1,98 @@
-/* $Xorg: Dialog.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.5 2001/01/17 19:42:26 dawes Exp $ */
-
-#ifndef _XawDialog_h
-#define _XawDialog_h
-
-#include <X11/Xaw/Form.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- destroyCallback     Callback		Pointer		NULL
- height		     Height		Dimension	computed at create
- icon		     Icon		Pixmap		0
- label		     Label		String		NULL
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- sensitive	     Sensitive		Boolean		True
- value		     Value		String		NULL
- width		     Width		Dimension	computed at create
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtCIcon "Icon"
-#define XtNicon "icon"
-
-typedef struct _DialogClassRec	*DialogWidgetClass;
-typedef struct _DialogRec	*DialogWidget;
-
-extern WidgetClass dialogWidgetClass;
-
-_XFUNCPROTOBEGIN
-
-void XawDialogAddButton
-(
- Widget			dialog,
- _Xconst char		*name,
- XtCallbackProc		function,
- XtPointer		client_data
- );
-
-char *XawDialogGetValueString
-(
- Widget			w
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XawDialog_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawDialog_h

+#define _XawDialog_h

+

+#include <X11/Xaw/Form.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ borderColor	     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ destroyCallback     Callback		Pointer		NULL

+ height		     Height		Dimension	computed at create

+ icon		     Icon		Pixmap		0

+ label		     Label		String		NULL

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ sensitive	     Sensitive		Boolean		True

+ value		     Value		String		NULL

+ width		     Width		Dimension	computed at create

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtCIcon "Icon"

+#define XtNicon "icon"

+

+typedef struct _DialogClassRec	*DialogWidgetClass;

+typedef struct _DialogRec	*DialogWidget;

+

+extern WidgetClass dialogWidgetClass;

+

+_XFUNCPROTOBEGIN

+

+void XawDialogAddButton

+(

+ Widget			dialog,

+ _Xconst char		*name,

+ XtCallbackProc		function,

+ XtPointer		client_data

+ );

+

+char *XawDialogGetValueString

+(

+ Widget			w

+);

+

+_XFUNCPROTOEND

+

+#endif /* _XawDialog_h */

diff --git a/X11/Xaw/DialogP.h b/X11/Xaw/DialogP.h
index fcc2240d7..d6d55d3b6 100644
--- a/X11/Xaw/DialogP.h
+++ b/X11/Xaw/DialogP.h
@@ -1,104 +1,100 @@
-/* $Xorg: DialogP.h,v 1.4 2001/02/09 02:03:43 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.8 2001/01/17 19:42:26 dawes Exp $ */
-
-#ifndef _DialogP_h
-#define _DialogP_h
-
-#include <X11/Xaw/Dialog.h>
-#include <X11/Xaw/FormP.h>
-
-typedef struct {
-    XtPointer extension;
-} DialogClassPart;
-
-typedef struct _DialogClassRec {
-    CoreClassPart	core_class;
-    CompositeClassPart	composite_class;
-    ConstraintClassPart	constraint_class;
-    FormClassPart	form_class;
-    DialogClassPart	dialog_class;
-} DialogClassRec;
-
-extern DialogClassRec dialogClassRec;
-
-typedef struct _DialogPart {
-    /* resources */
-    String	label;		/* description of the dialog	 */
-    String	value;		/* for the user response	 */
-    Pixmap	icon;		/* icon bitmap			 */
-
-    /* private */
-    Widget	iconW;		/* widget to display the icon	 */
-    Widget	labelW;		/* widget to display description */
-    Widget	valueW;		/* user response TextWidget	 */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} DialogPart;
-
-typedef struct _DialogRec {
-    CorePart		core;
-    CompositePart	composite;
-    ConstraintPart	constraint;
-    FormPart		form;
-    DialogPart		dialog;
-} DialogRec;
-
-typedef struct {
-    XtPointer extension;
-} DialogConstraintsPart;
-
-typedef struct _DialogConstraintsRec {
-    FormConstraintsPart	  form;
-    DialogConstraintsPart dialog;
-} DialogConstraintsRec, *DialogConstraints;
-
-#endif /* _DialogP_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.

+

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

+

+#ifndef _DialogP_h

+#define _DialogP_h

+

+#include <X11/Xaw/Dialog.h>

+#include <X11/Xaw/FormP.h>

+

+typedef struct {

+    XtPointer extension;

+} DialogClassPart;

+

+typedef struct _DialogClassRec {

+    CoreClassPart	core_class;

+    CompositeClassPart	composite_class;

+    ConstraintClassPart	constraint_class;

+    FormClassPart	form_class;

+    DialogClassPart	dialog_class;

+} DialogClassRec;

+

+extern DialogClassRec dialogClassRec;

+

+typedef struct _DialogPart {

+    /* resources */

+    String	label;		/* description of the dialog	 */

+    String	value;		/* for the user response	 */

+    Pixmap	icon;		/* icon bitmap			 */

+

+    /* private */

+    Widget	iconW;		/* widget to display the icon	 */

+    Widget	labelW;		/* widget to display description */

+    Widget	valueW;		/* user response TextWidget	 */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} DialogPart;

+

+typedef struct _DialogRec {

+    CorePart		core;

+    CompositePart	composite;

+    ConstraintPart	constraint;

+    FormPart		form;

+    DialogPart		dialog;

+} DialogRec;

+

+typedef struct {

+    XtPointer extension;

+} DialogConstraintsPart;

+

+typedef struct _DialogConstraintsRec {

+    FormConstraintsPart	  form;

+    DialogConstraintsPart dialog;

+} DialogConstraintsRec, *DialogConstraints;

+

+#endif /* _DialogP_h */

diff --git a/X11/Xaw/Form.h b/X11/Xaw/Form.h
index 9eb1ad7d6..a290cb5dc 100644
--- a/X11/Xaw/Form.h
+++ b/X11/Xaw/Form.h
@@ -1,171 +1,167 @@
-/* $Xorg: Form.h,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Form.h,v 1.8 2001/01/17 19:42:26 dawes Exp $ */
-
-#ifndef _XawForm_h
-#define _XawForm_h
-
-#include <X11/Intrinsic.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- defaultDistance     Thickness		int		4
- destroyCallback     Callback		Pointer		NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- height		     Height		Dimension	computed at realize
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	computed at realize
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-/* Constraint parameters:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- bottom		     Edge		XtEdgeType	XtRubber
- fromHoriz	     Widget		Widget		(left edge of form)
- fromVert	     Widget		Widget		(top of form)
- horizDistance	     Thickness		int		defaultDistance
- left		     Edge		XtEdgeType	XtRubber
- resizable	     Boolean		Boolean		False
- right		     Edge		XtEdgeType	XtRubber
- top		     Edge		XtEdgeType	XtRubber
- vertDistance	     Thickness		int		defaultDistance
-
-*/
-
-
-#ifndef _XtStringDefs_h_
-#define XtNtop "top"
-#define XtRWidget "Widget"
-#endif
-
-#define XtNdefaultDistance "defaultDistance"
-#define XtNbottom "bottom"
-#define XtNleft "left"
-#define XtNright "right"
-#define XtNfromHoriz "fromHoriz"
-#define XtNfromVert "fromVert"
-#define XtNhorizDistance "horizDistance"
-#define XtNvertDistance "vertDistance"
-#define XtNresizable "resizable"
-
-#define XtCEdge "Edge"
-#define XtCWidget "Widget"
-
-typedef enum {
-    XawChainTop,		/* Keep this edge a constant distance from
-				   the top of the form */
-    XawChainBottom,		/* Keep this edge a constant distance from
-				   the bottom of the form */
-    XawChainLeft,		/* Keep this edge a constant distance from
-				   the left of the form */
-    XawChainRight,		/* Keep this edge a constant distance from
-				   the right of the form */
-    XawRubber			/* Keep this edge a proportional distance
-				   from the edges of the form */
-} XawEdgeType;
-
-#define XtEdgeType XawEdgeType
-
-#define XtChainTop XawChainTop
-#define XtChainBottom XawChainBottom
-#define XtChainLeft XawChainLeft
-#define XtChainRight XawChainRight
-#define XtRubber XawRubber
-
-#define XtEchainLeft		"chainLeft"
-#define XtEchainRight		"chainRight"
-#define XtEchainTop		"chainTop"
-#define XtEchainBottom		"chainBottom"
-#define XtErubber		"rubber"
-
-#ifndef OLDXAW
-#ifndef XawNdisplayList
-#define XawNdisplayList "displayList"
-#endif
- 
-#ifndef XawCDisplayList
-#define XawCDisplayList "DisplayList"
-#endif
-
-#ifndef XawRDisplayList
-#define XawRDisplayList "XawDisplayList"
-#endif
-#endif
-
-typedef struct _FormClassRec	*FormWidgetClass;
-typedef struct _FormRec		*FormWidget;
-
-extern WidgetClass formWidgetClass;
-
-_XFUNCPROTOBEGIN
-
-void XawFormDoLayout
-(
- Widget		w,
-#if NeedWidePrototypes
- Bool		do_layout
-#else
- Boolean	do_layout
-#endif
- );
-
-_XFUNCPROTOEND
- 
-#endif /* _XawForm_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawForm_h

+#define _XawForm_h

+

+#include <X11/Intrinsic.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ defaultDistance     Thickness		int		4

+ destroyCallback     Callback		Pointer		NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ height		     Height		Dimension	computed at realize

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	computed at realize

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+/* Constraint parameters:

+

+ Name		     Class		RepType		Default Value

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

+ bottom		     Edge		XtEdgeType	XtRubber

+ fromHoriz	     Widget		Widget		(left edge of form)

+ fromVert	     Widget		Widget		(top of form)

+ horizDistance	     Thickness		int		defaultDistance

+ left		     Edge		XtEdgeType	XtRubber

+ resizable	     Boolean		Boolean		False

+ right		     Edge		XtEdgeType	XtRubber

+ top		     Edge		XtEdgeType	XtRubber

+ vertDistance	     Thickness		int		defaultDistance

+

+*/

+

+

+#ifndef _XtStringDefs_h_

+#define XtNtop "top"

+#define XtRWidget "Widget"

+#endif

+

+#define XtNdefaultDistance "defaultDistance"

+#define XtNbottom "bottom"

+#define XtNleft "left"

+#define XtNright "right"

+#define XtNfromHoriz "fromHoriz"

+#define XtNfromVert "fromVert"

+#define XtNhorizDistance "horizDistance"

+#define XtNvertDistance "vertDistance"

+#define XtNresizable "resizable"

+

+#define XtCEdge "Edge"

+#define XtCWidget "Widget"

+

+typedef enum {

+    XawChainTop,		/* Keep this edge a constant distance from

+				   the top of the form */

+    XawChainBottom,		/* Keep this edge a constant distance from

+				   the bottom of the form */

+    XawChainLeft,		/* Keep this edge a constant distance from

+				   the left of the form */

+    XawChainRight,		/* Keep this edge a constant distance from

+				   the right of the form */

+    XawRubber			/* Keep this edge a proportional distance

+				   from the edges of the form */

+} XawEdgeType;

+

+#define XtEdgeType XawEdgeType

+

+#define XtChainTop XawChainTop

+#define XtChainBottom XawChainBottom

+#define XtChainLeft XawChainLeft

+#define XtChainRight XawChainRight

+#define XtRubber XawRubber

+

+#define XtEchainLeft		"chainLeft"

+#define XtEchainRight		"chainRight"

+#define XtEchainTop		"chainTop"

+#define XtEchainBottom		"chainBottom"

+#define XtErubber		"rubber"

+

+#ifndef OLDXAW

+#ifndef XawNdisplayList

+#define XawNdisplayList "displayList"

+#endif

+ 

+#ifndef XawCDisplayList

+#define XawCDisplayList "DisplayList"

+#endif

+

+#ifndef XawRDisplayList

+#define XawRDisplayList "XawDisplayList"

+#endif

+#endif

+

+typedef struct _FormClassRec	*FormWidgetClass;

+typedef struct _FormRec		*FormWidget;

+

+extern WidgetClass formWidgetClass;

+

+_XFUNCPROTOBEGIN

+

+void XawFormDoLayout

+(

+ Widget		w,

+#if NeedWidePrototypes

+ Bool		do_layout

+#else

+ Boolean	do_layout

+#endif

+ );

+

+_XFUNCPROTOEND

+ 

+#endif /* _XawForm_h */

diff --git a/X11/Xaw/FormP.h b/X11/Xaw/FormP.h
index 7203dda0c..fa6757666 100644
--- a/X11/Xaw/FormP.h
+++ b/X11/Xaw/FormP.h
@@ -1,142 +1,139 @@
-/* $Xorg: FormP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/FormP.h,v 1.13 2001/12/14 19:54:40 dawes Exp $ */
-
-/* Form widget private definitions */
-
-#ifndef _XawFormP_h
-#define _XawFormP_h
-
-#include <X11/Xfuncproto.h>
-
-#include <X11/Xaw/Form.h>
-#include <X11/Xaw/XawInit.h>
-
-_XFUNCPROTOBEGIN
-
-#define XtREdgeType "EdgeType"
-
-typedef enum {
-    LayoutPending,
-    LayoutInProgress,
-    LayoutDone
-} LayoutState;
-
-#define XtInheritLayout							\
-((Boolean (*)(FormWidget, unsigned int, unsigned int, Bool))_XtInherit)
-
-typedef struct {
-    Boolean(*layout)(FormWidget, unsigned int, unsigned int, Bool);
-#ifndef OLDXAW
-    XtPointer extension;
-#endif
-} FormClassPart;
-
-typedef struct _FormClassRec {
-    CoreClassPart	core_class;
-    CompositeClassPart	composite_class;
-    ConstraintClassPart	constraint_class;
-    FormClassPart	form_class;
-} FormClassRec;
-
-extern FormClassRec formClassRec;
-
-typedef struct _FormPart {
-    /* resources */
-    int		default_spacing;    /* default distance between children */
-
-    /* private */
-    Dimension	old_width, old_height; /* reference value for *_virtual  */
-    int		no_refigure;	    /* no re-layout while > 0		 */
-    Boolean	needs_relayout;	    /* next time no_refigure == 0	 */
-    Boolean	resize_in_layout;   /* should layout() do geom request?  */
-    Dimension	preferred_width, preferred_height; /* cached from layout */
-    Boolean	resize_is_no_op;    /* Causes resize to take not action  */
-#ifndef OLDXAW
-    XawDisplayList *display_list;
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} FormPart;
-
-typedef struct _FormRec {
-    CorePart		core;
-    CompositePart	composite;
-    ConstraintPart	constraint;
-    FormPart		form;
-} FormRec;
-
-typedef struct _FormConstraintsPart {
-    /* resources */
-    XtEdgeType top, bottom, left, right;/* where to drag edge on resize */
-    int		dx;		/* desired horiz offset			*/
-    int		dy;		/* desired vertical offset		*/
-    Widget	horiz_base;	/* measure dx from here if non-null	*/
-    Widget	vert_base;	/* measure dy from here if non-null	*/
-    Boolean	allow_resize;	/* True if child may request resize	*/
-
-    /* private */
-    short	virtual_width, virtual_height;
-    Position	new_x, new_y;
-    LayoutState	layout_state;	/* temporary layout state		*/
-    Boolean	deferred_resize;/* was resized while no_refigure is set */
-#ifndef OLDXAW
-    short	virtual_x, virtual_y;
-    XtPointer	pad[2];		/* leave some space for further optimizations
-				 * in the form widget geometry
-				 */
-#endif
-} FormConstraintsPart;
-
-typedef struct _FormConstraintsRec {
-    FormConstraintsPart	form;
-} FormConstraintsRec, *FormConstraints;
-
-_XFUNCPROTOEND
-
-#endif /* _XawFormP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+/* Form widget private definitions */

+

+#ifndef _XawFormP_h

+#define _XawFormP_h

+

+#include <X11/Xfuncproto.h>

+

+#include <X11/Xaw/Form.h>

+#include <X11/Xaw/XawInit.h>

+

+_XFUNCPROTOBEGIN

+

+#define XtREdgeType "EdgeType"

+

+typedef enum {

+    LayoutPending,

+    LayoutInProgress,

+    LayoutDone

+} LayoutState;

+

+#define XtInheritLayout							\

+((Boolean (*)(FormWidget, unsigned int, unsigned int, Bool))_XtInherit)

+

+typedef struct {

+    Boolean(*layout)(FormWidget, unsigned int, unsigned int, Bool);

+#ifndef OLDXAW

+    XtPointer extension;

+#endif

+} FormClassPart;

+

+typedef struct _FormClassRec {

+    CoreClassPart	core_class;

+    CompositeClassPart	composite_class;

+    ConstraintClassPart	constraint_class;

+    FormClassPart	form_class;

+} FormClassRec;

+

+extern FormClassRec formClassRec;

+

+typedef struct _FormPart {

+    /* resources */

+    int		default_spacing;    /* default distance between children */

+

+    /* private */

+    Dimension	old_width, old_height; /* reference value for *_virtual  */

+    int		no_refigure;	    /* no re-layout while > 0		 */

+    Boolean	needs_relayout;	    /* next time no_refigure == 0	 */

+    Boolean	resize_in_layout;   /* should layout() do geom request?  */

+    Dimension	preferred_width, preferred_height; /* cached from layout */

+    Boolean	resize_is_no_op;    /* Causes resize to take not action  */

+#ifndef OLDXAW

+    XawDisplayList *display_list;

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} FormPart;

+

+typedef struct _FormRec {

+    CorePart		core;

+    CompositePart	composite;

+    ConstraintPart	constraint;

+    FormPart		form;

+} FormRec;

+

+typedef struct _FormConstraintsPart {

+    /* resources */

+    XtEdgeType top, bottom, left, right;/* where to drag edge on resize */

+    int		dx;		/* desired horiz offset			*/

+    int		dy;		/* desired vertical offset		*/

+    Widget	horiz_base;	/* measure dx from here if non-null	*/

+    Widget	vert_base;	/* measure dy from here if non-null	*/

+    Boolean	allow_resize;	/* True if child may request resize	*/

+

+    /* private */

+    short	virtual_width, virtual_height;

+    Position	new_x, new_y;

+    LayoutState	layout_state;	/* temporary layout state		*/

+    Boolean	deferred_resize;/* was resized while no_refigure is set */

+#ifndef OLDXAW

+    short	virtual_x, virtual_y;

+    XtPointer	pad[2];		/* leave some space for further optimizations

+				 * in the form widget geometry

+				 */

+#endif

+} FormConstraintsPart;

+

+typedef struct _FormConstraintsRec {

+    FormConstraintsPart	form;

+} FormConstraintsRec, *FormConstraints;

+

+_XFUNCPROTOEND

+

+#endif /* _XawFormP_h */

diff --git a/X11/Xaw/Grip.h b/X11/Xaw/Grip.h
index 1c19f6043..03d18fff2 100644
--- a/X11/Xaw/Grip.h
+++ b/X11/Xaw/Grip.h
@@ -1,99 +1,96 @@
-/* $Xorg: Grip.h,v 1.4 2001/02/09 02:03:43 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Grip.h,v 1.6 2001/01/17 19:42:26 dawes Exp $ */
-
-/*
- *  Grip.h - Public Definitions for Grip widget (used by VPane Widget)
- *
- */
-
-#ifndef _XawGrip_h
-#define _XawGrip_h
-
-#include <X11/Xaw/Simple.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- foreground	     Foreground		Pixel		XtDefaultForeground
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	0
- callback	     Callback		Pointer		GripAction
- cursor		     Cursor		Cursor		None
- cursorName	     Cursor		String		NULL
- destroyCallback     Callback		Pointer		NULL
- height		     Height		Dimension	8
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- pointerColor	     Foreground		Pixel		XtDefaultForeground
- pointerColorBackground Background	Pixel		XtDefaultBackground
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	8
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtNgripTranslations "gripTranslations"
-
-typedef struct _XawGripCallData {
-    XEvent *event;			/* the event causing the GripAction */
-    String *params;			/* the TranslationTable params */
-    Cardinal num_params;		/* count of params */
-} XawGripCallDataRec, *XawGripCallData,
-  GripCallDataRec, *GripCallData; /* supported for R4 compatibility */
-
-/* Class Record Constant */
-
-extern WidgetClass gripWidgetClass;
-
-typedef struct _GripClassRec *GripWidgetClass;
-typedef struct _GripRec      *GripWidget;
-
-#endif /* _XawGrip_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.

+

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

+

+/*

+ *  Grip.h - Public Definitions for Grip widget (used by VPane Widget)

+ *

+ */

+

+#ifndef _XawGrip_h

+#define _XawGrip_h

+

+#include <X11/Xaw/Simple.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	0

+ callback	     Callback		Pointer		GripAction

+ cursor		     Cursor		Cursor		None

+ cursorName	     Cursor		String		NULL

+ destroyCallback     Callback		Pointer		NULL

+ height		     Height		Dimension	8

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ pointerColor	     Foreground		Pixel		XtDefaultForeground

+ pointerColorBackground Background	Pixel		XtDefaultBackground

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	8

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtNgripTranslations "gripTranslations"

+

+typedef struct _XawGripCallData {

+    XEvent *event;			/* the event causing the GripAction */

+    String *params;			/* the TranslationTable params */

+    Cardinal num_params;		/* count of params */

+} XawGripCallDataRec, *XawGripCallData,

+  GripCallDataRec, *GripCallData; /* supported for R4 compatibility */

+

+/* Class Record Constant */

+

+extern WidgetClass gripWidgetClass;

+

+typedef struct _GripClassRec *GripWidgetClass;

+typedef struct _GripRec      *GripWidget;

+

+#endif /* _XawGrip_h */

diff --git a/X11/Xaw/GripP.h b/X11/Xaw/GripP.h
index f40a8d1e7..ec732eeae 100644
--- a/X11/Xaw/GripP.h
+++ b/X11/Xaw/GripP.h
@@ -1,91 +1,85 @@
-/*
-* $Xorg: GripP.h,v 1.4 2001/02/09 02:03:43 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/GripP.h,v 1.7 2001/01/17 19:42:26 dawes Exp $ */
-
-#ifndef _XawGripP_h
-#define _XawGripP_h
-
-#include <X11/Xaw/Grip.h>
-#include <X11/Xaw/SimpleP.h>
-
-#define DEFAULT_GRIP_SIZE 8
-
-/* New fields for the Grip widget class */
-typedef struct {
-    XtPointer extension;
-} GripClassPart;
-
-/* Full Class record */
-typedef struct _GripClassRec {
-    CoreClassPart    core_class;
-    SimpleClassPart  simple_class;
-    GripClassPart    grip_class;
-} GripClassRec;
-
-extern GripClassRec gripClassRec;
-
-/* New fields for the Grip widget */
-typedef struct {
-    XtCallbackList grip_action;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} GripPart;
-
-/* Full instance record */
-typedef struct _GripRec {
-    CorePart	core;
-    SimplePart	simple;
-    GripPart	grip;
-} GripRec;
-
-#endif /* _XawGripP_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.

+

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

+

+#ifndef _XawGripP_h

+#define _XawGripP_h

+

+#include <X11/Xaw/Grip.h>

+#include <X11/Xaw/SimpleP.h>

+

+#define DEFAULT_GRIP_SIZE 8

+

+/* New fields for the Grip widget class */

+typedef struct {

+    XtPointer extension;

+} GripClassPart;

+

+/* Full Class record */

+typedef struct _GripClassRec {

+    CoreClassPart    core_class;

+    SimpleClassPart  simple_class;

+    GripClassPart    grip_class;

+} GripClassRec;

+

+extern GripClassRec gripClassRec;

+

+/* New fields for the Grip widget */

+typedef struct {

+    XtCallbackList grip_action;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} GripPart;

+

+/* Full instance record */

+typedef struct _GripRec {

+    CorePart	core;

+    SimplePart	simple;

+    GripPart	grip;

+} GripRec;

+

+#endif /* _XawGripP_h */

diff --git a/X11/Xaw/Label.h b/X11/Xaw/Label.h
index fc3942b01..3c4595efc 100644
--- a/X11/Xaw/Label.h
+++ b/X11/Xaw/Label.h
@@ -1,135 +1,132 @@
-/* $Xorg: Label.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Label.h,v 1.6 2001/01/17 19:42:27 dawes Exp $ */
-
-#ifndef _XawLabel_h
-#define _XawLabel_h
-
-/*
- * Label Widget
- */
-
-#include <X11/Xaw/Simple.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- bitmap		     Pixmap		Pixmap		None
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- cursor		     Cursor		Cursor		None
- cursorName	     Cursor		String		NULL
- destroyCallback     Callback		XtCallbackList	NULL
- encoding	     Encoding		UnsignedChar	XawTextEncoding8bit
- font		     Font		XFontStruct*	XtDefaultFont
- foreground	     Foreground		Pixel		XtDefaultForeground
- height		     Height		Dimension	text height
- insensitiveBorder   Insensitive	Pixmap		Gray
- internalHeight	     Height		Dimension	2
- internalWidth	     Width		Dimension	4
- justify	     Justify		XtJustify	XtJustifyCenter
- label		     Label		String		NULL
- leftBitmap	     LeftBitmap		Pixmap		None
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- pointerColor	     Foreground		Pixel		XtDefaultForeground
- pointerColorBackground Background	Pixel		XtDefaultBackground
- resize		     Resize		Boolean		True
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	text width
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XawTextEncoding8bit	0
-#define XawTextEncodingChar2b	1
-
-#define XtNleftBitmap "leftBitmap"
-#define XtCLeftBitmap "LeftBitmap"
-#define XtNencoding "encoding"
-#define XtCEncoding "Encoding"
-
-#ifndef XtNfontSet
-#define XtNfontSet "fontSet"
-#endif
-
-#ifndef XtCFontSet
-#define XtCFontSet "FontSet"
-#endif
-
-#ifndef _XtStringDefs_h_
-#define XtNbitmap "bitmap"
-#define XtNforeground "foreground"
-#define XtNlabel "label"
-#define XtNfont "font"
-#define XtNinternalWidth "internalWidth"
-#define XtNinternalHeight "internalHeight"
-#define XtNresize "resize"
-#define XtCResize "Resize"
-#define XtCBitmap "Bitmap"
-#endif
-
-#ifndef XtNlabelX
-#define XtNlabelX "labelX"
-#endif
-
-#ifndef XtNlabelY
-#define XtNlabelY "labelY"
-#endif
-
-/* Class record constants */
-
-extern WidgetClass labelWidgetClass;
-
-typedef struct _LabelClassRec *LabelWidgetClass;
-typedef struct _LabelRec      *LabelWidget;
-
-#endif /* _XawLabel_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawLabel_h

+#define _XawLabel_h

+

+/*

+ * Label Widget

+ */

+

+#include <X11/Xaw/Simple.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ bitmap		     Pixmap		Pixmap		None

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ cursor		     Cursor		Cursor		None

+ cursorName	     Cursor		String		NULL

+ destroyCallback     Callback		XtCallbackList	NULL

+ encoding	     Encoding		UnsignedChar	XawTextEncoding8bit

+ font		     Font		XFontStruct*	XtDefaultFont

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ height		     Height		Dimension	text height

+ insensitiveBorder   Insensitive	Pixmap		Gray

+ internalHeight	     Height		Dimension	2

+ internalWidth	     Width		Dimension	4

+ justify	     Justify		XtJustify	XtJustifyCenter

+ label		     Label		String		NULL

+ leftBitmap	     LeftBitmap		Pixmap		None

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ pointerColor	     Foreground		Pixel		XtDefaultForeground

+ pointerColorBackground Background	Pixel		XtDefaultBackground

+ resize		     Resize		Boolean		True

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	text width

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XawTextEncoding8bit	0

+#define XawTextEncodingChar2b	1

+

+#define XtNleftBitmap "leftBitmap"

+#define XtCLeftBitmap "LeftBitmap"

+#define XtNencoding "encoding"

+#define XtCEncoding "Encoding"

+

+#ifndef XtNfontSet

+#define XtNfontSet "fontSet"

+#endif

+

+#ifndef XtCFontSet

+#define XtCFontSet "FontSet"

+#endif

+

+#ifndef _XtStringDefs_h_

+#define XtNbitmap "bitmap"

+#define XtNforeground "foreground"

+#define XtNlabel "label"

+#define XtNfont "font"

+#define XtNinternalWidth "internalWidth"

+#define XtNinternalHeight "internalHeight"

+#define XtNresize "resize"

+#define XtCResize "Resize"

+#define XtCBitmap "Bitmap"

+#endif

+

+#ifndef XtNlabelX

+#define XtNlabelX "labelX"

+#endif

+

+#ifndef XtNlabelY

+#define XtNlabelY "labelY"

+#endif

+

+/* Class record constants */

+

+extern WidgetClass labelWidgetClass;

+

+typedef struct _LabelClassRec *LabelWidgetClass;

+typedef struct _LabelRec      *LabelWidget;

+

+#endif /* _XawLabel_h */

diff --git a/X11/Xaw/LabelP.h b/X11/Xaw/LabelP.h
index 9f49fdd4f..7271b8316 100644
--- a/X11/Xaw/LabelP.h
+++ b/X11/Xaw/LabelP.h
@@ -1,121 +1,115 @@
-/*
-* $Xorg: LabelP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */
-
-#ifndef _XawLabelP_h
-#define _XawLabelP_h
-
-/*
- * Label Widget Private Data
- */
-#include <X11/Xaw/Label.h>
-#include <X11/Xaw/SimpleP.h>
-
-/* New fields for the Label widget class record */
-typedef struct {
-  XtPointer extension;
-} LabelClassPart;
-
-/* Full class record declaration */
-typedef struct _LabelClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    LabelClassPart	label_class;
-} LabelClassRec;
-
-extern LabelClassRec labelClassRec;
-
-/* New fields for the Label widget record */
-typedef struct {
-    /* resources */
-    Pixel	foreground;
-    XFontStruct	*font;
-    XFontSet 	fontset;
-    char	*label;
-    XtJustify	justify;
-    Dimension	internal_width;
-    Dimension	internal_height;
-    Pixmap	pixmap;
-    Boolean	resize;
-    unsigned char encoding;
-    Pixmap	left_bitmap;
-
-    /* private state */
-    GC		normal_GC;
-    GC          gray_GC;
-    Pixmap	stipple;
-    Position	label_x;
-    Position	label_y;
-    Dimension	label_width;
-    Dimension	label_height;
-    Dimension	label_len;
-    int		lbm_y;			/* where in label */
-    unsigned int lbm_width, lbm_height;	 /* size of pixmap */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} LabelPart;
-
-/*
- * Full instance record declaration
- */
-typedef struct _LabelRec {
-    CorePart	core;
-    SimplePart	simple;
-    LabelPart	label;
-} LabelRec;
-
-#define LEFT_OFFSET(lw) ((lw)->label.left_bitmap \
-			 ? (lw)->label.lbm_width + (lw)->label.internal_width \
-			 : 0)
-
-#endif /* _XawLabelP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawLabelP_h

+#define _XawLabelP_h

+

+/*

+ * Label Widget Private Data

+ */

+#include <X11/Xaw/Label.h>

+#include <X11/Xaw/SimpleP.h>

+

+/* New fields for the Label widget class record */

+typedef struct {

+  XtPointer extension;

+} LabelClassPart;

+

+/* Full class record declaration */

+typedef struct _LabelClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    LabelClassPart	label_class;

+} LabelClassRec;

+

+extern LabelClassRec labelClassRec;

+

+/* New fields for the Label widget record */

+typedef struct {

+    /* resources */

+    Pixel	foreground;

+    XFontStruct	*font;

+    XFontSet 	fontset;

+    char	*label;

+    XtJustify	justify;

+    Dimension	internal_width;

+    Dimension	internal_height;

+    Pixmap	pixmap;

+    Boolean	resize;

+    unsigned char encoding;

+    Pixmap	left_bitmap;

+

+    /* private state */

+    GC		normal_GC;

+    GC          gray_GC;

+    Pixmap	stipple;

+    Position	label_x;

+    Position	label_y;

+    Dimension	label_width;

+    Dimension	label_height;

+    Dimension	label_len;

+    int		lbm_y;			/* where in label */

+    unsigned int lbm_width, lbm_height;	 /* size of pixmap */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} LabelPart;

+

+/*

+ * Full instance record declaration

+ */

+typedef struct _LabelRec {

+    CorePart	core;

+    SimplePart	simple;

+    LabelPart	label;

+} LabelRec;

+

+#define LEFT_OFFSET(lw) ((lw)->label.left_bitmap \

+			 ? (lw)->label.lbm_width + (lw)->label.internal_width \

+			 : 0)

+

+#endif /* _XawLabelP_h */

diff --git a/X11/Xaw/List.h b/X11/Xaw/List.h
index 2115eefd4..df0496bd4 100644
--- a/X11/Xaw/List.h
+++ b/X11/Xaw/List.h
@@ -1,237 +1,234 @@
-/* $Xorg: List.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */
-
-/*
-Copyright 1989, 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/Xaw/List.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */
-
-/*  This is the List widget, it is useful to display a list, without the
- *  overhead of having a widget for each item in the list.  It allows 
- *  the user to select an item in a list and notifies the application through
- *  a callback function.
- *
- *	Created: 	8/13/88
- *	By:		Chris D. Peterson
- *                      MIT X Consortium
- */
-
-#ifndef _XawList_h
-#define _XawList_h
-
-#include <X11/Xaw/Simple.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- callback            Callback           XtCallbackList  NULL       **6
- columnSpacing       Spacing            Dimension       6
- cursor		     Cursor		Cursor		left_ptr
- cursorName	     Cursor		String		NULL
- defaultColumns      Columns            int             2          **5
- destroyCallback     Callback		Pointer		NULL 
- font		     Font		XFontStruct*	XtDefaultFont
- forceColumns        Columns            Boolean         False      **5
- foreground	     Foreground		Pixel		XtDefaultForeground
- height		     Height		Dimension	0          **1
- insensitiveBorder   Insensitive	Pixmap		Gray
- internalHeight	     Height		Dimension	2
- internalWidth	     Width		Dimension	4
- list		     List		String*		NULL	   **2
- longest             Longest            int             0          **3  **4
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- numberStrings       NumberStrings      int             0          **4
- pasteBuffer         Boolean            Boolean         False
- pointerColor	     Foreground		Pixel		XtDefaultForeground
- pointerColorBackground Background	Pixel		XtDefaultBackground
- rowSpacing          Spacing            Dimension       4
- sensitive	     Sensitive		Boolean		True
- verticalList        Boolean            Boolean         False
- width		     Width		Dimension	0          **1
- x		     Position		Position	0
- y		     Position		Position	0
-
- **1 - If the Width or Height of the list widget is zero (0) then the value
-       is set to the minimum size necessay to fit the entire list.
-
-       If both Width and Height are zero then they are adjusted to fit the
-       entire list that is created width the number of default columns 
-       specified in the defaultColumns resource.
-
- **2 - This is an array of strings the specify elements of the list.
-       This resource must be specified. 
-       (What good is a list widget without a list??  :-)
-
- **3 - Longest is the length of the widest string in pixels.
-
- **4 - If either of these values are zero (0) then the list widget calculates
-       the correct value. 
-
-       (This allows you to make startup faster if you already have 
-        this information calculated)
-
-       NOTE: If the numberStrings value is zero the list must 
-             be NULL terminated.
-
- **5 - By setting the List.Columns resource you can force the application to
-       have a given number of columns.	     
-        
- **6 - This returns the name and index of the item selected in an 
-       XawListReturnStruct that is pointed to by the client_data
-       in the CallbackProc.
-
-*/
-
-/*
- * Value returned when there are no highlighted objects
- */
-#define XAW_LIST_NONE -1	
-
-#define XtCList "List"
-#define XtCSpacing "Spacing"
-#define XtCColumns "Columns"
-#define XtCLongest "Longest"
-#define XtCNumberStrings "NumberStrings"
-
-#define XtNcursor "cursor"
-#define XtNcolumnSpacing "columnSpacing"
-#define XtNdefaultColumns "defaultColumns"
-#define XtNforceColumns "forceColumns"
-#define XtNlist "list"
-#define XtNlongest "longest"
-#define XtNnumberStrings "numberStrings"
-#define XtNpasteBuffer "pasteBuffer"
-#define XtNrowSpacing "rowSpacing"
-#define XtNverticalList "verticalList"
-#define XtNshowCurrent "showCurrent"
- 
-#ifndef XtNfontSet
-#define XtNfontSet "fontSet"
-#endif
-
-#ifndef XtCFontSet
-#define XtCFontSet "FontSet"
-#endif
-
-extern WidgetClass listWidgetClass;
-
-typedef struct _ListClassRec *ListWidgetClass;
-typedef struct _ListRec      *ListWidget;
-
-/* list return structure */
-typedef struct _XawListReturnStruct {
-  String string;
-  int list_index;
-} XawListReturnStruct;
-
-_XFUNCPROTOBEGIN
-
-/*
- * Function:
- *	XawListChange
- *
- * Parameters:
- *	w	- list widget
- *	list	- new list
- *	nitems	- number of items in the list
- *	longest - length (in Pixels) of the longest element in the list
- *	resize	- if True the the list widget will try to resize itself
- *
- * Description:
- *	Changes the list being used and shown.
- *
- * Note:
- *	If nitems of longest are <= 0 then they will be caluculated
- *	If nitems is <= 0 then the list needs to be NULL terminated
- */
-void XawListChange
-(
- Widget			w,
- String			*list,
- int			nitems,
- int			longest,
-#if NeedWidePrototypes
- int			resize
-#else
- Boolean		resize
-#endif
- );
-
-/*
- * Function:
- *	XawListUnhighlight
- *
- * Parameters:
- *	w - list widget
- *
- * Description:
- *	Unlights the current highlighted element.
- */
-void XawListUnhighlight
-(
- Widget			w
- );
-
-/*
- * Function:
- *	XawListHighlight
- *
- * Parameters:
- *	w    - list widget
- *	item - item to highlight
- *
- * Description:
- *	Highlights the given item.
- */
-void XawListHighlight
-(
- Widget			w,
- int			item
- );
-
-
-/*
- * Function:
- *	XawListShowCurrent
- *
- * Paraneters:
- *	w - list widget
- *
- * Description:
- *	Returns the currently highlighted object.
- *
- * Returns:
- *	The info about the currently highlighted object
- */
-
-XawListReturnStruct *XawListShowCurrent
-(
- Widget			w
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawList_h */
+/*

+Copyright 1989, 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.

+*/

+

+/*  This is the List widget, it is useful to display a list, without the

+ *  overhead of having a widget for each item in the list.  It allows 

+ *  the user to select an item in a list and notifies the application through

+ *  a callback function.

+ *

+ *	Created: 	8/13/88

+ *	By:		Chris D. Peterson

+ *                      MIT X Consortium

+ */

+

+#ifndef _XawList_h

+#define _XawList_h

+

+#include <X11/Xaw/Simple.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ borderColor	     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ callback            Callback           XtCallbackList  NULL       **6

+ columnSpacing       Spacing            Dimension       6

+ cursor		     Cursor		Cursor		left_ptr

+ cursorName	     Cursor		String		NULL

+ defaultColumns      Columns            int             2          **5

+ destroyCallback     Callback		Pointer		NULL 

+ font		     Font		XFontStruct*	XtDefaultFont

+ forceColumns        Columns            Boolean         False      **5

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ height		     Height		Dimension	0          **1

+ insensitiveBorder   Insensitive	Pixmap		Gray

+ internalHeight	     Height		Dimension	2

+ internalWidth	     Width		Dimension	4

+ list		     List		String*		NULL	   **2

+ longest             Longest            int             0          **3  **4

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ numberStrings       NumberStrings      int             0          **4

+ pasteBuffer         Boolean            Boolean         False

+ pointerColor	     Foreground		Pixel		XtDefaultForeground

+ pointerColorBackground Background	Pixel		XtDefaultBackground

+ rowSpacing          Spacing            Dimension       4

+ sensitive	     Sensitive		Boolean		True

+ verticalList        Boolean            Boolean         False

+ width		     Width		Dimension	0          **1

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+ **1 - If the Width or Height of the list widget is zero (0) then the value

+       is set to the minimum size necessay to fit the entire list.

+

+       If both Width and Height are zero then they are adjusted to fit the

+       entire list that is created width the number of default columns 

+       specified in the defaultColumns resource.

+

+ **2 - This is an array of strings the specify elements of the list.

+       This resource must be specified. 

+       (What good is a list widget without a list??  :-)

+

+ **3 - Longest is the length of the widest string in pixels.

+

+ **4 - If either of these values are zero (0) then the list widget calculates

+       the correct value. 

+

+       (This allows you to make startup faster if you already have 

+        this information calculated)

+

+       NOTE: If the numberStrings value is zero the list must 

+             be NULL terminated.

+

+ **5 - By setting the List.Columns resource you can force the application to

+       have a given number of columns.	     

+        

+ **6 - This returns the name and index of the item selected in an 

+       XawListReturnStruct that is pointed to by the client_data

+       in the CallbackProc.

+

+*/

+

+/*

+ * Value returned when there are no highlighted objects

+ */

+#define XAW_LIST_NONE -1	

+

+#define XtCList "List"

+#define XtCSpacing "Spacing"

+#define XtCColumns "Columns"

+#define XtCLongest "Longest"

+#define XtCNumberStrings "NumberStrings"

+

+#define XtNcursor "cursor"

+#define XtNcolumnSpacing "columnSpacing"

+#define XtNdefaultColumns "defaultColumns"

+#define XtNforceColumns "forceColumns"

+#define XtNlist "list"

+#define XtNlongest "longest"

+#define XtNnumberStrings "numberStrings"

+#define XtNpasteBuffer "pasteBuffer"

+#define XtNrowSpacing "rowSpacing"

+#define XtNverticalList "verticalList"

+#define XtNshowCurrent "showCurrent"

+ 

+#ifndef XtNfontSet

+#define XtNfontSet "fontSet"

+#endif

+

+#ifndef XtCFontSet

+#define XtCFontSet "FontSet"

+#endif

+

+extern WidgetClass listWidgetClass;

+

+typedef struct _ListClassRec *ListWidgetClass;

+typedef struct _ListRec      *ListWidget;

+

+/* list return structure */

+typedef struct _XawListReturnStruct {

+  String string;

+  int list_index;

+} XawListReturnStruct;

+

+_XFUNCPROTOBEGIN

+

+/*

+ * Function:

+ *	XawListChange

+ *

+ * Parameters:

+ *	w	- list widget

+ *	list	- new list

+ *	nitems	- number of items in the list

+ *	longest - length (in Pixels) of the longest element in the list

+ *	resize	- if True the the list widget will try to resize itself

+ *

+ * Description:

+ *	Changes the list being used and shown.

+ *

+ * Note:

+ *	If nitems of longest are <= 0 then they will be caluculated

+ *	If nitems is <= 0 then the list needs to be NULL terminated

+ */

+void XawListChange

+(

+ Widget			w,

+ String			*list,

+ int			nitems,

+ int			longest,

+#if NeedWidePrototypes

+ int			resize

+#else

+ Boolean		resize

+#endif

+ );

+

+/*

+ * Function:

+ *	XawListUnhighlight

+ *

+ * Parameters:

+ *	w - list widget

+ *

+ * Description:

+ *	Unlights the current highlighted element.

+ */

+void XawListUnhighlight

+(

+ Widget			w

+ );

+

+/*

+ * Function:

+ *	XawListHighlight

+ *

+ * Parameters:

+ *	w    - list widget

+ *	item - item to highlight

+ *

+ * Description:

+ *	Highlights the given item.

+ */

+void XawListHighlight

+(

+ Widget			w,

+ int			item

+ );

+

+

+/*

+ * Function:

+ *	XawListShowCurrent

+ *

+ * Paraneters:

+ *	w - list widget

+ *

+ * Description:

+ *	Returns the currently highlighted object.

+ *

+ * Returns:

+ *	The info about the currently highlighted object

+ */

+

+XawListReturnStruct *XawListShowCurrent

+(

+ Widget			w

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawList_h */

diff --git a/X11/Xaw/ListP.h b/X11/Xaw/ListP.h
index 2b8fc4639..a65c51100 100644
--- a/X11/Xaw/ListP.h
+++ b/X11/Xaw/ListP.h
@@ -1,118 +1,115 @@
-/* $Xorg: ListP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */
-
-/*
-Copyright 1989, 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/Xaw/ListP.h,v 1.8 2001/01/17 19:42:27 dawes Exp $ */
-
-
-/* 
- * This is a List widget.  It allows the user to select an item in a list and
- * notifies the application through a callback function.
- *
- *	Created: 	8/13/88
- *	By:		Chris D. Peterson
- *                      MIT - Project Athena
- */
-
-#ifndef _XawListP_h
-#define _XawListP_h
-
-/*
- * List Widget Private Data
- */
-#include <X11/Xaw/SimpleP.h>
-#include <X11/Xaw/List.h>
-
-#define NO_HIGHLIGHT            XAW_LIST_NONE
-#define OUT_OF_RANGE            -1
-#define OKAY                     0
-
-/* New fields for the List widget class */
-typedef struct {
-    XtPointer extension;
-} ListClassPart;
-
-/* Full class record */
-typedef struct _ListClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    ListClassPart	list_class;
-} ListClassRec;
-
-extern ListClassRec listClassRec;
-
-/* New fields for the List widget */
-typedef struct {
-    /* resources */
-    Pixel foreground;
-    Dimension internal_width;		/* if not 3d, user sets directly */
-    Dimension internal_height;
-    Dimension column_space;		/* half of *_space is add on
-					   top/bot/left of */
-    Dimension row_space;		/* each item's text bounding box
-					   half added to longest for right */
-    int default_cols;
-    Boolean force_cols;
-    Boolean paste;
-    Boolean vertical_cols;
-    int longest;			/* in pixels */
-    int nitems;
-    XFontStruct	*font;
-    XFontSet fontset;			/* Sheeran, Omron KK, 93/03/05 */
-    String *list;			/* for i18n, always in multibyte
-					   format */
-    XtCallbackList callback;
-
-    /* private */
-    int is_highlighted;			/* set to the item currently
-					   highlighted */
-    int highlight;			/* set to the item that should be
-					   highlighted */
-    int col_width;			/* width of each column */
-    int row_height;			/* height of each row */
-    int nrows;				/* number of rows in the list */
-    int ncols;				/* number of columns in the list */
-    GC normgc;
-    GC revgc;
-    GC graygc;
-    int freedoms;			/* flags for resizing height
-					   and width */
-#ifndef OLDXAW
-    int selected;
-    Boolean show_current;
-    char pad1[(sizeof(XtPointer) - sizeof(Boolean)) +
-		 (sizeof(XtPointer) - sizeof(int))];
-    XtPointer pad2[2];	/* for future use and keep binary compatability */
-#endif
-} ListPart;
-
-
-/* Full instance record */
-typedef struct _ListRec {
-    CorePart	core;
-    SimplePart	simple;
-    ListPart	list;
-} ListRec;
-
-#endif /* _XawListP_h */
+/*

+Copyright 1989, 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.

+*/

+

+

+/* 

+ * This is a List widget.  It allows the user to select an item in a list and

+ * notifies the application through a callback function.

+ *

+ *	Created: 	8/13/88

+ *	By:		Chris D. Peterson

+ *                      MIT - Project Athena

+ */

+

+#ifndef _XawListP_h

+#define _XawListP_h

+

+/*

+ * List Widget Private Data

+ */

+#include <X11/Xaw/SimpleP.h>

+#include <X11/Xaw/List.h>

+

+#define NO_HIGHLIGHT            XAW_LIST_NONE

+#define OUT_OF_RANGE            -1

+#define OKAY                     0

+

+/* New fields for the List widget class */

+typedef struct {

+    XtPointer extension;

+} ListClassPart;

+

+/* Full class record */

+typedef struct _ListClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    ListClassPart	list_class;

+} ListClassRec;

+

+extern ListClassRec listClassRec;

+

+/* New fields for the List widget */

+typedef struct {

+    /* resources */

+    Pixel foreground;

+    Dimension internal_width;		/* if not 3d, user sets directly */

+    Dimension internal_height;

+    Dimension column_space;		/* half of *_space is add on

+					   top/bot/left of */

+    Dimension row_space;		/* each item's text bounding box

+					   half added to longest for right */

+    int default_cols;

+    Boolean force_cols;

+    Boolean paste;

+    Boolean vertical_cols;

+    int longest;			/* in pixels */

+    int nitems;

+    XFontStruct	*font;

+    XFontSet fontset;			/* Sheeran, Omron KK, 93/03/05 */

+    String *list;			/* for i18n, always in multibyte

+					   format */

+    XtCallbackList callback;

+

+    /* private */

+    int is_highlighted;			/* set to the item currently

+					   highlighted */

+    int highlight;			/* set to the item that should be

+					   highlighted */

+    int col_width;			/* width of each column */

+    int row_height;			/* height of each row */

+    int nrows;				/* number of rows in the list */

+    int ncols;				/* number of columns in the list */

+    GC normgc;

+    GC revgc;

+    GC graygc;

+    int freedoms;			/* flags for resizing height

+					   and width */

+#ifndef OLDXAW

+    int selected;

+    Boolean show_current;

+    char pad1[(sizeof(XtPointer) - sizeof(Boolean)) +

+		 (sizeof(XtPointer) - sizeof(int))];

+    XtPointer pad2[2];	/* for future use and keep binary compatability */

+#endif

+} ListPart;

+

+

+/* Full instance record */

+typedef struct _ListRec {

+    CorePart	core;

+    SimplePart	simple;

+    ListPart	list;

+} ListRec;

+

+#endif /* _XawListP_h */

diff --git a/X11/Xaw/MenuButtoP.h b/X11/Xaw/MenuButtoP.h
index 416fdf9b5..a4e058606 100644
--- a/X11/Xaw/MenuButtoP.h
+++ b/X11/Xaw/MenuButtoP.h
@@ -1,80 +1,79 @@
-/* $Xorg: MenuButtoP.h,v 1.4 2001/02/09 02:03:44 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/Xaw/MenuButtoP.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */
-
-/*
- * MenuButtonP.h - Private Header file for MenuButton widget.
- *
- * This is the private header file for the Athena MenuButton widget.
- * It is intended to provide an easy method of activating pulldown menus.
- *
- * Date:    May 2, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawMenuButtonP_h
-#define _XawMenuButtonP_h
-
-#include <X11/Xaw/MenuButton.h>
-#include <X11/Xaw/CommandP.h>
-
-/* New fields for the MenuButton widget class */
-typedef struct _MenuButtonClass {
-    XtPointer extension;
-} MenuButtonClassPart;
-
-/* class record declaration */
-typedef struct _MenuButtonClassRec {
-    CoreClassPart	    core_class;
-    SimpleClassPart	    simple_class;
-    LabelClassPart	    label_class;
-    CommandClassPart	    command_class;
-    MenuButtonClassPart	    menuButton_class;
-} MenuButtonClassRec;
-
-extern MenuButtonClassRec menuButtonClassRec;
-
-/* New fields for the MenuButton widget */
-typedef struct {
-    /* resources */
-    String menu_name;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} MenuButtonPart;
-
-/* widget declaration */
-typedef struct _MenuButtonRec {
-    CorePart         core;
-    SimplePart	     simple;
-    LabelPart	     label;
-    CommandPart	     command;
-    MenuButtonPart   menu_button;
-} MenuButtonRec;
-
-#endif /* _XawMenuButtonP_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.

+ */

+

+/*

+ * MenuButtonP.h - Private Header file for MenuButton widget.

+ *

+ * This is the private header file for the Athena MenuButton widget.

+ * It is intended to provide an easy method of activating pulldown menus.

+ *

+ * Date:    May 2, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawMenuButtonP_h

+#define _XawMenuButtonP_h

+

+#include <X11/Xaw/MenuButton.h>

+#include <X11/Xaw/CommandP.h>

+

+/* New fields for the MenuButton widget class */

+typedef struct _MenuButtonClass {

+    XtPointer extension;

+} MenuButtonClassPart;

+

+/* class record declaration */

+typedef struct _MenuButtonClassRec {

+    CoreClassPart	    core_class;

+    SimpleClassPart	    simple_class;

+    LabelClassPart	    label_class;

+    CommandClassPart	    command_class;

+    MenuButtonClassPart	    menuButton_class;

+} MenuButtonClassRec;

+

+extern MenuButtonClassRec menuButtonClassRec;

+

+/* New fields for the MenuButton widget */

+typedef struct {

+    /* resources */

+    String menu_name;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} MenuButtonPart;

+

+/* widget declaration */

+typedef struct _MenuButtonRec {

+    CorePart         core;

+    SimplePart	     simple;

+    LabelPart	     label;

+    CommandPart	     command;

+    MenuButtonPart   menu_button;

+} MenuButtonRec;

+

+#endif /* _XawMenuButtonP_h */

diff --git a/X11/Xaw/MenuButton.h b/X11/Xaw/MenuButton.h
index 59744c26c..62f7d0cd4 100644
--- a/X11/Xaw/MenuButton.h
+++ b/X11/Xaw/MenuButton.h
@@ -1,91 +1,89 @@
-/*
- * $Xorg: MenuButton.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $
- *
-Copyright 1989, 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/Xaw/MenuButton.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */
-
-/***********************************************************************
- *
- * MenuButton Widget
- *
- ***********************************************************************/
-
-/*
- * MenuButton.h - Public Header file for MenuButton widget.
- *
- * This is the public header file for the Athena MenuButton widget.
- * It is intended to provide an easy method of activating pulldown menus.
- *
- * Date:    May 2, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawMenuButton_h
-#define _XawMenuButton_h
-
-#include <X11/Xaw/Command.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- bitmap		     Pixmap		Pixmap		None
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- callback	     Callback		Pointer		NULL
- cursor		     Cursor		Cursor		None
- destroyCallback     Callback		Pointer		NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- font		     Font		XFontStruct*	XtDefaultFont
- foreground	     Foreground		Pixel		XtDefaultForeground
- height		     Height		Dimension	text height
- highlightThickness  Thickness		Dimension	2
- insensitiveBorder   Insensitive	Pixmap		Gray
- internalHeight	     Height		Dimension	2
- internalWidth	     Width		Dimension	4
- justify	     Justify		XtJustify	XtJustifyCenter
- label		     Label		String		NULL
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- menuName            MenuName           String          "menu"
- resize		     Resize		Boolean		True
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	text width
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtNmenuName "menuName"
-#define XtCMenuName "MenuName"
-
-extern WidgetClass     menuButtonWidgetClass;
-
-typedef struct _MenuButtonClassRec   *MenuButtonWidgetClass;
-typedef struct _MenuButtonRec        *MenuButtonWidget;
-
-#endif /* _XawMenuButton_h */
+/*

+ *

+Copyright 1989, 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.

+ */

+

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

+ *

+ * MenuButton Widget

+ *

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

+

+/*

+ * MenuButton.h - Public Header file for MenuButton widget.

+ *

+ * This is the public header file for the Athena MenuButton widget.

+ * It is intended to provide an easy method of activating pulldown menus.

+ *

+ * Date:    May 2, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawMenuButton_h

+#define _XawMenuButton_h

+

+#include <X11/Xaw/Command.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ bitmap		     Pixmap		Pixmap		None

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ callback	     Callback		Pointer		NULL

+ cursor		     Cursor		Cursor		None

+ destroyCallback     Callback		Pointer		NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ font		     Font		XFontStruct*	XtDefaultFont

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ height		     Height		Dimension	text height

+ highlightThickness  Thickness		Dimension	2

+ insensitiveBorder   Insensitive	Pixmap		Gray

+ internalHeight	     Height		Dimension	2

+ internalWidth	     Width		Dimension	4

+ justify	     Justify		XtJustify	XtJustifyCenter

+ label		     Label		String		NULL

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ menuName            MenuName           String          "menu"

+ resize		     Resize		Boolean		True

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	text width

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtNmenuName "menuName"

+#define XtCMenuName "MenuName"

+

+extern WidgetClass     menuButtonWidgetClass;

+

+typedef struct _MenuButtonClassRec   *MenuButtonWidgetClass;

+typedef struct _MenuButtonRec        *MenuButtonWidget;

+

+#endif /* _XawMenuButton_h */

diff --git a/X11/Xaw/MultiSink.h b/X11/Xaw/MultiSink.h
index 49ef1df2e..488609130 100644
--- a/X11/Xaw/MultiSink.h
+++ b/X11/Xaw/MultiSink.h
@@ -1,113 +1,110 @@
-/* $Xorg: MultiSink.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */
-
-/*
- * Copyright 1991 by OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name OMRON is not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  OMRON makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OMRON 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
- * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- *      Author: Li Yuhong	 OMRON Corporation
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */
-
-#ifndef _XawMultiSink_h
-#define _XawMultiSink_h
-
-/*
- * MultiSink Object
- */
-
-#include <X11/Xaw/TextSink.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- echo                Output             Boolean         True
- displayNonprinting  Output             Boolean         True
- fontSet             FontSet            XFontSet        XtDefaultFontSet
-
-*/
-
-#define XtCOutput "Output"
-
-#define XtNdisplayNonprinting "displayNonprinting"
-#define XtNecho "echo"
-
-#ifndef XtNfontSet		/*Sheeran, Omron KK, 93/03/04*/
-#define XtNfontSet		"fontSet"
-#endif
-
-#ifndef XtCFontSet		/*Sheeran, Omron KK, 93/03/04*/
-#define XtCFontSet		"FontSet"
-#endif
-
-/* Class record constants */
-extern WidgetClass multiSinkObjectClass;
-
-typedef struct _MultiSinkClassRec *MultiSinkObjectClass;
-typedef struct _MultiSinkRec      *MultiSinkObject;
-
-#endif /* _XawMultiSink_h */
+/*

+ * Copyright 1991 by OMRON Corporation

+ *

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

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

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

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name OMRON is not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  OMRON makes no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL OMRON 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

+ * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ *      Author: Li Yuhong	 OMRON Corporation

+ */

+

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

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawMultiSink_h

+#define _XawMultiSink_h

+

+/*

+ * MultiSink Object

+ */

+

+#include <X11/Xaw/TextSink.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ echo                Output             Boolean         True

+ displayNonprinting  Output             Boolean         True

+ fontSet             FontSet            XFontSet        XtDefaultFontSet

+

+*/

+

+#define XtCOutput "Output"

+

+#define XtNdisplayNonprinting "displayNonprinting"

+#define XtNecho "echo"

+

+#ifndef XtNfontSet		/*Sheeran, Omron KK, 93/03/04*/

+#define XtNfontSet		"fontSet"

+#endif

+

+#ifndef XtCFontSet		/*Sheeran, Omron KK, 93/03/04*/

+#define XtCFontSet		"FontSet"

+#endif

+

+/* Class record constants */

+extern WidgetClass multiSinkObjectClass;

+

+typedef struct _MultiSinkClassRec *MultiSinkObjectClass;

+typedef struct _MultiSinkRec      *MultiSinkObject;

+

+#endif /* _XawMultiSink_h */

diff --git a/X11/Xaw/MultiSinkP.h b/X11/Xaw/MultiSinkP.h
index 537e0b12a..544536315 100644
--- a/X11/Xaw/MultiSinkP.h
+++ b/X11/Xaw/MultiSinkP.h
@@ -1,141 +1,138 @@
-/* $Xorg: MultiSinkP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */
-
-/*
- * Copyright 1991 by OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name OMRON not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  OMRON make no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OMRON 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
- * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- *      Author: Li Yuhong	 OMRON Corporation
- */
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.8 2001/01/17 19:42:28 dawes Exp $ */
-
-#ifndef _XawMultiSinkP_h
-#define _XawMultiSinkP_h
-
-#include <X11/Xfuncproto.h>
-
-/*
- * MultiSink Object Private Data
- */
-#include <X11/Xaw/TextSinkP.h> 
-#include <X11/Xaw/MultiSink.h> 
-
-/* new fields for the MultiSink object class */
-typedef struct _MultiSinkClassPart {
-    XtPointer extension;
-} MultiSinkClassPart;
-
-/* Full class record declaration */
-typedef struct _MultiSinkClassRec {
-    ObjectClassPart     object_class;
-    TextSinkClassPart	text_sink_class;
-    MultiSinkClassPart	multi_sink_class;
-} MultiSinkClassRec;
-
-extern MultiSinkClassRec multiSinkClassRec;
-
-/* New fields for the MultiSink object record */
-typedef struct {
-    /* resources */
-    Boolean echo;
-    Boolean display_nonprinting;
-
-    /* private */
-    GC normgc, invgc, xorgc;
-    XawTextPosition cursor_position;
-    XawTextInsertState laststate;
-    short cursor_x, cursor_y;		/* Cursor Location */
-    XFontSet fontset;			/* font set to draw */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} MultiSinkPart;
-
-/* Full instance record declaration */
-typedef struct _MultiSinkRec {
-    ObjectPart          object;
-    TextSinkPart	text_sink;
-    MultiSinkPart	multi_sink;
-} MultiSinkRec;
-
-/*
- * Semi-private functions
- * for use by other Xaw modules only
- */
-_XFUNCPROTOBEGIN
-
-void _XawMultiSinkPosToXY
-(
- Widget			w,
- XawTextPosition	pos,
- Position		*x,
- Position		*y
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XawMultiSinkP_h */
+/*

+ * Copyright 1991 by OMRON Corporation

+ *

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

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

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

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name OMRON not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  OMRON make no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL OMRON 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

+ * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ *      Author: Li Yuhong	 OMRON Corporation

+ */

+

+

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

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawMultiSinkP_h

+#define _XawMultiSinkP_h

+

+#include <X11/Xfuncproto.h>

+

+/*

+ * MultiSink Object Private Data

+ */

+#include <X11/Xaw/TextSinkP.h> 

+#include <X11/Xaw/MultiSink.h> 

+

+/* new fields for the MultiSink object class */

+typedef struct _MultiSinkClassPart {

+    XtPointer extension;

+} MultiSinkClassPart;

+

+/* Full class record declaration */

+typedef struct _MultiSinkClassRec {

+    ObjectClassPart     object_class;

+    TextSinkClassPart	text_sink_class;

+    MultiSinkClassPart	multi_sink_class;

+} MultiSinkClassRec;

+

+extern MultiSinkClassRec multiSinkClassRec;

+

+/* New fields for the MultiSink object record */

+typedef struct {

+    /* resources */

+    Boolean echo;

+    Boolean display_nonprinting;

+

+    /* private */

+    GC normgc, invgc, xorgc;

+    XawTextPosition cursor_position;

+    XawTextInsertState laststate;

+    short cursor_x, cursor_y;		/* Cursor Location */

+    XFontSet fontset;			/* font set to draw */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} MultiSinkPart;

+

+/* Full instance record declaration */

+typedef struct _MultiSinkRec {

+    ObjectPart          object;

+    TextSinkPart	text_sink;

+    MultiSinkPart	multi_sink;

+} MultiSinkRec;

+

+/*

+ * Semi-private functions

+ * for use by other Xaw modules only

+ */

+_XFUNCPROTOBEGIN

+

+void _XawMultiSinkPosToXY

+(

+ Widget			w,

+ XawTextPosition	pos,

+ Position		*x,

+ Position		*y

+);

+

+_XFUNCPROTOEND

+

+#endif /* _XawMultiSinkP_h */

diff --git a/X11/Xaw/MultiSrc.h b/X11/Xaw/MultiSrc.h
index 00c27f6c7..07c8637d2 100644
--- a/X11/Xaw/MultiSrc.h
+++ b/X11/Xaw/MultiSrc.h
@@ -1,133 +1,130 @@
-/* $Xorg: MultiSrc.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */
-
-/*
- * Copyright 1991 by OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name OMRON not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  OMRON makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OMRON 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
- * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- *      Author: Li Yuhong	 OMRON Corporation
- */
-
-/*
-
-Copyright 1989, 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/Xaw/MultiSrc.h,v 1.6 2001/01/17 19:42:28 dawes Exp $ */
-
-/*
- * This file was modified from AsciiSrc.h.
- *
- * By Li Yuhong, Sept. 18, 1990
- */
-
-#ifndef _XawMultiSrc_h
-#define _XawMultiSrc_h
-
-#include <X11/Xaw/TextSrc.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- dataCompression     DataCompression	Boolean		True
- length		     Length		int		(internal)
- pieceSize	     PieceSize		int		BUFSIZ
- string		     String		String		NULL
- type		     Type		XawAsciiType	XawAsciiString
- useStringInPlace    UseStringInPlace	Boolean		False
-
-*/
- 
-extern WidgetClass multiSrcObjectClass;
-
-typedef struct _MultiSrcClassRec *MultiSrcObjectClass;
-typedef struct _MultiSrcRec      *MultiSrcObject;
-
-#define MultiSourceObjectClass MultiSrcObjectClass
-#define MultiSourceObject      MultiSrcObject
-
-#define XtCDataCompression "DataCompression"
-#define XtCPieceSize "PieceSize"
-#define XtCType "Type"
-#define XtCUseStringInPlace "UseStringInPlace"
-
-#define XtNdataCompression "dataCompression"
-#define XtNpieceSize "pieceSize"
-#define XtNtype "type"
-#define XtNuseStringInPlace "useStringInPlace"
-
-#define XtRMultiType "MultiType"
-
-#define XtEstring "string"
-#define XtEfile "file"
-
-/************************************************************
- *
- * THESE ROUTINES ARE NOT PUBLIC: Source should call
- *
- * the AsciiSrc API which currently forwards requests here.
- *
- * future versions (like theres going to be an R7 Xaw!) may
- *
- * eliminate this file or at least these functions entirely.
- *
- ************************************************************/
-
-_XFUNCPROTOBEGIN
-
-void XawMultiSourceFreeString
-(
- Widget			w
- );
-
-Bool _XawMultiSave
-(
- Widget			w
-);
-
-Bool _XawMultiSaveAsFile
-(
- Widget			w,
- _Xconst char		*name
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawMultiSrc_h  */
+/*

+ * Copyright 1991 by OMRON Corporation

+ *

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

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

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

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name OMRON not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  OMRON makes no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL OMRON 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

+ * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ *      Author: Li Yuhong	 OMRON Corporation

+ */

+

+/*

+

+Copyright 1989, 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.

+

+*/

+

+/*

+ * This file was modified from AsciiSrc.h.

+ *

+ * By Li Yuhong, Sept. 18, 1990

+ */

+

+#ifndef _XawMultiSrc_h

+#define _XawMultiSrc_h

+

+#include <X11/Xaw/TextSrc.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ dataCompression     DataCompression	Boolean		True

+ length		     Length		int		(internal)

+ pieceSize	     PieceSize		int		BUFSIZ

+ string		     String		String		NULL

+ type		     Type		XawAsciiType	XawAsciiString

+ useStringInPlace    UseStringInPlace	Boolean		False

+

+*/

+ 

+extern WidgetClass multiSrcObjectClass;

+

+typedef struct _MultiSrcClassRec *MultiSrcObjectClass;

+typedef struct _MultiSrcRec      *MultiSrcObject;

+

+#define MultiSourceObjectClass MultiSrcObjectClass

+#define MultiSourceObject      MultiSrcObject

+

+#define XtCDataCompression "DataCompression"

+#define XtCPieceSize "PieceSize"

+#define XtCType "Type"

+#define XtCUseStringInPlace "UseStringInPlace"

+

+#define XtNdataCompression "dataCompression"

+#define XtNpieceSize "pieceSize"

+#define XtNtype "type"

+#define XtNuseStringInPlace "useStringInPlace"

+

+#define XtRMultiType "MultiType"

+

+#define XtEstring "string"

+#define XtEfile "file"

+

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

+ *

+ * THESE ROUTINES ARE NOT PUBLIC: Source should call

+ *

+ * the AsciiSrc API which currently forwards requests here.

+ *

+ * future versions (like theres going to be an R7 Xaw!) may

+ *

+ * eliminate this file or at least these functions entirely.

+ *

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

+

+_XFUNCPROTOBEGIN

+

+void XawMultiSourceFreeString

+(

+ Widget			w

+ );

+

+Bool _XawMultiSave

+(

+ Widget			w

+);

+

+Bool _XawMultiSaveAsFile

+(

+ Widget			w,

+ _Xconst char		*name

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawMultiSrc_h  */

diff --git a/X11/Xaw/MultiSrcP.h b/X11/Xaw/MultiSrcP.h
index 49f7abc3a..a96473db0 100644
--- a/X11/Xaw/MultiSrcP.h
+++ b/X11/Xaw/MultiSrcP.h
@@ -1,182 +1,179 @@
-/* $Xorg: MultiSrcP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */
-
-/*
- * Copyright 1991 by OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name OMRON not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  OMRON make no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * OMRON DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OMRON 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
- * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- *      Author: Li Yuhong	 OMRON Corporation
- */
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 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.
-
-
-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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.8 2001/01/17 19:42:28 dawes Exp $ */
-
-/*
- * MultiSrcP.h - Private Header for Multi Text Source.
- *
- * This is the private header file for the Multi Text Source.
- * It is intended to be used with the Text widget, the simplest way to use
- * this text source is to use the MultiText Object.
- *
- * Date:    June 29, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-/* 
- * This file was changed from AsciiSrcP.h.
- *
- * By Li Yuhong, Sept. 18, 1990
- */
-
-#ifndef _XawMultiSrcP_h
-#define _XawMultiSrcP_h
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xaw/TextSrcP.h>
-#include <X11/Xaw/MultiSrc.h>
-
-#ifdef L_tmpnam
-#define TMPSIZ L_tmpnam
-#else
-#ifdef PATH_MAX
-#define TMPSIZ PATH_MAX
-#else
-#define TMPSIZ 1024		/* bytes to allocate for tmpnam */
-#endif
-#endif
-
-typedef struct _MultiPiece {	/* Piece of the text file of BUFSIZ allocated 
-				   characters */
-    wchar_t* text;		/* The text in this buffer */
-    XawTextPosition used;	/* The number of characters of this buffer 
-				   that have been used */
-    struct _MultiPiece *prev, *next;	/* linked list pointers */
-} MultiPiece;
-
-/* New fields for the MultiSrc object class */
-typedef struct _MultiSrcClassPart {
-    XtPointer extension;
-} MultiSrcClassPart;
-
-/* Full class record */
-typedef struct _MultiSrcClassRec {
-    ObjectClassPart     object_class;
-    TextSrcClassPart	text_src_class;
-    MultiSrcClassPart	multi_src_class;
-} MultiSrcClassRec;
-
-extern MultiSrcClassRec multiSrcClassRec;
-
-/* New fields for the MultiSrc object */
-typedef struct _MultiSrcPart {
-    /* resources */
-    XIC ic;			/* for X Input Method */
-    XtPointer string;		/* either the string, or the file name, depend-
-				   ing upon the `type'.  ALWAYS IN MB FORMAT */
-    XawAsciiType type;		/* either string or disk */
-    XawTextPosition piece_size;	/* Size of text buffer for each piece */
-    Boolean data_compression;	/* compress to minimum memory automatically
-				   on save? */
-#ifdef OLDXAW
-    XtCallbackList callback;
-#endif
-    Boolean use_string_in_place;/* Use the string passed in place */
-    int multi_length;		/* length field for multi string emulation */
-
-    /* private */
-
-    Boolean is_tempfile;	  /* Is this a temporary file? */
-#ifdef OLDXAW
-    Boolean changes;
-#endif
-    Boolean allocated_string;	/* Have I allocated the
-				   string in multi_src->string? */
-    XawTextPosition length; 	/* length of file - IN CHARACTERS, NOT BYTES */
-    MultiPiece *first_piece;	/* first piece of the text */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} MultiSrcPart;
-
-/* Full instance record */
-typedef struct _MultiSrcRec {
-  ObjectPart    object;
-  TextSrcPart	text_src;
-  MultiSrcPart	multi_src;
-} MultiSrcRec;
-
-_XFUNCPROTOBEGIN
-
-void _XawMultiSourceFreeString
-(
- Widget		w
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawMultiSrcP_h */
+/*

+ * Copyright 1991 by OMRON Corporation

+ *

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

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

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

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name OMRON not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  OMRON make no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * OMRON DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL OMRON 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

+ * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ *      Author: Li Yuhong	 OMRON Corporation

+ */

+

+

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

+

+Copyright 1987, 1988, 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.

+

+

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

+

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

+

+/*

+ * MultiSrcP.h - Private Header for Multi Text Source.

+ *

+ * This is the private header file for the Multi Text Source.

+ * It is intended to be used with the Text widget, the simplest way to use

+ * this text source is to use the MultiText Object.

+ *

+ * Date:    June 29, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+/* 

+ * This file was changed from AsciiSrcP.h.

+ *

+ * By Li Yuhong, Sept. 18, 1990

+ */

+

+#ifndef _XawMultiSrcP_h

+#define _XawMultiSrcP_h

+

+#include <X11/Xfuncproto.h>

+#include <X11/Xaw/TextSrcP.h>

+#include <X11/Xaw/MultiSrc.h>

+

+#ifdef L_tmpnam

+#define TMPSIZ L_tmpnam

+#else

+#ifdef PATH_MAX

+#define TMPSIZ PATH_MAX

+#else

+#define TMPSIZ 1024		/* bytes to allocate for tmpnam */

+#endif

+#endif

+

+typedef struct _MultiPiece {	/* Piece of the text file of BUFSIZ allocated 

+				   characters */

+    wchar_t* text;		/* The text in this buffer */

+    XawTextPosition used;	/* The number of characters of this buffer 

+				   that have been used */

+    struct _MultiPiece *prev, *next;	/* linked list pointers */

+} MultiPiece;

+

+/* New fields for the MultiSrc object class */

+typedef struct _MultiSrcClassPart {

+    XtPointer extension;

+} MultiSrcClassPart;

+

+/* Full class record */

+typedef struct _MultiSrcClassRec {

+    ObjectClassPart     object_class;

+    TextSrcClassPart	text_src_class;

+    MultiSrcClassPart	multi_src_class;

+} MultiSrcClassRec;

+

+extern MultiSrcClassRec multiSrcClassRec;

+

+/* New fields for the MultiSrc object */

+typedef struct _MultiSrcPart {

+    /* resources */

+    XIC ic;			/* for X Input Method */

+    XtPointer string;		/* either the string, or the file name, depend-

+				   ing upon the `type'.  ALWAYS IN MB FORMAT */

+    XawAsciiType type;		/* either string or disk */

+    XawTextPosition piece_size;	/* Size of text buffer for each piece */

+    Boolean data_compression;	/* compress to minimum memory automatically

+				   on save? */

+#ifdef OLDXAW

+    XtCallbackList callback;

+#endif

+    Boolean use_string_in_place;/* Use the string passed in place */

+    int multi_length;		/* length field for multi string emulation */

+

+    /* private */

+

+    Boolean is_tempfile;	  /* Is this a temporary file? */

+#ifdef OLDXAW

+    Boolean changes;

+#endif

+    Boolean allocated_string;	/* Have I allocated the

+				   string in multi_src->string? */

+    XawTextPosition length; 	/* length of file - IN CHARACTERS, NOT BYTES */

+    MultiPiece *first_piece;	/* first piece of the text */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} MultiSrcPart;

+

+/* Full instance record */

+typedef struct _MultiSrcRec {

+  ObjectPart    object;

+  TextSrcPart	text_src;

+  MultiSrcPart	multi_src;

+} MultiSrcRec;

+

+_XFUNCPROTOBEGIN

+

+void _XawMultiSourceFreeString

+(

+ Widget		w

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawMultiSrcP_h */

diff --git a/X11/Xaw/Paned.h b/X11/Xaw/Paned.h
index aaa532030..e0b2e09d1 100644
--- a/X11/Xaw/Paned.h
+++ b/X11/Xaw/Paned.h
@@ -1,264 +1,258 @@
-/*
-* $Xorg: Paned.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Paned.h,v 1.6 2001/01/17 19:42:28 dawes Exp $ */
-
-/*
- * Paned.h - Paned Composite Widget's public header file.
- *
- * Updated and significantly modifided from the Athena VPaned Widget.
- *
- * Date:    March 1, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawPaned_h
-#define _XawPaned_h
-
-#include <X11/Intrinsic.h>
-#include <X11/Xmu/Converters.h>
-
-/* RESOURCES:
-
- Name		         Class		   RepType	    Default Value
- ----		         -----		   -------	    -------------
- background	         Background	   Pixel	    XtDefaultBackground
- betweenCursor	         Cursor	           Cursor	    **
- border		         BorderColor       Pixel	    XtDefaultForeground
- borderWidth	         BorderWidth       Dimension	    1
- cursor		         Cursor	           Cursor	    None
- destroyCallback         Callback	   Pointer	    NULL
- height		         Height	           Dimension	    0
- gripIndent	         GripIndent	   Position	    16
- gripCursor	         Cursor	           Cursor	    **
- horizontalGripCursol    Cursor	           Cursor	    sb_h_double_arrow
- horizontalBetweencursor Cursor	           Cursor	    sb_up_arrow
- internalBorderColor     BorderColor	   Pixel	    XtDefaultForeground
- internalBorderWidth     BorderWidth	   Position	    1
- leftCursor	         Cursor	           Cursor	    sb_left_arrow
- lowerCursor	         Cursor	           Cursor	    sb_down_arrow
- mappedWhenManaged       MappedWhenManaged Boolean	    True
- orientation             Orientation       XtOrientation    XtorientVertical
- refigureMode	         Boolean	   Boolean	    On
- rightCursor	         Cursor	           Cursor           sb_right_arrow
- sensitive	         Sensitive	   Boolean	    True
- upperCursor	         Cursor	           Cursor	    sb_up_arrow
- verticalBetweenCursor   Cursor	           Cursor           sb_left_arrow
- verticalGripCursor      Cursor	           Cursor           sb_v_double_arrow
- width		         Width	           Dimension	    0
- x		         Position	   Position	    0
- y		         Position	   Position    	    0
-
-** These resources now are set to the vertical or horizontal cursor
-   depending upon orientation, by default.  If a value is specified here
-   then that cursor will be used reguardless of orientation.
-
-
-CONSTRAINT RESOURCES:
-
- Name		      Class		RepType		Default Value
- ----		      -----		-------		-------------
- allowResize	      Boolean	        Boolean         False
- max		      Max	        Dimension	unlimited
- min		      Min		Dimension	Grip Size
- preferredPaneSize    PreferredPaneSize Dimension	PANED_ASK_CHILD
- resizeToPreferred    Boolean		Boolean	 	False
- showGrip	      ShowGrip		Boolean		True
- skipAdjust	      Boolean	        Boolean         False
-
-*/
-
-#define PANED_ASK_CHILD 0
-#define PANED_GRIP_SIZE 0
-
-#define XtNallowResize "allowResize"
-#define XtNbetweenCursor "betweenCursor"
-#define XtNverticalBetweenCursor "verticalBetweenCursor"
-#define XtNhorizontalBetweenCursor "horizontalBetweenCursor"
-#define XtNgripCursor "gripCursor"
-#define XtNgripIndent "gripIndent"
-#define XtNhorizontalGripCursor "horizontalGripCursor"
-#define XtNinternalBorderColor "internalBorderColor"
-#define XtNinternalBorderWidth "internalBorderWidth"
-#define XtNleftCursor "leftCursor"
-#define XtNlowerCursor "lowerCursor"
-#define XtNrefigureMode "refigureMode"
-#define XtNposition "position"
-#define XtNmin "min"
-#define XtNmax "max"
-#define XtNpreferredPaneSize "preferredPaneSize"
-#define XtNresizeToPreferred "resizeToPreferred"
-#define XtNrightCursor "rightCursor"
-#define XtNshowGrip "showGrip"
-#define XtNskipAdjust "skipAdjust"
-#define XtNupperCursor "upperCursor"
-#define XtNverticalGripCursor "verticalGripCursor"
-
-#define XtCGripIndent "GripIndent"
-#define XtCMin "Min"
-#define XtCMax "Max"
-#define XtCPreferredPaneSize "PreferredPaneSize"
-#define XtCShowGrip "ShowGrip"
-
-/* Class record constant */
-extern WidgetClass panedWidgetClass;
-
-typedef struct _PanedClassRec	*PanedWidgetClass;
-typedef struct _PanedRec	*PanedWidget;
-
-/*
- *  Public Procedures 
- */
-
-_XFUNCPROTOBEGIN
-
-/*
- * Function:
- *	XawPanedSetMinMax
- *
- * Parameters:
- *	widget - widget that is a child of the Paned widget
- *	min    - new min and max size for the pane
- *	max    - ""
- *
- * Description:
- *	Sets the min and max size for a pane.
- */
-void XawPanedSetMinMax
-(
- Widget			w,
- int			min,
- int			max
- );
-
-/*
- * Function:
- *	XawPanedGetMinMax
- *
- * Parameters:
- *	widget - widget that is a child of the Paned widget
- *	min    - return the current min and max size for the pane
- *	max    - ""
- *
- * Description:
- *	Gets the min and max size for a pane.
- */
-void XawPanedGetMinMax
-(
- Widget			w,
- int			*min_return,
- int			*max_return
- );
-
-/*
- * Function:
- *	XawPanedSetRefigureMode
- *
- * Parameters:
- *	w    - paned widget
- *	mode - if False then inhibit refigure
- *
- * Description:
- *	  Allows a flag to be set the will inhibit  the paned widgets
- *	relayout routine.
- */
-void XawPanedSetRefigureMode
-(
- Widget			w,
-#if NeedWidePrototypes
- int			mode
-#else
- Boolean		mode
-#endif
- );
-
-/*
- * Function:
- *	XawPanedGetNumSub
- *
- * Parameters:
- *	w - paned widget
- *
- * Returns:
- *	Number of panes in the paned widget.
- */
-int XawPanedGetNumSub
-(
- Widget			w
- );
-
-/*
- * Function:
- *	XawPanedAllowResize
- *
- * Parameters:
- *	widget - child of the paned widget
- *
- * Description:
- *	  Allows a flag to be set that determines if the paned widget will
- *	allow geometry requests from this child
- */
-void XawPanedAllowResize
-(
- Widget			w,
-#if NeedWidePrototypes
- int			allow_resize
-#else
- Boolean		allow_resize
-#endif
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawPaned_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+/*

+ * Paned.h - Paned Composite Widget's public header file.

+ *

+ * Updated and significantly modifided from the Athena VPaned Widget.

+ *

+ * Date:    March 1, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawPaned_h

+#define _XawPaned_h

+

+#include <X11/Intrinsic.h>

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

+

+/* RESOURCES:

+

+ Name		         Class		   RepType	    Default Value

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

+ background	         Background	   Pixel	    XtDefaultBackground

+ betweenCursor	         Cursor	           Cursor	    **

+ border		         BorderColor       Pixel	    XtDefaultForeground

+ borderWidth	         BorderWidth       Dimension	    1

+ cursor		         Cursor	           Cursor	    None

+ destroyCallback         Callback	   Pointer	    NULL

+ height		         Height	           Dimension	    0

+ gripIndent	         GripIndent	   Position	    16

+ gripCursor	         Cursor	           Cursor	    **

+ horizontalGripCursol    Cursor	           Cursor	    sb_h_double_arrow

+ horizontalBetweencursor Cursor	           Cursor	    sb_up_arrow

+ internalBorderColor     BorderColor	   Pixel	    XtDefaultForeground

+ internalBorderWidth     BorderWidth	   Position	    1

+ leftCursor	         Cursor	           Cursor	    sb_left_arrow

+ lowerCursor	         Cursor	           Cursor	    sb_down_arrow

+ mappedWhenManaged       MappedWhenManaged Boolean	    True

+ orientation             Orientation       XtOrientation    XtorientVertical

+ refigureMode	         Boolean	   Boolean	    On

+ rightCursor	         Cursor	           Cursor           sb_right_arrow

+ sensitive	         Sensitive	   Boolean	    True

+ upperCursor	         Cursor	           Cursor	    sb_up_arrow

+ verticalBetweenCursor   Cursor	           Cursor           sb_left_arrow

+ verticalGripCursor      Cursor	           Cursor           sb_v_double_arrow

+ width		         Width	           Dimension	    0

+ x		         Position	   Position	    0

+ y		         Position	   Position    	    0

+

+** These resources now are set to the vertical or horizontal cursor

+   depending upon orientation, by default.  If a value is specified here

+   then that cursor will be used reguardless of orientation.

+

+

+CONSTRAINT RESOURCES:

+

+ Name		      Class		RepType		Default Value

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

+ allowResize	      Boolean	        Boolean         False

+ max		      Max	        Dimension	unlimited

+ min		      Min		Dimension	Grip Size

+ preferredPaneSize    PreferredPaneSize Dimension	PANED_ASK_CHILD

+ resizeToPreferred    Boolean		Boolean	 	False

+ showGrip	      ShowGrip		Boolean		True

+ skipAdjust	      Boolean	        Boolean         False

+

+*/

+

+#define PANED_ASK_CHILD 0

+#define PANED_GRIP_SIZE 0

+

+#define XtNallowResize "allowResize"

+#define XtNbetweenCursor "betweenCursor"

+#define XtNverticalBetweenCursor "verticalBetweenCursor"

+#define XtNhorizontalBetweenCursor "horizontalBetweenCursor"

+#define XtNgripCursor "gripCursor"

+#define XtNgripIndent "gripIndent"

+#define XtNhorizontalGripCursor "horizontalGripCursor"

+#define XtNinternalBorderColor "internalBorderColor"

+#define XtNinternalBorderWidth "internalBorderWidth"

+#define XtNleftCursor "leftCursor"

+#define XtNlowerCursor "lowerCursor"

+#define XtNrefigureMode "refigureMode"

+#define XtNposition "position"

+#define XtNmin "min"

+#define XtNmax "max"

+#define XtNpreferredPaneSize "preferredPaneSize"

+#define XtNresizeToPreferred "resizeToPreferred"

+#define XtNrightCursor "rightCursor"

+#define XtNshowGrip "showGrip"

+#define XtNskipAdjust "skipAdjust"

+#define XtNupperCursor "upperCursor"

+#define XtNverticalGripCursor "verticalGripCursor"

+

+#define XtCGripIndent "GripIndent"

+#define XtCMin "Min"

+#define XtCMax "Max"

+#define XtCPreferredPaneSize "PreferredPaneSize"

+#define XtCShowGrip "ShowGrip"

+

+/* Class record constant */

+extern WidgetClass panedWidgetClass;

+

+typedef struct _PanedClassRec	*PanedWidgetClass;

+typedef struct _PanedRec	*PanedWidget;

+

+/*

+ *  Public Procedures 

+ */

+

+_XFUNCPROTOBEGIN

+

+/*

+ * Function:

+ *	XawPanedSetMinMax

+ *

+ * Parameters:

+ *	widget - widget that is a child of the Paned widget

+ *	min    - new min and max size for the pane

+ *	max    - ""

+ *

+ * Description:

+ *	Sets the min and max size for a pane.

+ */

+void XawPanedSetMinMax

+(

+ Widget			w,

+ int			min,

+ int			max

+ );

+

+/*

+ * Function:

+ *	XawPanedGetMinMax

+ *

+ * Parameters:

+ *	widget - widget that is a child of the Paned widget

+ *	min    - return the current min and max size for the pane

+ *	max    - ""

+ *

+ * Description:

+ *	Gets the min and max size for a pane.

+ */

+void XawPanedGetMinMax

+(

+ Widget			w,

+ int			*min_return,

+ int			*max_return

+ );

+

+/*

+ * Function:

+ *	XawPanedSetRefigureMode

+ *

+ * Parameters:

+ *	w    - paned widget

+ *	mode - if False then inhibit refigure

+ *

+ * Description:

+ *	  Allows a flag to be set the will inhibit  the paned widgets

+ *	relayout routine.

+ */

+void XawPanedSetRefigureMode

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			mode

+#else

+ Boolean		mode

+#endif

+ );

+

+/*

+ * Function:

+ *	XawPanedGetNumSub

+ *

+ * Parameters:

+ *	w - paned widget

+ *

+ * Returns:

+ *	Number of panes in the paned widget.

+ */

+int XawPanedGetNumSub

+(

+ Widget			w

+ );

+

+/*

+ * Function:

+ *	XawPanedAllowResize

+ *

+ * Parameters:

+ *	widget - child of the paned widget

+ *

+ * Description:

+ *	  Allows a flag to be set that determines if the paned widget will

+ *	allow geometry requests from this child

+ */

+void XawPanedAllowResize

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			allow_resize

+#else

+ Boolean		allow_resize

+#endif

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawPaned_h */

diff --git a/X11/Xaw/PanedP.h b/X11/Xaw/PanedP.h
index a94b0f34d..99dd076fe 100644
--- a/X11/Xaw/PanedP.h
+++ b/X11/Xaw/PanedP.h
@@ -1,180 +1,176 @@
-/***********************************************************
-
-  $Xorg: PanedP.h,v 1.4 2001/02/09 02:03:45 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.7 2001/01/17 19:42:28 dawes Exp $ */
-
-/*
- * Updated and significantly modified from the Athena VPaned Widget.
- *
- * Date:    March 1, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawPanedP_h
-#define _XawPanedP_h
-
-#include <X11/Xaw/Paned.h>
-
-/* New fields for the Paned widget class record */
-typedef struct _PanedClassPart {
-    XtPointer extension;
-} PanedClassPart;
-
-/* Full Class record declaration */
-typedef struct _PanedClassRec {
-    CoreClassPart       core_class;
-    CompositeClassPart  composite_class;
-    ConstraintClassPart constraint_class;
-    PanedClassPart      paned_class;
-} PanedClassRec;
-
-extern PanedClassRec panedClassRec;
-
-/* Paned constraint record */
-typedef struct _PanedConstraintsPart {
-    /* Resources */
-    Dimension	min;		/* Minimum height */
-    Dimension	max;		/* Maximum height */
-    Boolean	allow_resize;	/* True if child resize requests are ok */
-    Boolean	show_grip;	/* True if child will have grip below it,
-				   when it is not the bottom pane */
-    Boolean skip_adjust;	/* True if child's height should not be
-				   changed without explicit user action */
-    int		position;	/* position location in Paned (relative to
-				   other children) ** NIY ** */
-    Dimension   preferred_size;	/* The Preferred size of the pane.
-				   If this is zero then ask child for size*/
-    Boolean     resize_to_pref;	/* resize this pane to its preferred size
-				   on a resize or change managed after 
-				   realize */
-
-    /* Private state */
-    Position	delta;		/* Desired Location */
-    Position	olddelta;	/* The last value of dy */
-    Boolean     paned_adjusted_me; /* Has the vpaned adjusted this widget w/o
-				     user interaction to make things fit? */
-    Dimension	wp_size;	/* widget's preferred size */ 
-    int size;			/* the size the widget will actually get */
-    Widget	grip;		/* The grip for this child */
-} PanedConstraintsPart, *Pane;
-
-typedef struct _PanedConstraintsRec {
-    PanedConstraintsPart paned;
-} PanedConstraintsRec, *PanedConstraints;
-
-/*
- * The Pane Stack Structure
- */
-typedef struct _PaneStack {
-    struct _PaneStack *next;	/* The next element on the stack */
-    Pane pane;			/* The pane in this element on the stack */
-    int start_size;		/* The size of this element when it
-				   was pushed onto the stack */
-} PaneStack;
-
-/* New Fields for the Paned widget record */
-typedef struct {
-    /* resources */
-    Position    grip_indent;               /* Location of grips (offset	
-					      from right margin) */
-    Boolean     refiguremode;              /* Whether to refigure changes 
-					      right now */
-    XtTranslations grip_translations;      /* grip translation table */
-    Pixel	internal_bp;		/* color of internal borders */
-    Dimension	internal_bw;		/* internal border width */
-    XtOrientation orientation;		/* Orientation of paned widget */
-
-    Cursor	cursor;		           /* Cursor for paned window */
-    Cursor	grip_cursor;               /* inactive grip cursor */
-    Cursor	v_grip_cursor;             /* inactive vert grip cursor */
-    Cursor	h_grip_cursor;             /* inactive horiz grip cursor */
-    Cursor	adjust_this_cursor;        /* active grip cursor: T */
-    Cursor	v_adjust_this_cursor;      /* active vert grip cursor: T */
-    Cursor	h_adjust_this_cursor;      /* active horiz grip cursor: T */
-
-    /* vertical */
-    Cursor	adjust_upper_cursor;      /* active grip cursor: U */
-    Cursor	adjust_lower_cursor;      /* active grip cursor: D */
-
-    /* horizontal */
-    Cursor	adjust_left_cursor;        /* active grip cursor: U */
-    Cursor	adjust_right_cursor;       /* active grip cursor: D */
-
-    /* private */
-    Boolean	recursively_called;        /* for ChangeManaged */
-    Boolean	resize_children_to_pref;   /* override constrain resources
-					      and resize all children to
-					   preferred size */
-    int         start_loc;	           /* mouse origin when adjusting */
-    Widget      whichadd;                  /* Which pane to add changes to */
-    Widget      whichsub;                  /* Which pane to sub changes from */
-    GC          normgc;                    /* GC to use when drawing borders */
-    GC          invgc;                     /* GC to use when erasing borders */
-    GC		flipgc;			   /* GC to use when animating borders */
-    int		num_panes;                 /* count of managed panes */
-    PaneStack	*stack;			   /* The pane stack for this widget */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} PanedPart;
-
-/*
- * Full instance record declaration
- */
-typedef struct _PanedRec {
-    CorePart	   core;
-    CompositePart  composite;
-    ConstraintPart constraint;
-    PanedPart	   paned;
-} PanedRec;
-
-#endif /* _XawPanedP_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.

+

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

+

+/*

+ * Updated and significantly modified from the Athena VPaned Widget.

+ *

+ * Date:    March 1, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawPanedP_h

+#define _XawPanedP_h

+

+#include <X11/Xaw/Paned.h>

+

+/* New fields for the Paned widget class record */

+typedef struct _PanedClassPart {

+    XtPointer extension;

+} PanedClassPart;

+

+/* Full Class record declaration */

+typedef struct _PanedClassRec {

+    CoreClassPart       core_class;

+    CompositeClassPart  composite_class;

+    ConstraintClassPart constraint_class;

+    PanedClassPart      paned_class;

+} PanedClassRec;

+

+extern PanedClassRec panedClassRec;

+

+/* Paned constraint record */

+typedef struct _PanedConstraintsPart {

+    /* Resources */

+    Dimension	min;		/* Minimum height */

+    Dimension	max;		/* Maximum height */

+    Boolean	allow_resize;	/* True if child resize requests are ok */

+    Boolean	show_grip;	/* True if child will have grip below it,

+				   when it is not the bottom pane */

+    Boolean skip_adjust;	/* True if child's height should not be

+				   changed without explicit user action */

+    int		position;	/* position location in Paned (relative to

+				   other children) ** NIY ** */

+    Dimension   preferred_size;	/* The Preferred size of the pane.

+				   If this is zero then ask child for size*/

+    Boolean     resize_to_pref;	/* resize this pane to its preferred size

+				   on a resize or change managed after 

+				   realize */

+

+    /* Private state */

+    Position	delta;		/* Desired Location */

+    Position	olddelta;	/* The last value of dy */

+    Boolean     paned_adjusted_me; /* Has the vpaned adjusted this widget w/o

+				     user interaction to make things fit? */

+    Dimension	wp_size;	/* widget's preferred size */ 

+    int size;			/* the size the widget will actually get */

+    Widget	grip;		/* The grip for this child */

+} PanedConstraintsPart, *Pane;

+

+typedef struct _PanedConstraintsRec {

+    PanedConstraintsPart paned;

+} PanedConstraintsRec, *PanedConstraints;

+

+/*

+ * The Pane Stack Structure

+ */

+typedef struct _PaneStack {

+    struct _PaneStack *next;	/* The next element on the stack */

+    Pane pane;			/* The pane in this element on the stack */

+    int start_size;		/* The size of this element when it

+				   was pushed onto the stack */

+} PaneStack;

+

+/* New Fields for the Paned widget record */

+typedef struct {

+    /* resources */

+    Position    grip_indent;               /* Location of grips (offset	

+					      from right margin) */

+    Boolean     refiguremode;              /* Whether to refigure changes 

+					      right now */

+    XtTranslations grip_translations;      /* grip translation table */

+    Pixel	internal_bp;		/* color of internal borders */

+    Dimension	internal_bw;		/* internal border width */

+    XtOrientation orientation;		/* Orientation of paned widget */

+

+    Cursor	cursor;		           /* Cursor for paned window */

+    Cursor	grip_cursor;               /* inactive grip cursor */

+    Cursor	v_grip_cursor;             /* inactive vert grip cursor */

+    Cursor	h_grip_cursor;             /* inactive horiz grip cursor */

+    Cursor	adjust_this_cursor;        /* active grip cursor: T */

+    Cursor	v_adjust_this_cursor;      /* active vert grip cursor: T */

+    Cursor	h_adjust_this_cursor;      /* active horiz grip cursor: T */

+

+    /* vertical */

+    Cursor	adjust_upper_cursor;      /* active grip cursor: U */

+    Cursor	adjust_lower_cursor;      /* active grip cursor: D */

+

+    /* horizontal */

+    Cursor	adjust_left_cursor;        /* active grip cursor: U */

+    Cursor	adjust_right_cursor;       /* active grip cursor: D */

+

+    /* private */

+    Boolean	recursively_called;        /* for ChangeManaged */

+    Boolean	resize_children_to_pref;   /* override constrain resources

+					      and resize all children to

+					   preferred size */

+    int         start_loc;	           /* mouse origin when adjusting */

+    Widget      whichadd;                  /* Which pane to add changes to */

+    Widget      whichsub;                  /* Which pane to sub changes from */

+    GC          normgc;                    /* GC to use when drawing borders */

+    GC          invgc;                     /* GC to use when erasing borders */

+    GC		flipgc;			   /* GC to use when animating borders */

+    int		num_panes;                 /* count of managed panes */

+    PaneStack	*stack;			   /* The pane stack for this widget */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} PanedPart;

+

+/*

+ * Full instance record declaration

+ */

+typedef struct _PanedRec {

+    CorePart	   core;

+    CompositePart  composite;

+    ConstraintPart constraint;

+    PanedPart	   paned;

+} PanedRec;

+

+#endif /* _XawPanedP_h */

diff --git a/X11/Xaw/Panner.h b/X11/Xaw/Panner.h
index 594e2eb47..15bad4c02 100644
--- a/X11/Xaw/Panner.h
+++ b/X11/Xaw/Panner.h
@@ -1,107 +1,105 @@
-/*
- * $Xorg: Panner.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/Panner.h,v 1.5 2001/01/17 19:42:28 dawes Exp $ */
-
-#ifndef _XawPanner_h
-#define _XawPanner_h
-
-#include <X11/Intrinsic.h>
-#include <X11/Xaw/Reports.h>
-
-/*****************************************************************************
- * 
- * Panner Widget (subclass of Simple)
- * 
- * This widget is used to represent navigation in a 2d coordinate system
- * 
- * Resources:
- * 
- *  Name		Class		Type		Default
- *  ----		-----		----		-------
- * 
- *  allowOff		AllowOff	Boolean		FALSE
- *  background		Background	Pixel		XtDefaultBackground
- *  backgroundStipple	BackgroundStipple	String	NULL
- *  canvasWidth		CanvasWidth	Dimension	0
- *  canvasHeight	CanvasHeight	Dimension	0
- *  defaultScale	DefaultScale	Dimension	8 percent
- *  foreground		Foreground	Pixel		XtDefaultBackground
- *  internalSpace	InternalSpace	Dimension	4
- *  lineWidth		LineWidth	Dimension	0
- *  reportCallback	ReportCallback	XtCallbackList	NULL
- *  resize		Resize		Boolean		TRUE
- *  rubberBand		RubberBand	Boolean		FALSE
- *  shadowColor		ShadowColor	Pixel		XtDefaultForeground
- *  shadowThickness	ShadowThickness	Dimension	2
- *  sliderX		SliderX		Position	0
- *  sliderY		SliderY		Position	0
- *  sliderWidth		SliderWidth	Dimension	0
- *  sliderHeight	SliderHeight	Dimension	0
- * 
- *****************************************************************************/
-
-#ifndef _XtStringDefs_h_
-#define XtNresize "resize"
-#define XtCResize "Resize"
-#endif
-
-#define XtNallowOff "allowOff"
-#define XtCAllowOff "AllowOff"
-#define XtNbackgroundStipple "backgroundStipple"
-#define XtCBackgroundStipple "BackgroundStipple"
-#define XtNdefaultScale "defaultScale"
-#define XtCDefaultScale "DefaultScale"
-#define XtNcanvasWidth "canvasWidth"
-#define XtCCanvasWidth "CanvasWidth"
-#define XtNcanvasHeight "canvasHeight"
-#define XtCCanvasHeight "CanvasHeight"
-#define XtNinternalSpace "internalSpace"
-#define XtCInternalSpace "InternalSpace"
-#define XtNlineWidth "lineWidth"
-#define XtCLineWidth "LineWidth"
-#define XtNrubberBand "rubberBand"
-#define XtCRubberBand "RubberBand"
-#define XtNshadowThickness "shadowThickness"
-#define XtCShadowThickness "ShadowThickness"
-#define XtNshadowColor "shadowColor"
-#define XtCShadowColor "ShadowColor"
-#define XtNsliderX "sliderX"
-#define XtCSliderX "SliderX"
-#define XtNsliderY "sliderY"
-#define XtCSliderY "SliderY"
-#define XtNsliderWidth "sliderWidth"
-#define XtCSliderWidth "SliderWidth"
-#define XtNsliderHeight "sliderHeight"
-#define XtCSliderHeight "SliderHeight"
-
-extern WidgetClass pannerWidgetClass;
-
-typedef struct _PannerClassRec *PannerWidgetClass;
-typedef struct _PannerRec      *PannerWidget;
-
-#endif /* _XawPanner_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.

+ *

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+#ifndef _XawPanner_h

+#define _XawPanner_h

+

+#include <X11/Intrinsic.h>

+#include <X11/Xaw/Reports.h>

+

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

+ * 

+ * Panner Widget (subclass of Simple)

+ * 

+ * This widget is used to represent navigation in a 2d coordinate system

+ * 

+ * Resources:

+ * 

+ *  Name		Class		Type		Default

+ *  ----		-----		----		-------

+ * 

+ *  allowOff		AllowOff	Boolean		FALSE

+ *  background		Background	Pixel		XtDefaultBackground

+ *  backgroundStipple	BackgroundStipple	String	NULL

+ *  canvasWidth		CanvasWidth	Dimension	0

+ *  canvasHeight	CanvasHeight	Dimension	0

+ *  defaultScale	DefaultScale	Dimension	8 percent

+ *  foreground		Foreground	Pixel		XtDefaultBackground

+ *  internalSpace	InternalSpace	Dimension	4

+ *  lineWidth		LineWidth	Dimension	0

+ *  reportCallback	ReportCallback	XtCallbackList	NULL

+ *  resize		Resize		Boolean		TRUE

+ *  rubberBand		RubberBand	Boolean		FALSE

+ *  shadowColor		ShadowColor	Pixel		XtDefaultForeground

+ *  shadowThickness	ShadowThickness	Dimension	2

+ *  sliderX		SliderX		Position	0

+ *  sliderY		SliderY		Position	0

+ *  sliderWidth		SliderWidth	Dimension	0

+ *  sliderHeight	SliderHeight	Dimension	0

+ * 

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

+

+#ifndef _XtStringDefs_h_

+#define XtNresize "resize"

+#define XtCResize "Resize"

+#endif

+

+#define XtNallowOff "allowOff"

+#define XtCAllowOff "AllowOff"

+#define XtNbackgroundStipple "backgroundStipple"

+#define XtCBackgroundStipple "BackgroundStipple"

+#define XtNdefaultScale "defaultScale"

+#define XtCDefaultScale "DefaultScale"

+#define XtNcanvasWidth "canvasWidth"

+#define XtCCanvasWidth "CanvasWidth"

+#define XtNcanvasHeight "canvasHeight"

+#define XtCCanvasHeight "CanvasHeight"

+#define XtNinternalSpace "internalSpace"

+#define XtCInternalSpace "InternalSpace"

+#define XtNlineWidth "lineWidth"

+#define XtCLineWidth "LineWidth"

+#define XtNrubberBand "rubberBand"

+#define XtCRubberBand "RubberBand"

+#define XtNshadowThickness "shadowThickness"

+#define XtCShadowThickness "ShadowThickness"

+#define XtNshadowColor "shadowColor"

+#define XtCShadowColor "ShadowColor"

+#define XtNsliderX "sliderX"

+#define XtCSliderX "SliderX"

+#define XtNsliderY "sliderY"

+#define XtCSliderY "SliderY"

+#define XtNsliderWidth "sliderWidth"

+#define XtCSliderWidth "SliderWidth"

+#define XtNsliderHeight "sliderHeight"

+#define XtCSliderHeight "SliderHeight"

+

+extern WidgetClass pannerWidgetClass;

+

+typedef struct _PannerClassRec *PannerWidgetClass;

+typedef struct _PannerRec      *PannerWidget;

+

+#endif /* _XawPanner_h */

diff --git a/X11/Xaw/PannerP.h b/X11/Xaw/PannerP.h
index aacf2e26c..893f5ca74 100644
--- a/X11/Xaw/PannerP.h
+++ b/X11/Xaw/PannerP.h
@@ -1,108 +1,106 @@
-/*
- * $Xorg: PannerP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _XawPannerP_h
-#define _XawPannerP_h
-
-#include <X11/Xaw/Panner.h>
-#include <X11/Xaw/SimpleP.h>
-
-/* new fields in widget class */
-typedef struct {
-    XtPointer extension;
-} PannerClassPart;
-
-/* Panner widget class */
-typedef struct _PannerClassRec {
-    CoreClassPart core_class;
-    SimpleClassPart simple_class;
-    PannerClassPart panner_class;
-} PannerClassRec;
-
-/* new fields in widget */
-typedef struct {
-    /* resources */
-    XtCallbackList report_callbacks;	/* callback/Callback */
-    Boolean allow_off;			/* allowOff/AllowOff */
-    Boolean resize_to_pref;		/* resizeToPreferred/Boolean */
-    Pixel foreground;			/* foreground/Foreground */
-    Pixel shadow_color;			/* shadowColor/ShadowColor */
-    Dimension shadow_thickness;		/* shadowThickness/ShadowThickness */
-    Dimension default_scale;		/* defaultScale/DefaultScale */
-    Dimension line_width;		/* lineWidth/LineWidth */
-    Dimension canvas_width;		/* canvasWidth/CanvasWidth */
-    Dimension canvas_height;		/* canvasHeight/CanvasHeight */
-    Position slider_x;			/* sliderX/SliderX */
-    Position slider_y;			/* sliderY/SliderY */
-    Dimension slider_width;		/* sliderWidth/SliderWidth */
-    Dimension slider_height;		/* sliderHeight/SliderHeight */
-    Dimension internal_border;		/* internalBorderWidth/BorderWidth */
-    String stipple_name;		/* backgroundStipple/BackgroundStipple
-					 */
-    /* private */
-    GC slider_gc;			/* background of slider */
-    GC shadow_gc;			/* edge of slider and shadow */
-    GC xor_gc;				/* for doing XOR tmp graphics */
-    double haspect, vaspect;		/* aspect ratio of core to canvas */
-    Boolean rubber_band;		/* true = rubber band, false = move */
-    struct {
-	Boolean doing;			/* tmp graphics in progress */
-	Boolean showing;		/* true if tmp graphics displayed */
-	Position startx, starty;	/* initial position of slider */
-	Position dx, dy;		/* offset loc for tmp graphics */
-	Position x, y;			/* location for tmp graphics */
-    } tmp;
-    Position knob_x, knob_y;		/* real upper left of knob in canvas */
-    Dimension knob_width, knob_height;	/* real size of knob in canvas */
-    Boolean shadow_valid;		/* true if rects are valid */
-    XRectangle shadow_rects[2];		/* location of shadows */
-    Position last_x, last_y;		/* previous location of knob */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} PannerPart;
-
-typedef struct _PannerRec {
-    CorePart core;
-    SimplePart simple;
-    PannerPart panner;
-} PannerRec;
-
-#define PANNER_HSCALE(pw,val)	((pw)->panner.haspect * ((double)(val)))
-#define PANNER_VSCALE(pw,val)	((pw)->panner.vaspect * ((double)(val)))
-
-#define PANNER_DSCALE(pw,val) (Dimension)  \
-((((unsigned long)(val)) * (unsigned long)pw->panner.default_scale) / 100L)
-
-#define PANNER_DEFAULT_SCALE	8		/* percent */
-#define PANNER_OUTOFRANGE -30000
-
-extern PannerClassRec pannerClassRec;
-
-#endif /* _XawPannerP_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.

+ *

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+#ifndef _XawPannerP_h

+#define _XawPannerP_h

+

+#include <X11/Xaw/Panner.h>

+#include <X11/Xaw/SimpleP.h>

+

+/* new fields in widget class */

+typedef struct {

+    XtPointer extension;

+} PannerClassPart;

+

+/* Panner widget class */

+typedef struct _PannerClassRec {

+    CoreClassPart core_class;

+    SimpleClassPart simple_class;

+    PannerClassPart panner_class;

+} PannerClassRec;

+

+/* new fields in widget */

+typedef struct {

+    /* resources */

+    XtCallbackList report_callbacks;	/* callback/Callback */

+    Boolean allow_off;			/* allowOff/AllowOff */

+    Boolean resize_to_pref;		/* resizeToPreferred/Boolean */

+    Pixel foreground;			/* foreground/Foreground */

+    Pixel shadow_color;			/* shadowColor/ShadowColor */

+    Dimension shadow_thickness;		/* shadowThickness/ShadowThickness */

+    Dimension default_scale;		/* defaultScale/DefaultScale */

+    Dimension line_width;		/* lineWidth/LineWidth */

+    Dimension canvas_width;		/* canvasWidth/CanvasWidth */

+    Dimension canvas_height;		/* canvasHeight/CanvasHeight */

+    Position slider_x;			/* sliderX/SliderX */

+    Position slider_y;			/* sliderY/SliderY */

+    Dimension slider_width;		/* sliderWidth/SliderWidth */

+    Dimension slider_height;		/* sliderHeight/SliderHeight */

+    Dimension internal_border;		/* internalBorderWidth/BorderWidth */

+    String stipple_name;		/* backgroundStipple/BackgroundStipple

+					 */

+    /* private */

+    GC slider_gc;			/* background of slider */

+    GC shadow_gc;			/* edge of slider and shadow */

+    GC xor_gc;				/* for doing XOR tmp graphics */

+    double haspect, vaspect;		/* aspect ratio of core to canvas */

+    Boolean rubber_band;		/* true = rubber band, false = move */

+    struct {

+	Boolean doing;			/* tmp graphics in progress */

+	Boolean showing;		/* true if tmp graphics displayed */

+	Position startx, starty;	/* initial position of slider */

+	Position dx, dy;		/* offset loc for tmp graphics */

+	Position x, y;			/* location for tmp graphics */

+    } tmp;

+    Position knob_x, knob_y;		/* real upper left of knob in canvas */

+    Dimension knob_width, knob_height;	/* real size of knob in canvas */

+    Boolean shadow_valid;		/* true if rects are valid */

+    XRectangle shadow_rects[2];		/* location of shadows */

+    Position last_x, last_y;		/* previous location of knob */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} PannerPart;

+

+typedef struct _PannerRec {

+    CorePart core;

+    SimplePart simple;

+    PannerPart panner;

+} PannerRec;

+

+#define PANNER_HSCALE(pw,val)	((pw)->panner.haspect * ((double)(val)))

+#define PANNER_VSCALE(pw,val)	((pw)->panner.vaspect * ((double)(val)))

+

+#define PANNER_DSCALE(pw,val) (Dimension)  \

+((((unsigned long)(val)) * (unsigned long)pw->panner.default_scale) / 100L)

+

+#define PANNER_DEFAULT_SCALE	8		/* percent */

+#define PANNER_OUTOFRANGE -30000

+

+extern PannerClassRec pannerClassRec;

+

+#endif /* _XawPannerP_h */

diff --git a/X11/Xaw/Porthole.h b/X11/Xaw/Porthole.h
index 68274d886..fdf8dace9 100644
--- a/X11/Xaw/Porthole.h
+++ b/X11/Xaw/Porthole.h
@@ -1,63 +1,61 @@
-/*
- * $Xorg: Porthole.h,v 1.5 2001/02/09 02:03:45 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.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.5 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _XawPorthole_h
-#define _XawPorthole_h
-
-#include <X11/Intrinsic.h>
-#include <X11/Xaw/Reports.h>
-
-/*****************************************************************************
- * 
- * Porthole Widget (subclass of Composite)
- * 
- * This widget is similar to a viewport without scrollbars.  Child movement
- * is done by external panners or scrollbars.
- * 
- * Parameters:
- * 
- *  Name		Class		Type		Default
- *  ----		-----		----		-------
- * 
- *  background		Background	Pixel		XtDefaultBackground
- *  border	        BorderColor	Pixel		XtDefaultForeground
- *  borderWidth		BorderWidth	Dimension	1
- *  height		Height		Dimension	0
- *  reportCallback	ReportCallback	Pointer		NULL
- *  width		Width		Dimension	0
- *  x 			Position	Position	0
- *  y			Position	Position	0
- * 
- *****************************************************************************/
-
-extern WidgetClass portholeWidgetClass;
-typedef struct _PortholeClassRec *PortholeWidgetClass;
-typedef struct _PortholeRec      *PortholeWidget;
-
-#endif /* _XawPorthole_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 _XawPorthole_h

+#define _XawPorthole_h

+

+#include <X11/Intrinsic.h>

+#include <X11/Xaw/Reports.h>

+

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

+ * 

+ * Porthole Widget (subclass of Composite)

+ * 

+ * This widget is similar to a viewport without scrollbars.  Child movement

+ * is done by external panners or scrollbars.

+ * 

+ * Parameters:

+ * 

+ *  Name		Class		Type		Default

+ *  ----		-----		----		-------

+ * 

+ *  background		Background	Pixel		XtDefaultBackground

+ *  border	        BorderColor	Pixel		XtDefaultForeground

+ *  borderWidth		BorderWidth	Dimension	1

+ *  height		Height		Dimension	0

+ *  reportCallback	ReportCallback	Pointer		NULL

+ *  width		Width		Dimension	0

+ *  x 			Position	Position	0

+ *  y			Position	Position	0

+ * 

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

+

+extern WidgetClass portholeWidgetClass;

+typedef struct _PortholeClassRec *PortholeWidgetClass;

+typedef struct _PortholeRec      *PortholeWidget;

+

+#endif /* _XawPorthole_h */

diff --git a/X11/Xaw/PortholeP.h b/X11/Xaw/PortholeP.h
index 39dcbdc53..043fb51e8 100644
--- a/X11/Xaw/PortholeP.h
+++ b/X11/Xaw/PortholeP.h
@@ -1,64 +1,62 @@
-/*
- * $Xorg: PortholeP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1990, 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.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _XawPortholeP_h
-#define _XawPortholeP_h
-
-#include <X11/Xaw/Porthole.h>
-
-/* new fields in widget class */
-typedef struct {
-    XtPointer extension;
-} PortholeClassPart;
-
-/* widget class */
-typedef struct _PortholeClassRec {
-    CoreClassPart core_class;
-    CompositeClassPart composite_class;
-    PortholeClassPart porthole_class;
-} PortholeClassRec;
-
-/* new fields in widget */
-typedef struct {
-    /* resources */
-    XtCallbackList report_callbacks;	/* callback/Callback */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} PortholePart;
-
-typedef struct _PortholeRec {
-    CorePart core;
-    CompositePart composite;
-    PortholePart porthole;
-} PortholeRec;
-
-extern PortholeClassRec portholeClassRec;
-
-#endif /* _XawPortholeP_h */
+/*

+ *

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

+ *

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+#ifndef _XawPortholeP_h

+#define _XawPortholeP_h

+

+#include <X11/Xaw/Porthole.h>

+

+/* new fields in widget class */

+typedef struct {

+    XtPointer extension;

+} PortholeClassPart;

+

+/* widget class */

+typedef struct _PortholeClassRec {

+    CoreClassPart core_class;

+    CompositeClassPart composite_class;

+    PortholeClassPart porthole_class;

+} PortholeClassRec;

+

+/* new fields in widget */

+typedef struct {

+    /* resources */

+    XtCallbackList report_callbacks;	/* callback/Callback */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} PortholePart;

+

+typedef struct _PortholeRec {

+    CorePart core;

+    CompositePart composite;

+    PortholePart porthole;

+} PortholeRec;

+

+extern PortholeClassRec portholeClassRec;

+

+#endif /* _XawPortholeP_h */

diff --git a/X11/Xaw/Repeater.h b/X11/Xaw/Repeater.h
index cfb2c5313..86b192e59 100644
--- a/X11/Xaw/Repeater.h
+++ b/X11/Xaw/Repeater.h
@@ -1,75 +1,73 @@
-/*
- * $Xorg: Repeater.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.5 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _XawRepeater_h
-#define _XawRepeater_h
-
-#include <X11/Xaw/Command.h>
-
-/*****************************************************************************
- * 
- * Repeater Widget (subclass of Command)
- * 
- * This widget is a push button that repeatedly fires when held down
- * 
- * Parameters:
- * 
- *  Name		Class		Type		Default
- *  ----		-----		----		-------
- * 
- *  decay		Decay		int		5 milliseconds
- *  flash		Boolean		Boolean		FALSE
- *  initialDelay	Delay		int		200 milliseconds
- *  minimumDelay	MinimumDelay	int		10 milliseconds
- *  repeatDelay		Delay		int		50 milliseconds
- *  startCallback	StartCallback	XtCallbackList	NULL
- *  stopCallback	StopCallback	XtCallbackList	NULL
- * 
- *****************************************************************************/
-
-#define XtNdecay "decay"
-#define XtCDecay "Decay"
-#define XtNinitialDelay "initialDelay"
-#define XtCDelay "Delay"
-#define XtNminimumDelay "minimumDelay"
-#define XtCMinimumDelay "MinimumDelay"
-#define XtNrepeatDelay "repeatDelay"
-#define XtNflash "flash"
-#define XtNstartCallback "startCallback"
-#define XtCStartCallback "StartCallback"
-#define XtNstopCallback "stopCallback"
-#define XtCStopCallback "StopCallback"
-
-
-extern WidgetClass repeaterWidgetClass;
-
-typedef struct _RepeaterClassRec *RepeaterWidgetClass;
-typedef struct _RepeaterRec      *RepeaterWidget;
-
-#endif /* _XawRepeater_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.

+ *

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+#ifndef _XawRepeater_h

+#define _XawRepeater_h

+

+#include <X11/Xaw/Command.h>

+

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

+ * 

+ * Repeater Widget (subclass of Command)

+ * 

+ * This widget is a push button that repeatedly fires when held down

+ * 

+ * Parameters:

+ * 

+ *  Name		Class		Type		Default

+ *  ----		-----		----		-------

+ * 

+ *  decay		Decay		int		5 milliseconds

+ *  flash		Boolean		Boolean		FALSE

+ *  initialDelay	Delay		int		200 milliseconds

+ *  minimumDelay	MinimumDelay	int		10 milliseconds

+ *  repeatDelay		Delay		int		50 milliseconds

+ *  startCallback	StartCallback	XtCallbackList	NULL

+ *  stopCallback	StopCallback	XtCallbackList	NULL

+ * 

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

+

+#define XtNdecay "decay"

+#define XtCDecay "Decay"

+#define XtNinitialDelay "initialDelay"

+#define XtCDelay "Delay"

+#define XtNminimumDelay "minimumDelay"

+#define XtCMinimumDelay "MinimumDelay"

+#define XtNrepeatDelay "repeatDelay"

+#define XtNflash "flash"

+#define XtNstartCallback "startCallback"

+#define XtCStartCallback "StartCallback"

+#define XtNstopCallback "stopCallback"

+#define XtCStopCallback "StopCallback"

+

+

+extern WidgetClass repeaterWidgetClass;

+

+typedef struct _RepeaterClassRec *RepeaterWidgetClass;

+typedef struct _RepeaterRec      *RepeaterWidget;

+

+#endif /* _XawRepeater_h */

diff --git a/X11/Xaw/RepeaterP.h b/X11/Xaw/RepeaterP.h
index 3ce0a498c..b2646e3e0 100644
--- a/X11/Xaw/RepeaterP.h
+++ b/X11/Xaw/RepeaterP.h
@@ -1,84 +1,82 @@
-/*
- * $Xorg: RepeaterP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _XawRepeaterP_h
-#define _XawRepeaterP_h
-
-#include <X11/Xaw/CommandP.h>
-#include <X11/Xaw/Repeater.h>
-
-/* new fields in widget class */
-typedef struct {
-    XtPointer extension;
-} RepeaterClassPart;
-
-/* repeater widget class */
-typedef struct _RepeaterClassRec {
-    CoreClassPart core_class;
-    SimpleClassPart simple_class;
-    LabelClassPart label_class;
-    CommandClassPart command_class;
-    RepeaterClassPart repeater_class;
-} RepeaterClassRec;
-
-typedef struct {
-    /* resources */
-    int initial_delay;			/* initialDelay/Delay */
-    int repeat_delay;			/* repeatDelay/Delay */
-    int minimum_delay;			/* minimumDelay/MinimumDelay */
-    int decay;				/* decay to minimum delay */
-    Boolean flash;			/* flash/Boolean */
-    XtCallbackList start_callbacks;	/* startCallback/StartCallback */
-    XtCallbackList stop_callbacks;	/* stopCallback/StopCallback */
-
-    /* private */
-    int next_delay;			/* next amount for timer */
-    XtIntervalId timer;			/* timer that will fire */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} RepeaterPart;
-
-typedef struct _RepeaterRec {
-    CorePart core;
-    SimplePart simple;
-    LabelPart label;
-    CommandPart command;
-    RepeaterPart repeater;
-} RepeaterRec;
-
-					/* milliseconds */
-#define REP_DEF_DECAY			5
-#define REP_DEF_INITIAL_DELAY		200
-#define REP_DEF_MINIMUM_DELAY		10
-#define REP_DEF_REPEAT_DELAY		50
-
-extern RepeaterClassRec repeaterClassRec;
-
-#endif /* _XawRepeaterP_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.

+ *

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+#ifndef _XawRepeaterP_h

+#define _XawRepeaterP_h

+

+#include <X11/Xaw/CommandP.h>

+#include <X11/Xaw/Repeater.h>

+

+/* new fields in widget class */

+typedef struct {

+    XtPointer extension;

+} RepeaterClassPart;

+

+/* repeater widget class */

+typedef struct _RepeaterClassRec {

+    CoreClassPart core_class;

+    SimpleClassPart simple_class;

+    LabelClassPart label_class;

+    CommandClassPart command_class;

+    RepeaterClassPart repeater_class;

+} RepeaterClassRec;

+

+typedef struct {

+    /* resources */

+    int initial_delay;			/* initialDelay/Delay */

+    int repeat_delay;			/* repeatDelay/Delay */

+    int minimum_delay;			/* minimumDelay/MinimumDelay */

+    int decay;				/* decay to minimum delay */

+    Boolean flash;			/* flash/Boolean */

+    XtCallbackList start_callbacks;	/* startCallback/StartCallback */

+    XtCallbackList stop_callbacks;	/* stopCallback/StopCallback */

+

+    /* private */

+    int next_delay;			/* next amount for timer */

+    XtIntervalId timer;			/* timer that will fire */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} RepeaterPart;

+

+typedef struct _RepeaterRec {

+    CorePart core;

+    SimplePart simple;

+    LabelPart label;

+    CommandPart command;

+    RepeaterPart repeater;

+} RepeaterRec;

+

+					/* milliseconds */

+#define REP_DEF_DECAY			5

+#define REP_DEF_INITIAL_DELAY		200

+#define REP_DEF_MINIMUM_DELAY		10

+#define REP_DEF_REPEAT_DELAY		50

+

+extern RepeaterClassRec repeaterClassRec;

+

+#endif /* _XawRepeaterP_h */

diff --git a/X11/Xaw/Reports.h b/X11/Xaw/Reports.h
index 33f18d187..c49834219 100644
--- a/X11/Xaw/Reports.h
+++ b/X11/Xaw/Reports.h
@@ -1,56 +1,55 @@
-/*
- * $Xorg: Reports.h,v 1.5 2001/02/09 02:03:45 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.
- */
-
-#ifndef _Xaw_Reports_h
-#define _Xaw_Reports_h
-
-#include <X11/Intrinsic.h>
-
-/*
- * XawPannerReport - this structure is used by the reportCallback of the
- * Panner, Porthole, Viewport, and Scrollbar widgets to report its position.
- * All fields must be filled in, although the changed field may be used as
- * a hint as to which fields have been altered since the last report.
- */
-typedef struct {
-    unsigned int changed;		/* mask, see below */
-    Position slider_x, slider_y;	/* location of slider within outer */
-    Dimension slider_width, slider_height;  /* size of slider */
-    Dimension canvas_width, canvas_height;  /* size of canvas */
-} XawPannerReport;
-
-#define XawPRSliderX		(1 << 0)
-#define XawPRSliderY		(1 << 1)
-#define XawPRSliderWidth	(1 << 2)
-#define XawPRSliderHeight	(1 << 3)
-#define XawPRCanvasWidth	(1 << 4)
-#define XawPRCanvasHeight	(1 << 5)
-#define XawPRAll		(63)	/* union of above */
-
-#define XtNreportCallback "reportCallback"
-#define XtCReportCallback "reportCallback"
-
-#endif /* _Xaw_Reports_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.

+ */

+

+#ifndef _Xaw_Reports_h

+#define _Xaw_Reports_h

+

+#include <X11/Intrinsic.h>

+

+/*

+ * XawPannerReport - this structure is used by the reportCallback of the

+ * Panner, Porthole, Viewport, and Scrollbar widgets to report its position.

+ * All fields must be filled in, although the changed field may be used as

+ * a hint as to which fields have been altered since the last report.

+ */

+typedef struct {

+    unsigned int changed;		/* mask, see below */

+    Position slider_x, slider_y;	/* location of slider within outer */

+    Dimension slider_width, slider_height;  /* size of slider */

+    Dimension canvas_width, canvas_height;  /* size of canvas */

+} XawPannerReport;

+

+#define XawPRSliderX		(1 << 0)

+#define XawPRSliderY		(1 << 1)

+#define XawPRSliderWidth	(1 << 2)

+#define XawPRSliderHeight	(1 << 3)

+#define XawPRCanvasWidth	(1 << 4)

+#define XawPRCanvasHeight	(1 << 5)

+#define XawPRAll		(63)	/* union of above */

+

+#define XtNreportCallback "reportCallback"

+#define XtCReportCallback "reportCallback"

+

+#endif /* _Xaw_Reports_h */

diff --git a/X11/Xaw/Scrollbar.h b/X11/Xaw/Scrollbar.h
index c776d41e2..6d78f3983 100644
--- a/X11/Xaw/Scrollbar.h
+++ b/X11/Xaw/Scrollbar.h
@@ -1,137 +1,133 @@
-/* $Xorg: Scrollbar.h,v 1.4 2001/02/09 02:03:45 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.6 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _Scrollbar_h
-#define _Scrollbar_h
-
-/*
- * Scrollbar Widget
- */
-
-#include <X11/Xmu/Converters.h>
-#include <X11/Xfuncproto.h>
-
-/* Scrollbar resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- accelerators	     Accelerators	AcceleratorTable NULL
- ancestorSensitive   AncestorSensitive	Boolean		True
- background	     Background		Pixel		XtDefaultBackground
- backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderPixmap	     Pixmap		Pixmap		XtUnspecifiedPixmap
- borderWidth	     BorderWidth	Dimension	1
- colormap	     Colormap		Colormap	parent's colormap
- cursor		     Cursor		Cursor		None
- cursorName	     Cursor		String		NULL
- depth		     Depth		int		parent's depth
- destroyCallback     Callback		XtCallbackList	NULL
- foreground	     Foreground		Pixel		XtDefaultForeground
- height		     Height		Dimension	length or thickness
- insensitiveBorder   Insensitive	Pixmap		GreyPixmap
- jumpProc	     Callback		XtCallbackList	NULL
- length		     Length		Dimension	1
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- minimumThumb	     MinimumThumb	Dimension	7
- orientation	     Orientation	XtOrientation	XtorientVertical
- pointerColor	     Foreground		Pixel		XtDefaultForeground
- pointerColorBackground Background	Pixel		XtDefaultBackground
- screen		     Screen		Screen		parent's screen
- scrollDCursor	     Cursor		Cursor		XC_sb_down_arrow
- scrollHCursor	     Cursor		Cursor		XC_sb_h_double_arrow
- scrollLCursor	     Cursor		Cursor		XC_sb_left_arrow
- scrollProc	     Callback		XtCallbackList	NULL
- scrollRCursor	     Cursor		Cursor		XC_sb_right_arrow
- scrollUCursor	     Cursor		Cursor		XC_sb_up_arrow
- scrollVCursor	     Cursor		Cursor		XC_sb_v_double_arrow
- sensitive	     Sensitive		Boolean		True
- shown		     Shown		Float		0.0
- thickness	     Thickness		Dimension	14
- thumb		     Thumb		Bitmap		GreyPixmap
- thumbProc	     Callback		XtCallbackList	NULL
- topOfThumb	     TopOfThumb		Float		0.0
- translations	     Translations	TranslationTable see source or doc
- width		     Width		Dimension	thickness or length
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtCMinimumThumb "MinimumThumb"
-#define XtCShown "Shown"
-#define XtCTopOfThumb "TopOfThumb"
-
-#define XtNminimumThumb "minimumThumb"
-#define XtNtopOfThumb "topOfThumb"
-
-typedef struct _ScrollbarRec	  *ScrollbarWidget;
-typedef struct _ScrollbarClassRec *ScrollbarWidgetClass;
-
-extern WidgetClass scrollbarWidgetClass;
-
-_XFUNCPROTOBEGIN
-
-void XawScrollbarSetThumb
-(
- Widget			scrollbar,
-#if NeedWidePrototypes
- double			top,
- double			shown
-#else
- float			top,
- float			shown
-#endif		 
- );
-
-_XFUNCPROTOEND
-
-#endif /* _Scrollbar_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.

+

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

+

+#ifndef _Scrollbar_h

+#define _Scrollbar_h

+

+/*

+ * Scrollbar Widget

+ */

+

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

+#include <X11/Xfuncproto.h>

+

+/* Scrollbar resources:

+

+ Name		     Class		RepType		Default Value

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

+ accelerators	     Accelerators	AcceleratorTable NULL

+ ancestorSensitive   AncestorSensitive	Boolean		True

+ background	     Background		Pixel		XtDefaultBackground

+ backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap

+ borderColor	     BorderColor	Pixel		XtDefaultForeground

+ borderPixmap	     Pixmap		Pixmap		XtUnspecifiedPixmap

+ borderWidth	     BorderWidth	Dimension	1

+ colormap	     Colormap		Colormap	parent's colormap

+ cursor		     Cursor		Cursor		None

+ cursorName	     Cursor		String		NULL

+ depth		     Depth		int		parent's depth

+ destroyCallback     Callback		XtCallbackList	NULL

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ height		     Height		Dimension	length or thickness

+ insensitiveBorder   Insensitive	Pixmap		GreyPixmap

+ jumpProc	     Callback		XtCallbackList	NULL

+ length		     Length		Dimension	1

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ minimumThumb	     MinimumThumb	Dimension	7

+ orientation	     Orientation	XtOrientation	XtorientVertical

+ pointerColor	     Foreground		Pixel		XtDefaultForeground

+ pointerColorBackground Background	Pixel		XtDefaultBackground

+ screen		     Screen		Screen		parent's screen

+ scrollDCursor	     Cursor		Cursor		XC_sb_down_arrow

+ scrollHCursor	     Cursor		Cursor		XC_sb_h_double_arrow

+ scrollLCursor	     Cursor		Cursor		XC_sb_left_arrow

+ scrollProc	     Callback		XtCallbackList	NULL

+ scrollRCursor	     Cursor		Cursor		XC_sb_right_arrow

+ scrollUCursor	     Cursor		Cursor		XC_sb_up_arrow

+ scrollVCursor	     Cursor		Cursor		XC_sb_v_double_arrow

+ sensitive	     Sensitive		Boolean		True

+ shown		     Shown		Float		0.0

+ thickness	     Thickness		Dimension	14

+ thumb		     Thumb		Bitmap		GreyPixmap

+ thumbProc	     Callback		XtCallbackList	NULL

+ topOfThumb	     TopOfThumb		Float		0.0

+ translations	     Translations	TranslationTable see source or doc

+ width		     Width		Dimension	thickness or length

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtCMinimumThumb "MinimumThumb"

+#define XtCShown "Shown"

+#define XtCTopOfThumb "TopOfThumb"

+

+#define XtNminimumThumb "minimumThumb"

+#define XtNtopOfThumb "topOfThumb"

+

+typedef struct _ScrollbarRec	  *ScrollbarWidget;

+typedef struct _ScrollbarClassRec *ScrollbarWidgetClass;

+

+extern WidgetClass scrollbarWidgetClass;

+

+_XFUNCPROTOBEGIN

+

+void XawScrollbarSetThumb

+(

+ Widget			scrollbar,

+#if NeedWidePrototypes

+ double			top,

+ double			shown

+#else

+ float			top,

+ float			shown

+#endif		 

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _Scrollbar_h */

diff --git a/X11/Xaw/ScrollbarP.h b/X11/Xaw/ScrollbarP.h
index ec3af46f8..cf187b48f 100644
--- a/X11/Xaw/ScrollbarP.h
+++ b/X11/Xaw/ScrollbarP.h
@@ -1,109 +1,103 @@
-/*
- * $Xorg: ScrollbarP.h,v 1.4 2001/02/09 02:03:45 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _ScrollbarP_h
-#define _ScrollbarP_h
-
-#include <X11/Xaw/Scrollbar.h>
-#include <X11/Xaw/SimpleP.h>
-
-typedef struct {
-    /* resources */
-    Pixel	   foreground;	/* thumb foreground color */
-    XtOrientation  orientation;	/* horizontal or vertical */
-    XtCallbackList scrollProc;	/* proportional scroll */
-    XtCallbackList thumbProc;	/* jump (to position) scroll */
-    XtCallbackList jumpProc;	/* same as thumbProc but pass data by ref */
-    Pixmap	   thumb;			/* thumb pixmap */
-    Cursor	   upCursor;	/* scroll up cursor */
-    Cursor	   downCursor;	/* scroll down cursor */
-    Cursor	   leftCursor;	/* scroll left cursor */
-    Cursor	   rightCursor;	/* scroll right cursor */
-    Cursor	   verCursor;	/* scroll vertical cursor */
-    Cursor	   horCursor;	/* scroll horizontal cursor */
-    float	   top;
-    float	   shown;
-    Dimension	   length;	/* either height or width */
-    Dimension	   thickness;	/* either width or height */
-    Dimension	   min_thumb;	/* minium size for the thumb */
-
-     /* private */
-    Cursor	   inactiveCursor; /* The normal cursor for scrollbar */
-    char	   direction;	/* a scroll has started; which direction */
-    GC		   gc;		/* a (shared) gc */
-    Position	   topLoc;	/* Pixel that corresponds to top */
-    Dimension	   shownLength;	/* Num pixels corresponding to shown */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} ScrollbarPart;
-
-typedef struct _ScrollbarRec {
-    CorePart		core;
-    SimplePart		simple;
-    ScrollbarPart	scrollbar;
-} ScrollbarRec;
-
-typedef struct {
-  XtPointer extension;
-} ScrollbarClassPart;
-
-typedef struct _ScrollbarClassRec {
-    CoreClassPart		core_class;
-    SimpleClassPart		simple_class;
-    ScrollbarClassPart		scrollbar_class;
-} ScrollbarClassRec;
-
-extern ScrollbarClassRec scrollbarClassRec;
-
-#endif /* _ScrollbarP_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.

+

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

+

+#ifndef _ScrollbarP_h

+#define _ScrollbarP_h

+

+#include <X11/Xaw/Scrollbar.h>

+#include <X11/Xaw/SimpleP.h>

+

+typedef struct {

+    /* resources */

+    Pixel	   foreground;	/* thumb foreground color */

+    XtOrientation  orientation;	/* horizontal or vertical */

+    XtCallbackList scrollProc;	/* proportional scroll */

+    XtCallbackList thumbProc;	/* jump (to position) scroll */

+    XtCallbackList jumpProc;	/* same as thumbProc but pass data by ref */

+    Pixmap	   thumb;			/* thumb pixmap */

+    Cursor	   upCursor;	/* scroll up cursor */

+    Cursor	   downCursor;	/* scroll down cursor */

+    Cursor	   leftCursor;	/* scroll left cursor */

+    Cursor	   rightCursor;	/* scroll right cursor */

+    Cursor	   verCursor;	/* scroll vertical cursor */

+    Cursor	   horCursor;	/* scroll horizontal cursor */

+    float	   top;

+    float	   shown;

+    Dimension	   length;	/* either height or width */

+    Dimension	   thickness;	/* either width or height */

+    Dimension	   min_thumb;	/* minium size for the thumb */

+

+     /* private */

+    Cursor	   inactiveCursor; /* The normal cursor for scrollbar */

+    char	   direction;	/* a scroll has started; which direction */

+    GC		   gc;		/* a (shared) gc */

+    Position	   topLoc;	/* Pixel that corresponds to top */

+    Dimension	   shownLength;	/* Num pixels corresponding to shown */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} ScrollbarPart;

+

+typedef struct _ScrollbarRec {

+    CorePart		core;

+    SimplePart		simple;

+    ScrollbarPart	scrollbar;

+} ScrollbarRec;

+

+typedef struct {

+  XtPointer extension;

+} ScrollbarClassPart;

+

+typedef struct _ScrollbarClassRec {

+    CoreClassPart		core_class;

+    SimpleClassPart		simple_class;

+    ScrollbarClassPart		scrollbar_class;

+} ScrollbarClassRec;

+

+extern ScrollbarClassRec scrollbarClassRec;

+

+#endif /* _ScrollbarP_h */

diff --git a/X11/Xaw/Simple.h b/X11/Xaw/Simple.h
index 7ba9354b9..38338cdb3 100644
--- a/X11/Xaw/Simple.h
+++ b/X11/Xaw/Simple.h
@@ -1,116 +1,113 @@
-/* $Xorg: Simple.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Simple.h,v 1.8 2001/01/17 19:42:30 dawes Exp $ */
-
-#ifndef _Simple_h
-#define _Simple_h
-
-#include <X11/Xmu/Converters.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- cursor		     Cursor		Cursor		None
- cursorName	     Cursor		String		NULL
- destroyCallback     Callback		Pointer		NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- height		     Height		Dimension	0
- insensitiveBorder   Insensitive	Pixmap		Gray
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- pointerColor        Foreground         Pixel           XtDefaultForeground
- pointerColorBackground Background      Pixel           XtDefaultBackground
- sensitive	     Sensitive		Boolean		True
- tip		     Tip		String		NULL
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtNcursor "cursor"
-#define XtNcursorName "cursorName"
-#define XtNinsensitiveBorder "insensitiveBorder"
-
-#define XtCInsensitive "Insensitive"
-
-#ifndef XtCInternational
-#define XtCInternational "International"
-#endif
-
-#ifndef XtNinternational
-#define XtNinternational "international"
-#endif
-
-#ifndef OLDXAW
-#ifndef XawNdisplayList
-#define XawNdisplayList "displayList"
-#endif
-
-#ifndef XawCDisplayList
-#define XawCDisplayList "DisplayList"
-#endif
-
-#ifndef XawRDisplayList
-#define XawRDisplayList "XawDisplayList"
-#endif
-
-#define XtNtip		"tip"
-#define XtCTip		"Tip"
-#endif	/* OLDXAW */
-
-typedef struct _SimpleClassRec	*SimpleWidgetClass;
-typedef struct _SimpleRec	*SimpleWidget;
-
-extern WidgetClass simpleWidgetClass;
-
-#endif /* _Simple_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _Simple_h

+#define _Simple_h

+

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

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ cursor		     Cursor		Cursor		None

+ cursorName	     Cursor		String		NULL

+ destroyCallback     Callback		Pointer		NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ height		     Height		Dimension	0

+ insensitiveBorder   Insensitive	Pixmap		Gray

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ pointerColor        Foreground         Pixel           XtDefaultForeground

+ pointerColorBackground Background      Pixel           XtDefaultBackground

+ sensitive	     Sensitive		Boolean		True

+ tip		     Tip		String		NULL

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtNcursor "cursor"

+#define XtNcursorName "cursorName"

+#define XtNinsensitiveBorder "insensitiveBorder"

+

+#define XtCInsensitive "Insensitive"

+

+#ifndef XtCInternational

+#define XtCInternational "International"

+#endif

+

+#ifndef XtNinternational

+#define XtNinternational "international"

+#endif

+

+#ifndef OLDXAW

+#ifndef XawNdisplayList

+#define XawNdisplayList "displayList"

+#endif

+

+#ifndef XawCDisplayList

+#define XawCDisplayList "DisplayList"

+#endif

+

+#ifndef XawRDisplayList

+#define XawRDisplayList "XawDisplayList"

+#endif

+

+#define XtNtip		"tip"

+#define XtCTip		"Tip"

+#endif	/* OLDXAW */

+

+typedef struct _SimpleClassRec	*SimpleWidgetClass;

+typedef struct _SimpleRec	*SimpleWidget;

+

+extern WidgetClass simpleWidgetClass;

+

+#endif /* _Simple_h */

diff --git a/X11/Xaw/SimpleMenP.h b/X11/Xaw/SimpleMenP.h
index 46102059e..d93e3588b 100644
--- a/X11/Xaw/SimpleMenP.h
+++ b/X11/Xaw/SimpleMenP.h
@@ -1,101 +1,99 @@
-/*
- * $Xorg: SimpleMenP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 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/Xaw/SimpleMenP.h,v 1.12 2001/01/17 19:42:30 dawes Exp $ */
-
-/*
- * SimpleMenuP.h - Private Header file for SimpleMenu widget.
- *
- * Date:    April 3, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _SimpleMenuP_h
-#define _SimpleMenuP_h
-
-#include <X11/Xaw/SimpleMenu.h>
-#include <X11/Xaw/SmeP.h>
-#include <X11/ShellP.h>
-#include <X11/Xaw/XawInit.h>
-
-typedef struct {
-    XtPointer extension;		/* For future needs */
-} SimpleMenuClassPart;
-
-typedef struct _SimpleMenuClassRec {
-    CoreClassPart	    core_class;
-    CompositeClassPart	    composite_class;
-    ShellClassPart	    shell_class;
-    OverrideShellClassPart  override_shell_class;
-    SimpleMenuClassPart	    simpleMenu_class;
-} SimpleMenuClassRec;
-
-extern SimpleMenuClassRec simpleMenuClassRec;
-
-typedef struct _SimpleMenuPart {
-  /* resources */
-    String	label_string;	/* The string for the label or NULL */
-    SmeObject	label;		/* If label_string is non-NULL then this is
-				   the label widget */
-    WidgetClass	label_class;	/* Widget Class of the menu label object */
-    Dimension	top_margin;	/* Top and bottom margins */
-    Dimension	bottom_margin;
-    Dimension	row_height;	/* height of each row (menu entry) */
-    Cursor	cursor;		/* The menu's cursor */
-    SmeObject	popup_entry;	/* The entry to position the cursor on for
-				   when using XawPositionSimpleMenu */
-    Boolean	menu_on_screen;	/* Force the menus to be fully on the screen*/
-    int		backing_store;	/* What type of backing store to use */
-
-    /* private */
-    Boolean	recursive_set_values; /* contain a possible infinite loop */
-    Boolean	menu_width;	/* If true then force width to remain 
-				   core.width */
-    Boolean	menu_height;	/* Just like menu_width, but for height */
-    SmeObject	entry_set;	/* The entry that is currently set or
-				   highlighted */
-#ifndef OLDXAW
-    Dimension	left_margin;
-    Dimension	right_margin;
-    XawDisplayList *display_list;
-    Widget	sub_menu;
-    unsigned	char state;
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} SimpleMenuPart;
-
-typedef struct _SimpleMenuRec {
-    CorePart		core;
-    CompositePart 	composite;
-    ShellPart		shell;
-    OverrideShellPart	override;
-    SimpleMenuPart	simple_menu;
-} SimpleMenuRec;
-
-#endif /* _SimpleMenuP_h */
+/*

+ *

+Copyright 1989, 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.

+ *

+ */

+

+/*

+ * SimpleMenuP.h - Private Header file for SimpleMenu widget.

+ *

+ * Date:    April 3, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _SimpleMenuP_h

+#define _SimpleMenuP_h

+

+#include <X11/Xaw/SimpleMenu.h>

+#include <X11/Xaw/SmeP.h>

+#include <X11/ShellP.h>

+#include <X11/Xaw/XawInit.h>

+

+typedef struct {

+    XtPointer extension;		/* For future needs */

+} SimpleMenuClassPart;

+

+typedef struct _SimpleMenuClassRec {

+    CoreClassPart	    core_class;

+    CompositeClassPart	    composite_class;

+    ShellClassPart	    shell_class;

+    OverrideShellClassPart  override_shell_class;

+    SimpleMenuClassPart	    simpleMenu_class;

+} SimpleMenuClassRec;

+

+extern SimpleMenuClassRec simpleMenuClassRec;

+

+typedef struct _SimpleMenuPart {

+  /* resources */

+    String	label_string;	/* The string for the label or NULL */

+    SmeObject	label;		/* If label_string is non-NULL then this is

+				   the label widget */

+    WidgetClass	label_class;	/* Widget Class of the menu label object */

+    Dimension	top_margin;	/* Top and bottom margins */

+    Dimension	bottom_margin;

+    Dimension	row_height;	/* height of each row (menu entry) */

+    Cursor	cursor;		/* The menu's cursor */

+    SmeObject	popup_entry;	/* The entry to position the cursor on for

+				   when using XawPositionSimpleMenu */

+    Boolean	menu_on_screen;	/* Force the menus to be fully on the screen*/

+    int		backing_store;	/* What type of backing store to use */

+

+    /* private */

+    Boolean	recursive_set_values; /* contain a possible infinite loop */

+    Boolean	menu_width;	/* If true then force width to remain 

+				   core.width */

+    Boolean	menu_height;	/* Just like menu_width, but for height */

+    SmeObject	entry_set;	/* The entry that is currently set or

+				   highlighted */

+#ifndef OLDXAW

+    Dimension	left_margin;

+    Dimension	right_margin;

+    XawDisplayList *display_list;

+    Widget	sub_menu;

+    unsigned	char state;

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} SimpleMenuPart;

+

+typedef struct _SimpleMenuRec {

+    CorePart		core;

+    CompositePart 	composite;

+    ShellPart		shell;

+    OverrideShellPart	override;

+    SimpleMenuPart	simple_menu;

+} SimpleMenuRec;

+

+#endif /* _SimpleMenuP_h */

diff --git a/X11/Xaw/SimpleMenu.h b/X11/Xaw/SimpleMenu.h
index 0ee689683..73233fc2c 100644
--- a/X11/Xaw/SimpleMenu.h
+++ b/X11/Xaw/SimpleMenu.h
@@ -1,173 +1,171 @@
-/*
- * $Xorg: SimpleMenu.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 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.
- *
- * Author:  Chris D. Peterson, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.7 2001/01/17 19:42:30 dawes Exp $ */
-
-/*
- * SimpleMenu.h - Public Header file for SimpleMenu widget.
- *
- * This is the public header file for the Athena SimpleMenu widget.
- * It is intended to provide one pane pulldown and popup menus within
- * the framework of the X Toolkit.  As the name implies it is a first and
- * by no means complete implementation of menu code. It does not attempt to
- * fill the needs of all applications, but does allow a resource oriented
- * interface to menus.
- *
- * Date:    April 3, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _SimpleMenu_h
-#define _SimpleMenu_h
-
-#include <X11/Shell.h>
-#include <X11/Xmu/Converters.h>
-
-/*
- * SimpleMenu widget
- */
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- backgroundPixmap    BackgroundPixmap	Pixmap          None
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderPixmap	     BorderPixmap	Pixmap		None
- borderWidth	     BorderWidth	Dimension	1
- bottomMargin        VerticalMargins    Dimension       VerticalSpace
- columnWidth         ColumnWidth        Dimension       Width of widest text
- cursor              Cursor             Cursor          None
- destroyCallback     Callback		Pointer		NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- height		     Height		Dimension	0
- label               Label              String          NULL (No label)
- labelClass          LabelClass         Pointer         smeBSBObjectClass
- leftMargin	     HorizontalMargins	Dimension	0
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- rightMargin	     HorizontalMargins	Dimension	0
- rowHeight           RowHeight          Dimension       Height of Font
- sensitive	     Sensitive		Boolean		True
- topMargin           VerticalMargins    Dimension       VerticalSpace
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-typedef struct _SimpleMenuClassRec*	SimpleMenuWidgetClass;
-typedef struct _SimpleMenuRec*		SimpleMenuWidget;
-
-extern WidgetClass simpleMenuWidgetClass;
-
-#define XtNcursor "cursor"
-#define XtNbottomMargin "bottomMargin"
-#define XtNcolumnWidth "columnWidth"
-#define XtNlabelClass "labelClass"
-#define XtNmenuOnScreen "menuOnScreen"
-#define XtNpopupOnEntry "popupOnEntry"
-#define XtNrowHeight "rowHeight"
-#define XtNtopMargin "topMargin"
-#define XtNleftMargin "leftMargin"
-#define XtNrightMargin "rightMargin"
-
-#define XtCColumnWidth "ColumnWidth"
-#define XtCLabelClass "LabelClass"
-#define XtCMenuOnScreen "MenuOnScreen"
-#define XtCPopupOnEntry "PopupOnEntry"
-#define XtCRowHeight "RowHeight"
-
-#define XtCVerticalMargins "VerticalMargins"
-
-#ifndef OLDXAW
-#define XtCHorizontalMargins "HorizontalMargins"
-#define XawNdisplayList "displayList"
-#define XawCDisplayList "DisplayList"
-#define XawRDisplayList "XawDisplayList"
-#endif
-
-/*
- * Public Functions
- */
-
-_XFUNCPROTOBEGIN
-
-/*
- * Function:
- *	XawSimpleMenuAddGlobalActions
- *
- * Parameters:
- *	app_con - appcontext
- *
- * Description:
- *	Adds the global actions to the simple menu widget.
- */
-void XawSimpleMenuAddGlobalActions
-(
- XtAppContext		app_con
- );
-
-/*
- * Function:
- *	XawSimpleMenuGetActiveEntry
- *
- * Parameters:
- *	w - smw widget
- *
- * Description:
- *	Gets the currently active (set) entry.
- *
- * Returns:
- *	The currently set entry or NULL if none is set
- */
-Widget XawSimpleMenuGetActiveEntry
-(
- Widget			w
- );
-
-/*
- * Function:
- *	XawSimpleMenuClearActiveEntry
- *
- * Parameters:
- *	w - smw widget
- *
- * Description:
- *	Unsets the currently active (set) entry.
- */
-void XawSimpleMenuClearActiveEntry
-(
- Widget			w
-);
-
-_XFUNCPROTOEND
-
-#endif /* _SimpleMenu_h */
+/*

+ *

+Copyright 1989, 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.

+ *

+ * Author:  Chris D. Peterson, MIT X Consortium

+ */

+

+/*

+ * SimpleMenu.h - Public Header file for SimpleMenu widget.

+ *

+ * This is the public header file for the Athena SimpleMenu widget.

+ * It is intended to provide one pane pulldown and popup menus within

+ * the framework of the X Toolkit.  As the name implies it is a first and

+ * by no means complete implementation of menu code. It does not attempt to

+ * fill the needs of all applications, but does allow a resource oriented

+ * interface to menus.

+ *

+ * Date:    April 3, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _SimpleMenu_h

+#define _SimpleMenu_h

+

+#include <X11/Shell.h>

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

+

+/*

+ * SimpleMenu widget

+ */

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ backgroundPixmap    BackgroundPixmap	Pixmap          None

+ borderColor	     BorderColor	Pixel		XtDefaultForeground

+ borderPixmap	     BorderPixmap	Pixmap		None

+ borderWidth	     BorderWidth	Dimension	1

+ bottomMargin        VerticalMargins    Dimension       VerticalSpace

+ columnWidth         ColumnWidth        Dimension       Width of widest text

+ cursor              Cursor             Cursor          None

+ destroyCallback     Callback		Pointer		NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ height		     Height		Dimension	0

+ label               Label              String          NULL (No label)

+ labelClass          LabelClass         Pointer         smeBSBObjectClass

+ leftMargin	     HorizontalMargins	Dimension	0

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ rightMargin	     HorizontalMargins	Dimension	0

+ rowHeight           RowHeight          Dimension       Height of Font

+ sensitive	     Sensitive		Boolean		True

+ topMargin           VerticalMargins    Dimension       VerticalSpace

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+typedef struct _SimpleMenuClassRec*	SimpleMenuWidgetClass;

+typedef struct _SimpleMenuRec*		SimpleMenuWidget;

+

+extern WidgetClass simpleMenuWidgetClass;

+

+#define XtNcursor "cursor"

+#define XtNbottomMargin "bottomMargin"

+#define XtNcolumnWidth "columnWidth"

+#define XtNlabelClass "labelClass"

+#define XtNmenuOnScreen "menuOnScreen"

+#define XtNpopupOnEntry "popupOnEntry"

+#define XtNrowHeight "rowHeight"

+#define XtNtopMargin "topMargin"

+#define XtNleftMargin "leftMargin"

+#define XtNrightMargin "rightMargin"

+

+#define XtCColumnWidth "ColumnWidth"

+#define XtCLabelClass "LabelClass"

+#define XtCMenuOnScreen "MenuOnScreen"

+#define XtCPopupOnEntry "PopupOnEntry"

+#define XtCRowHeight "RowHeight"

+

+#define XtCVerticalMargins "VerticalMargins"

+

+#ifndef OLDXAW

+#define XtCHorizontalMargins "HorizontalMargins"

+#define XawNdisplayList "displayList"

+#define XawCDisplayList "DisplayList"

+#define XawRDisplayList "XawDisplayList"

+#endif

+

+/*

+ * Public Functions

+ */

+

+_XFUNCPROTOBEGIN

+

+/*

+ * Function:

+ *	XawSimpleMenuAddGlobalActions

+ *

+ * Parameters:

+ *	app_con - appcontext

+ *

+ * Description:

+ *	Adds the global actions to the simple menu widget.

+ */

+void XawSimpleMenuAddGlobalActions

+(

+ XtAppContext		app_con

+ );

+

+/*

+ * Function:

+ *	XawSimpleMenuGetActiveEntry

+ *

+ * Parameters:

+ *	w - smw widget

+ *

+ * Description:

+ *	Gets the currently active (set) entry.

+ *

+ * Returns:

+ *	The currently set entry or NULL if none is set

+ */

+Widget XawSimpleMenuGetActiveEntry

+(

+ Widget			w

+ );

+

+/*

+ * Function:

+ *	XawSimpleMenuClearActiveEntry

+ *

+ * Parameters:

+ *	w - smw widget

+ *

+ * Description:

+ *	Unsets the currently active (set) entry.

+ */

+void XawSimpleMenuClearActiveEntry

+(

+ Widget			w

+);

+

+_XFUNCPROTOEND

+

+#endif /* _SimpleMenu_h */

diff --git a/X11/Xaw/SimpleP.h b/X11/Xaw/SimpleP.h
index f2fa3fa22..34d218e25 100644
--- a/X11/Xaw/SimpleP.h
+++ b/X11/Xaw/SimpleP.h
@@ -1,102 +1,98 @@
-/***********************************************************
-
- $Xorg: SimpleP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
-
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.12 2001/12/14 19:54:43 dawes Exp $ */
-
-#ifndef _SimpleP_h
-#define _SimpleP_h
-
-#include <X11/Xfuncproto.h>
-
-#include <X11/Xaw/Simple.h>
-
-_XFUNCPROTOBEGIN
-
-#include <X11/Xaw/XawInit.h>
-
-typedef struct {
-    Bool (*change_sensitive)(Widget);
-#ifndef OLDXAW
-    XtPointer extension;
-#endif
-} SimpleClassPart;
-
-#define XtInheritChangeSensitive	((Bool (*)(Widget))_XtInherit)
-
-typedef struct _SimpleClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-} SimpleClassRec;
-
-extern SimpleClassRec simpleClassRec;
-
-typedef struct {
-    /* resources */
-    Cursor cursor;
-    Pixmap insensitive_border;
-    String cursor_name;			/* cursor specified by name */
-    Pixel pointer_fg, pointer_bg;	/* Pointer colors */
-    Boolean international;
-
-    /* private */
-#ifndef OLDXAW
-    XawDisplayList *display_list;
-    String tip;
-    XtPointer pad[3];	/* for future use and keep binary compatability */
-#endif
-} SimplePart;
-
-typedef struct _SimpleRec {
-    CorePart	core;
-    SimplePart	simple;
-} SimpleRec;
-
-_XFUNCPROTOEND
-
-#endif /* _SimpleP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _SimpleP_h

+#define _SimpleP_h

+

+#include <X11/Xfuncproto.h>

+

+#include <X11/Xaw/Simple.h>

+

+_XFUNCPROTOBEGIN

+

+#include <X11/Xaw/XawInit.h>

+

+typedef struct {

+    Bool (*change_sensitive)(Widget);

+#ifndef OLDXAW

+    XtPointer extension;

+#endif

+} SimpleClassPart;

+

+#define XtInheritChangeSensitive	((Bool (*)(Widget))_XtInherit)

+

+typedef struct _SimpleClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+} SimpleClassRec;

+

+extern SimpleClassRec simpleClassRec;

+

+typedef struct {

+    /* resources */

+    Cursor cursor;

+    Pixmap insensitive_border;

+    String cursor_name;			/* cursor specified by name */

+    Pixel pointer_fg, pointer_bg;	/* Pointer colors */

+    Boolean international;

+

+    /* private */

+#ifndef OLDXAW

+    XawDisplayList *display_list;

+    String tip;

+    XtPointer pad[3];	/* for future use and keep binary compatability */

+#endif

+} SimplePart;

+

+typedef struct _SimpleRec {

+    CorePart	core;

+    SimplePart	simple;

+} SimpleRec;

+

+_XFUNCPROTOEND

+

+#endif /* _SimpleP_h */

diff --git a/X11/Xaw/Sme.h b/X11/Xaw/Sme.h
index fb87b0073..a333eb9ee 100644
--- a/X11/Xaw/Sme.h
+++ b/X11/Xaw/Sme.h
@@ -1,73 +1,71 @@
-/*
- * $Xorg: Sme.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 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/Xaw/Sme.h,v 1.5 2001/01/17 19:42:31 dawes Exp $ */
-
-/*
- * This is the public header file for the Athena Sme object.
- * It is intended to be used with the simple menu widget.  
- *
- * Date:    April 3, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _Sme_h
-#define _Sme_h
-
-#include <X11/Intrinsic.h>
-#include <X11/RectObj.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- callback            Callback		Pointer		NULL
- destroyCallback     Callback		Pointer		NULL
- height		     Height		Dimension	0
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#ifndef XtCInternational
-#define XtCInternational	"International"
-#endif
-
-#ifndef XtNinternational
-#define XtNinternational	"international"
-#endif
-
-
-typedef struct _SmeClassRec *SmeObjectClass;
-typedef struct _SmeRec *SmeObject;
-
-extern WidgetClass smeObjectClass;
-
-#endif /* _Sme_h */
+/*

+ *

+Copyright 1989, 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.

+ */

+

+/*

+ * This is the public header file for the Athena Sme object.

+ * It is intended to be used with the simple menu widget.  

+ *

+ * Date:    April 3, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _Sme_h

+#define _Sme_h

+

+#include <X11/Intrinsic.h>

+#include <X11/RectObj.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ callback            Callback		Pointer		NULL

+ destroyCallback     Callback		Pointer		NULL

+ height		     Height		Dimension	0

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#ifndef XtCInternational

+#define XtCInternational	"International"

+#endif

+

+#ifndef XtNinternational

+#define XtNinternational	"international"

+#endif

+

+

+typedef struct _SmeClassRec *SmeObjectClass;

+typedef struct _SmeRec *SmeObject;

+

+extern WidgetClass smeObjectClass;

+

+#endif /* _Sme_h */

diff --git a/X11/Xaw/SmeBSB.h b/X11/Xaw/SmeBSB.h
index 094b558c3..c145886f4 100644
--- a/X11/Xaw/SmeBSB.h
+++ b/X11/Xaw/SmeBSB.h
@@ -1,98 +1,96 @@
-/*
- * $Xorg: SmeBSB.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 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/Xaw/SmeBSB.h,v 1.6 2001/01/17 19:42:31 dawes Exp $ */
-
-/*
- * SmeBSB.h - Public Header file for SmeBSB object.
- *
- * This is the public header file for the Athena BSB Sme object.
- * It is intended to be used with the simple menu widget.  This object
- * provides bitmap - string - bitmap style entries.
- *
- * Date:    April 3, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _SmeBSB_h
-#define _SmeBSB_h
-
-#include <X11/Xmu/Converters.h>
-#include <X11/Xaw/Sme.h>
-
-/* BSB Menu Entry Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- callback            Callback           Callback        NULL
- destroyCallback     Callback		Pointer		NULL
- font                Font               XFontStruct *   XtDefaultFont
- foreground          Foreground         Pixel           XtDefaultForeground
- height		     Height		Dimension	0
- label               Label              String          Name of entry
- leftBitmap          LeftBitmap         Pixmap          None
- leftMargin          HorizontalMargins  Dimension       4
- menuName	     MenuName		String		NULL
- rightBitmap         RightBitmap        Pixmap          None
- rightMargin         HorizontalMargins  Dimension       4
- sensitive	     Sensitive		Boolean		True
- vertSpace           VertSpace          int             25
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-typedef struct _SmeBSBClassRec    *SmeBSBObjectClass;
-typedef struct _SmeBSBRec         *SmeBSBObject;
-
-extern WidgetClass smeBSBObjectClass;
-
-#define XtNleftBitmap "leftBitmap"
-#define XtNleftMargin "leftMargin"
-#define XtNrightBitmap "rightBitmap"
-#define XtNrightMargin "rightMargin"
-#define XtNvertSpace   "vertSpace"
-
-#define XtNmenuName "menuName"
-#define XtCMenuName "MenuName"
-
-#ifndef XtNfontSet
-#define XtNfontSet		"fontSet"
-#endif
-
-#ifndef XtCFontSet
-#define XtCFontSet		"FontSet"
-#endif
-
-#define XtCLeftBitmap "LeftBitmap"
-#define XtCHorizontalMargins "HorizontalMargins"
-#define XtCRightBitmap "RightBitmap"
-#define XtCVertSpace   "VertSpace"
-
-#endif /* _SmeBSB_h */
+/*

+ *

+Copyright 1989, 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.

+ */

+

+/*

+ * SmeBSB.h - Public Header file for SmeBSB object.

+ *

+ * This is the public header file for the Athena BSB Sme object.

+ * It is intended to be used with the simple menu widget.  This object

+ * provides bitmap - string - bitmap style entries.

+ *

+ * Date:    April 3, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _SmeBSB_h

+#define _SmeBSB_h

+

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

+#include <X11/Xaw/Sme.h>

+

+/* BSB Menu Entry Resources:

+

+ Name		     Class		RepType		Default Value

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

+ callback            Callback           Callback        NULL

+ destroyCallback     Callback		Pointer		NULL

+ font                Font               XFontStruct *   XtDefaultFont

+ foreground          Foreground         Pixel           XtDefaultForeground

+ height		     Height		Dimension	0

+ label               Label              String          Name of entry

+ leftBitmap          LeftBitmap         Pixmap          None

+ leftMargin          HorizontalMargins  Dimension       4

+ menuName	     MenuName		String		NULL

+ rightBitmap         RightBitmap        Pixmap          None

+ rightMargin         HorizontalMargins  Dimension       4

+ sensitive	     Sensitive		Boolean		True

+ vertSpace           VertSpace          int             25

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+typedef struct _SmeBSBClassRec    *SmeBSBObjectClass;

+typedef struct _SmeBSBRec         *SmeBSBObject;

+

+extern WidgetClass smeBSBObjectClass;

+

+#define XtNleftBitmap "leftBitmap"

+#define XtNleftMargin "leftMargin"

+#define XtNrightBitmap "rightBitmap"

+#define XtNrightMargin "rightMargin"

+#define XtNvertSpace   "vertSpace"

+

+#define XtNmenuName "menuName"

+#define XtCMenuName "MenuName"

+

+#ifndef XtNfontSet

+#define XtNfontSet		"fontSet"

+#endif

+

+#ifndef XtCFontSet

+#define XtCFontSet		"FontSet"

+#endif

+

+#define XtCLeftBitmap "LeftBitmap"

+#define XtCHorizontalMargins "HorizontalMargins"

+#define XtCRightBitmap "RightBitmap"

+#define XtCVertSpace   "VertSpace"

+

+#endif /* _SmeBSB_h */

diff --git a/X11/Xaw/SmeBSBP.h b/X11/Xaw/SmeBSBP.h
index 6b263e7a8..03247d072 100644
--- a/X11/Xaw/SmeBSBP.h
+++ b/X11/Xaw/SmeBSBP.h
@@ -1,94 +1,92 @@
-/*
- * $Xorg: SmeBSBP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 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.
- *
- * Author:  Chris D. Peterson, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.8 2001/01/17 19:42:31 dawes Exp $ */
-
-#ifndef _XawSmeBSBP_h
-#define _XawSmeBSBP_h
-
-/*
- * Sme Object Private Data
- */
-#include <X11/Xaw/SmeP.h>
-#include <X11/Xaw/SmeBSB.h>
-
-typedef struct _SmeBSBClassPart {
-    XtPointer extension;
-} SmeBSBClassPart;
-
-/* Full class record declaration */
-typedef struct _SmeBSBClassRec {
-    RectObjClassPart	rect_class;
-    SmeClassPart	sme_class;
-    SmeBSBClassPart	sme_bsb_class;
-} SmeBSBClassRec;
-
-extern SmeBSBClassRec smeBSBClassRec;
-
-/* New fields for the Sme Object record */
-typedef struct {
-    /* resources */
-    String label;			/* The entry label */
-    int vert_space;			/* extra vert space to leave, as a
-					   percentage of the font height of
-					   the label */
-    Pixmap left_bitmap, right_bitmap;	/* bitmaps to show */
-    Dimension left_margin, right_margin;/* left and right margins */
-    Pixel foreground;			/* foreground color */
-    XFontStruct *font;			/* The font to show label in */
-    XFontSet fontset;			/* or fontset */
-    XtJustify justify;			/* Justification for the label. */
-
-    /* private */
-    Boolean set_values_area_cleared;	/* do we need to unhighlight? */
-    GC norm_gc;				/* noral color gc */
-    GC rev_gc;				/* reverse color gc */
-    GC norm_gray_gc;			/* Normal color (grayed out) gc */
-    GC invert_gc;			/* gc for flipping colors */
-    Dimension left_bitmap_width;	/* size of each bitmap */
-    Dimension left_bitmap_height;
-    Dimension right_bitmap_width;
-    Dimension right_bitmap_height;
-
-#ifndef OLDXAW
-    /* new resources */
-    String menu_name;			/* name of nested sub menu or NULL */
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} SmeBSBPart;
-
-/*
- * Full instance record declaration
- */
-typedef struct _SmeBSBRec {
-    ObjectPart	object;
-    RectObjPart	rectangle;
-    SmePart	sme;
-    SmeBSBPart	sme_bsb;
-} SmeBSBRec;
-
-#endif /* _XawSmeBSBP_h */
+/*

+ *

+Copyright 1989, 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.

+ *

+ * Author:  Chris D. Peterson, MIT X Consortium

+ */

+

+#ifndef _XawSmeBSBP_h

+#define _XawSmeBSBP_h

+

+/*

+ * Sme Object Private Data

+ */

+#include <X11/Xaw/SmeP.h>

+#include <X11/Xaw/SmeBSB.h>

+

+typedef struct _SmeBSBClassPart {

+    XtPointer extension;

+} SmeBSBClassPart;

+

+/* Full class record declaration */

+typedef struct _SmeBSBClassRec {

+    RectObjClassPart	rect_class;

+    SmeClassPart	sme_class;

+    SmeBSBClassPart	sme_bsb_class;

+} SmeBSBClassRec;

+

+extern SmeBSBClassRec smeBSBClassRec;

+

+/* New fields for the Sme Object record */

+typedef struct {

+    /* resources */

+    String label;			/* The entry label */

+    int vert_space;			/* extra vert space to leave, as a

+					   percentage of the font height of

+					   the label */

+    Pixmap left_bitmap, right_bitmap;	/* bitmaps to show */

+    Dimension left_margin, right_margin;/* left and right margins */

+    Pixel foreground;			/* foreground color */

+    XFontStruct *font;			/* The font to show label in */

+    XFontSet fontset;			/* or fontset */

+    XtJustify justify;			/* Justification for the label. */

+

+    /* private */

+    Boolean set_values_area_cleared;	/* do we need to unhighlight? */

+    GC norm_gc;				/* noral color gc */

+    GC rev_gc;				/* reverse color gc */

+    GC norm_gray_gc;			/* Normal color (grayed out) gc */

+    GC invert_gc;			/* gc for flipping colors */

+    Dimension left_bitmap_width;	/* size of each bitmap */

+    Dimension left_bitmap_height;

+    Dimension right_bitmap_width;

+    Dimension right_bitmap_height;

+

+#ifndef OLDXAW

+    /* new resources */

+    String menu_name;			/* name of nested sub menu or NULL */

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} SmeBSBPart;

+

+/*

+ * Full instance record declaration

+ */

+typedef struct _SmeBSBRec {

+    ObjectPart	object;

+    RectObjPart	rectangle;

+    SmePart	sme;

+    SmeBSBPart	sme_bsb;

+} SmeBSBRec;

+

+#endif /* _XawSmeBSBP_h */

diff --git a/X11/Xaw/SmeLine.h b/X11/Xaw/SmeLine.h
index 7c9d4e41a..737f1f586 100644
--- a/X11/Xaw/SmeLine.h
+++ b/X11/Xaw/SmeLine.h
@@ -1,71 +1,69 @@
-/*
- * $Xorg: SmeLine.h,v 1.4 2001/02/09 02:03:45 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/Xaw/SmeLine.h,v 1.5 2001/01/17 19:42:31 dawes Exp $ */
-
-/*
- * This is the public header file for the Athena SmeLine object.
- * It is intended to be used with the simple menu widget.  
- *
- * Date:    April 3, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _SmeLine_h
-#define _SmeLine_h
-
-#include <X11/Xaw/Sme.h>
-#include <X11/Xmu/Converters.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- callback            Callback		Pointer		NULL
- destroyCallback     Callback		Pointer		NULL
- height		     Height		Dimension	0
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define XtCLineWidth "LineWidth"
-#define XtCStipple "Stipple"
-
-#define XtNlineWidth "lineWidth"
-#define XtNstipple "stipple"
-
-typedef struct _SmeLineClassRec *SmeLineObjectClass;
-typedef struct _SmeLineRec *SmeLineObject;
-
-extern WidgetClass smeLineObjectClass;
-
-#endif /* _SmeLine_h */
+/*

+ *

+Copyright 1989, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+ *

+ */

+

+/*

+ * This is the public header file for the Athena SmeLine object.

+ * It is intended to be used with the simple menu widget.  

+ *

+ * Date:    April 3, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _SmeLine_h

+#define _SmeLine_h

+

+#include <X11/Xaw/Sme.h>

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

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ callback            Callback		Pointer		NULL

+ destroyCallback     Callback		Pointer		NULL

+ height		     Height		Dimension	0

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define XtCLineWidth "LineWidth"

+#define XtCStipple "Stipple"

+

+#define XtNlineWidth "lineWidth"

+#define XtNstipple "stipple"

+

+typedef struct _SmeLineClassRec *SmeLineObjectClass;

+typedef struct _SmeLineRec *SmeLineObject;

+

+extern WidgetClass smeLineObjectClass;

+

+#endif /* _SmeLine_h */

diff --git a/X11/Xaw/SmeLineP.h b/X11/Xaw/SmeLineP.h
index 7102d03f9..0f9fa7076 100644
--- a/X11/Xaw/SmeLineP.h
+++ b/X11/Xaw/SmeLineP.h
@@ -1,75 +1,73 @@
-/*
- * $Xorg: SmeLineP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $
- *
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Chris D. Peterson, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.7 2001/01/17 19:42:31 dawes Exp $ */
-
-#ifndef _XawSmeLineP_h
-#define _XawSmeLineP_h
-
-/*
- * SmeLine Widget Private Data
- */
-#include <X11/Xaw/SmeP.h>
-#include <X11/Xaw/SmeLine.h>
-
-/* New fields for the SmeLine widget class */
-typedef struct _SmeLineClassPart {
-    XtPointer extension;
-} SmeLineClassPart;
-
-/* Full class record */
-typedef struct _SmeLineClassRec {
-    RectObjClassPart    rect_class;
-    SmeClassPart	sme_class;
-    SmeLineClassPart	sme_line_class;
-} SmeLineClassRec;
-
-extern SmeLineClassRec smeLineClassRec;
-
-/* New fields for the SmeLine widget */
-typedef struct {
-    /* resources */
-    Pixel foreground;		/* Foreground color */
-    Pixmap stipple;		/* Line Stipple */
-    Dimension line_width;	/* Width of the line */
-
-    /* private */
-    GC gc;			/* Graphics context for drawing line */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} SmeLinePart;
-
-/* Full instance record */
-typedef struct _SmeLineRec {
-    ObjectPart	object;
-    RectObjPart	rectangle;
-    SmePart	sme;
-    SmeLinePart	sme_line;
-} SmeLineRec;
-
-#endif /* _XawSmeLineP_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.

+ *

+ * Author:  Chris D. Peterson, MIT X Consortium

+ */

+

+#ifndef _XawSmeLineP_h

+#define _XawSmeLineP_h

+

+/*

+ * SmeLine Widget Private Data

+ */

+#include <X11/Xaw/SmeP.h>

+#include <X11/Xaw/SmeLine.h>

+

+/* New fields for the SmeLine widget class */

+typedef struct _SmeLineClassPart {

+    XtPointer extension;

+} SmeLineClassPart;

+

+/* Full class record */

+typedef struct _SmeLineClassRec {

+    RectObjClassPart    rect_class;

+    SmeClassPart	sme_class;

+    SmeLineClassPart	sme_line_class;

+} SmeLineClassRec;

+

+extern SmeLineClassRec smeLineClassRec;

+

+/* New fields for the SmeLine widget */

+typedef struct {

+    /* resources */

+    Pixel foreground;		/* Foreground color */

+    Pixmap stipple;		/* Line Stipple */

+    Dimension line_width;	/* Width of the line */

+

+    /* private */

+    GC gc;			/* Graphics context for drawing line */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} SmeLinePart;

+

+/* Full instance record */

+typedef struct _SmeLineRec {

+    ObjectPart	object;

+    RectObjPart	rectangle;

+    SmePart	sme;

+    SmeLinePart	sme_line;

+} SmeLineRec;

+

+#endif /* _XawSmeLineP_h */

diff --git a/X11/Xaw/SmeP.h b/X11/Xaw/SmeP.h
index 94342fffd..8999e752f 100644
--- a/X11/Xaw/SmeP.h
+++ b/X11/Xaw/SmeP.h
@@ -1,90 +1,88 @@
-/*
- * $Xorg: SmeP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $
- *
-Copyright 1989, 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/Xaw/SmeP.h,v 1.8 2001/12/14 19:54:43 dawes Exp $ */
-
-/*
- * This is the private header file for the Athena Sme object.
- * This object is intended to be used with the simple menu widget.  
- *
- * Date:    April 3, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium 
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawSmeP_h
-#define _XawSmeP_h
-
-/*
- * Sme Widget Private Data
- */
-#include <X11/Xfuncproto.h>
-
-#include <X11/Xaw/Sme.h>
-
-_XFUNCPROTOBEGIN
-
-/* New fields for the Sme widget class */
-typedef struct _SmeClassPart {
-    XtWidgetProc highlight;
-    XtWidgetProc unhighlight;
-    XtWidgetProc notify;
-    XtPointer	 extension;
-} SmeClassPart;
-
-/* Full class record */
-typedef struct _SmeClassRec {
-    RectObjClassPart    rect_class;
-    SmeClassPart	sme_class;
-} SmeClassRec;
-
-extern SmeClassRec smeClassRec;
-
-/* New fields for the Sme widget */
-typedef struct {
-    /* resources */
-    XtCallbackList callbacks;
-    Boolean international;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} SmePart;
-
-/* Full instance record */
-typedef struct _SmeRec {
-    ObjectPart	object;
-    RectObjPart	rectangle;
-    SmePart	sme;
-} SmeRec;
-
-#define XtInheritHighlight	((XtWidgetProc)_XtInherit)
-#define XtInheritUnhighlight XtInheritHighlight
-#define XtInheritNotify      XtInheritHighlight
-
-_XFUNCPROTOEND
-
-#endif /* _XawSmeP_h */
+/*

+ *

+Copyright 1989, 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.

+ */

+

+/*

+ * This is the private header file for the Athena Sme object.

+ * This object is intended to be used with the simple menu widget.  

+ *

+ * Date:    April 3, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium 

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawSmeP_h

+#define _XawSmeP_h

+

+/*

+ * Sme Widget Private Data

+ */

+#include <X11/Xfuncproto.h>

+

+#include <X11/Xaw/Sme.h>

+

+_XFUNCPROTOBEGIN

+

+/* New fields for the Sme widget class */

+typedef struct _SmeClassPart {

+    XtWidgetProc highlight;

+    XtWidgetProc unhighlight;

+    XtWidgetProc notify;

+    XtPointer	 extension;

+} SmeClassPart;

+

+/* Full class record */

+typedef struct _SmeClassRec {

+    RectObjClassPart    rect_class;

+    SmeClassPart	sme_class;

+} SmeClassRec;

+

+extern SmeClassRec smeClassRec;

+

+/* New fields for the Sme widget */

+typedef struct {

+    /* resources */

+    XtCallbackList callbacks;

+    Boolean international;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} SmePart;

+

+/* Full instance record */

+typedef struct _SmeRec {

+    ObjectPart	object;

+    RectObjPart	rectangle;

+    SmePart	sme;

+} SmeRec;

+

+#define XtInheritHighlight	((XtWidgetProc)_XtInherit)

+#define XtInheritUnhighlight XtInheritHighlight

+#define XtInheritNotify      XtInheritHighlight

+

+_XFUNCPROTOEND

+

+#endif /* _XawSmeP_h */

diff --git a/X11/Xaw/StripCharP.h b/X11/Xaw/StripCharP.h
index 50ed74c98..2fad7f980 100644
--- a/X11/Xaw/StripCharP.h
+++ b/X11/Xaw/StripCharP.h
@@ -1,110 +1,104 @@
-/*
-* $Xorg: StripCharP.h,v 1.4 2001/02/09 02:03:46 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.7 2001/01/17 19:42:32 dawes Exp $ */
-
-#ifndef _XawStripChartP_h
-#define _XawStripChartP_h
-
-#include <X11/Xaw/StripChart.h>
-#include <X11/Xaw/SimpleP.h>
-
-#define NO_GCS 0
-#define FOREGROUND	(1 << 0)
-#define HIGHLIGHT	(1 << 1)
-#define ALL_GCS (FOREGROUND | HIGHLIGHT)
-
-/* new fields for the stripChart widget */
-typedef struct {
-    /* resources */
-    Pixel fgpixel;		/* color index for graph */
-    Pixel hipixel;		/* color index for lines */
-    GC fgGC;			/* graphics context for fgpixel */
-    GC hiGC;			/* graphics context for hipixel */
-    
-    /* private */
-    int update;			/* update frequence */
-    int scale;			/* scale factor */
-    int min_scale;		/* smallest scale factor */
-    int interval;		/* data point interval */
-    XPoint *points;		/* Poly point for repairing graph lines */
-    double max_value;		/* Max Value in window */
-    double valuedata[2048];	/* record of data points */
-    XtIntervalId interval_id;
-    XtCallbackList get_value;	/* proc to call to fetch load pt */
-    int jump_val;		/* Amount to jump on each scroll */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} StripChartPart;
-
-/* instance record declaration */
-typedef struct _StripChartRec {
-    CorePart core;
-    SimplePart simple;
-    StripChartPart strip_chart;
-} StripChartRec;
-
-/* new fields for the StripChart widget class record */
-typedef struct {
-    XtPointer extension;
-} StripChartClassPart;
-
-/* class record declaration */
-typedef struct _StripChartClassRec {
-    CoreClassPart core_class;
-    SimpleClassPart simple_class;
-    StripChartClassPart strip_chart_class;
-} StripChartClassRec;
-
-extern StripChartClassRec stripChartClassRec;
-
-#endif /* _XawStripChartP_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.

+

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

+

+#ifndef _XawStripChartP_h

+#define _XawStripChartP_h

+

+#include <X11/Xaw/StripChart.h>

+#include <X11/Xaw/SimpleP.h>

+

+#define NO_GCS 0

+#define FOREGROUND	(1 << 0)

+#define HIGHLIGHT	(1 << 1)

+#define ALL_GCS (FOREGROUND | HIGHLIGHT)

+

+/* new fields for the stripChart widget */

+typedef struct {

+    /* resources */

+    Pixel fgpixel;		/* color index for graph */

+    Pixel hipixel;		/* color index for lines */

+    GC fgGC;			/* graphics context for fgpixel */

+    GC hiGC;			/* graphics context for hipixel */

+    

+    /* private */

+    int update;			/* update frequence */

+    int scale;			/* scale factor */

+    int min_scale;		/* smallest scale factor */

+    int interval;		/* data point interval */

+    XPoint *points;		/* Poly point for repairing graph lines */

+    double max_value;		/* Max Value in window */

+    double valuedata[2048];	/* record of data points */

+    XtIntervalId interval_id;

+    XtCallbackList get_value;	/* proc to call to fetch load pt */

+    int jump_val;		/* Amount to jump on each scroll */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} StripChartPart;

+

+/* instance record declaration */

+typedef struct _StripChartRec {

+    CorePart core;

+    SimplePart simple;

+    StripChartPart strip_chart;

+} StripChartRec;

+

+/* new fields for the StripChart widget class record */

+typedef struct {

+    XtPointer extension;

+} StripChartClassPart;

+

+/* class record declaration */

+typedef struct _StripChartClassRec {

+    CoreClassPart core_class;

+    SimpleClassPart simple_class;

+    StripChartClassPart strip_chart_class;

+} StripChartClassRec;

+

+extern StripChartClassRec stripChartClassRec;

+

+#endif /* _XawStripChartP_h */

diff --git a/X11/Xaw/StripChart.h b/X11/Xaw/StripChart.h
index b6c6f212a..e36e11e1f 100644
--- a/X11/Xaw/StripChart.h
+++ b/X11/Xaw/StripChart.h
@@ -1,119 +1,116 @@
-/* $Xorg: StripChart.h,v 1.5 2001/02/09 02:03:46 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.5 2001/01/17 19:42:32 dawes Exp $ */
-
-#ifndef _XawStripChart_h
-#define _XawStripChart_h
-
-#include <X11/Intrinsic.h>
-
-/***********************************************************************
- *
- * StripChart Widget
- *
- ***********************************************************************/
-
-/* StripChart resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- accelerators	     Accelerators	AcceleratorTable NULL
- ancestorSensitive   AncestorSensitive	Boolean		True 
- background	     Background		Pixel		XtDefaultBackground
- backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderPixmap	     Pixmap		Pixmap		XtUnspecifiedPixmap
- borderWidth	     BorderWidth	Dimension	1
- colormap	     Colormap		Colormap	parent's colormap
- cursor		     Cursor		Cursor		None
- cursorName	     Cursor		String		NULL
- depth		     Depth		int		parent's depth
- destroyCallback     Callback		XtCallbackList	NULL
- foreground	     Foreground		Pixel		XtDefaultForeground
- getValue	     Callback		XtCallbackList	NULL
- height		     Height		Dimension	120
- highlight	     Foreground		Pixel		XtDefaultForeground
- insensitiveBorder   Insensitive	Pixmap		GreyPixmap
- jumpScroll	     JumpScroll		int		1/2 width
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- minScale	     Scale		int		1
- pointerColor	     Foreground		Pixel		XtDefaultForeground
- pointerColorBackground Background	Pixel		XtDefaultBackground
- screen		     Screen		Screen		parent's screen
- sensitive	     Sensitive		Boolean		True
- translations	     Translations	TranslationTable NULL
- update		     Interval		int		10 (seconds)
- width		     Width		Dimension	120
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#define DEFAULT_JUMP -1
-
-#ifndef _XtStringDefs_h_
-#define XtNhighlight "highlight"
-#define XtNupdate "update"
-#endif
-
-#define XtCJumpScroll "JumpScroll"
-#define XtCScale "Scale"
-
-#define XtNgetValue "getValue"
-#define XtNjumpScroll "jumpScroll"
-#define XtNminScale "minScale"
-#define XtNscale "scale"
-#define XtNvmunix "vmunix"
- 
-typedef struct _StripChartRec *StripChartWidget;
-typedef struct _StripChartClassRec *StripChartWidgetClass;
-
-extern WidgetClass stripChartWidgetClass;
-
-#endif /* _XawStripChart_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.

+

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

+

+#ifndef _XawStripChart_h

+#define _XawStripChart_h

+

+#include <X11/Intrinsic.h>

+

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

+ *

+ * StripChart Widget

+ *

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

+

+/* StripChart resources:

+

+ Name		     Class		RepType		Default Value

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

+ accelerators	     Accelerators	AcceleratorTable NULL

+ ancestorSensitive   AncestorSensitive	Boolean		True 

+ background	     Background		Pixel		XtDefaultBackground

+ backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap

+ borderColor	     BorderColor	Pixel		XtDefaultForeground

+ borderPixmap	     Pixmap		Pixmap		XtUnspecifiedPixmap

+ borderWidth	     BorderWidth	Dimension	1

+ colormap	     Colormap		Colormap	parent's colormap

+ cursor		     Cursor		Cursor		None

+ cursorName	     Cursor		String		NULL

+ depth		     Depth		int		parent's depth

+ destroyCallback     Callback		XtCallbackList	NULL

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ getValue	     Callback		XtCallbackList	NULL

+ height		     Height		Dimension	120

+ highlight	     Foreground		Pixel		XtDefaultForeground

+ insensitiveBorder   Insensitive	Pixmap		GreyPixmap

+ jumpScroll	     JumpScroll		int		1/2 width

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ minScale	     Scale		int		1

+ pointerColor	     Foreground		Pixel		XtDefaultForeground

+ pointerColorBackground Background	Pixel		XtDefaultBackground

+ screen		     Screen		Screen		parent's screen

+ sensitive	     Sensitive		Boolean		True

+ translations	     Translations	TranslationTable NULL

+ update		     Interval		int		10 (seconds)

+ width		     Width		Dimension	120

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#define DEFAULT_JUMP -1

+

+#ifndef _XtStringDefs_h_

+#define XtNhighlight "highlight"

+#define XtNupdate "update"

+#endif

+

+#define XtCJumpScroll "JumpScroll"

+#define XtCScale "Scale"

+

+#define XtNgetValue "getValue"

+#define XtNjumpScroll "jumpScroll"

+#define XtNminScale "minScale"

+#define XtNscale "scale"

+#define XtNvmunix "vmunix"

+ 

+typedef struct _StripChartRec *StripChartWidget;

+typedef struct _StripChartClassRec *StripChartWidgetClass;

+

+extern WidgetClass stripChartWidgetClass;

+

+#endif /* _XawStripChart_h */

diff --git a/X11/Xaw/Template.c b/X11/Xaw/Template.c
index 9c3763b52..c563b302f 100644
--- a/X11/Xaw/Template.c
+++ b/X11/Xaw/Template.c
@@ -1,198 +1,195 @@
-/* $Xorg: Template.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */
-
-/*
-
-Copyright 1987, 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/Xaw/Template.c,v 1.8 2001/08/01 00:44:39 tsi Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <X11/Xaw/TemplateP.h>
-
-/*
- * Class Methods
- */
-static void TemplateInitialize(Widget, Widget, ArgList, Cardinal*);
-
-/*
- * Prototypes
- */
-static Bool TemplateFunction(TemplateWidget, int, int, Bool);
-
-/*
- * Actions
- */
-static void TemplateAction(Widget, XEvent*, String*, Cardinal*);
-
-/*
- * Initialization
- */
-#define offset(field) XtOffsetOf(TemplateRec, template.field)
-static XtResource resources[] = {
-/*{
-    name,
-    class,
-    type,
-    size,
-    offset,
-    default_type,
-    default_addr
-  },*/
-  {
-    XtNtemplateResource,
-    XtCTemplateResource,
-    XtRTemplateResource,
-    sizeof(char*),
-    offset(resource),
-    XtRString,
-    (XtPointer)"default"
-  },
-};
-#undef offset
-
-static XtActionsRec actions[] =
-{
-    /*{name,		procedure},*/
-    {"template",	TemplateAction},
-};
-
-static char translations[] =
-"<Key>:"	"template()\n"
-;
-
-#define Superclass	(&widgetClassRec)
-TemplateClassRec templateClassRec = {
-  /* core */
-  {
-    (WidgetClass)Superclass,		/* superclass */
-    "Template",				/* class_name */
-    sizeof(TemplateRec),		/* widget_size */
-    NULL,				/* class_initialize */
-    NULL,				/* class_part_initialize */
-    False,				/* class_inited */
-    TemplateInitialize,			/* initialize */
-    NULL,				/* initialize_hook */
-    XtInheritRealize,			/* realize */
-    actions,				/* actions */
-    XtNumber(actions),			/* num_actions */
-    resources,				/* resources */
-    XtNumber(resources),		/* num_resources */
-    NULLQUARK,				/* xrm_class */
-    True,				/* compress_motion */
-    True,				/* compress_exposure */
-    True,				/* compress_enterleave */
-    False,				/* visible_interest */
-    NULL,				/* destroy */
-    NULL,				/* resize */
-    NULL,				/* expose */
-    NULL,				/* set_values */
-    NULL,				/* set_values_hook */
-    XtInheritSetValuesAlmost,		/* set_values_almost */
-    NULL,				/* get_values_hook */
-    NULL,				/* accept_focus */
-    XtVersion,				/* version */
-    NULL,				/* callback_private */
-    translations,			/* tm_table */
-    XtInheritQueryGeometry,		/* query_geometry */
-    XtInheritDisplayAccelerator,	/* display_accelerator */
-    NULL,				/* extension */
-  },
-  /* template */
-  {
-    NULL,				/* extension */
-  }
-};
-
-WidgetClass templateWidgetClass = (WidgetClass)&templateClassRec;
-
-/*
- * Implementation
- */
-/*
- * Function:
- *	TemplateInitialize
- *
- * Parameters:
- *	request - requested widget
- *	w	- the widget
- *	args	- arguments
- *	num_args - number of arguments
- *
- * Description:
- *	Initializes widget instance.
- */
-/*ARGSUSED*/
-static void
-TemplateInitialize(Widget request, Widget w, ArgList args, Cardinal *num_args)
-{
-    TemplateWidget tw = (TemplateWidget)w;
-
-    tw->template.private = NULL;
-}
-
-/*
- * Function:
- *	TemplateFunction
- *
- * Parameters:
- *	tw    - template widget
- *	x     - x coordinate
- *	y     - y coordinate
- *	force - force action
- *
- * Description:
- *	This function does nothing.
- *
- * Return:
- *	Parameter force
- */
-/*ARGSUSED*/
-static Bool
-TemplateFunction(TemplateWidget tw, int x, int y, Bool force)
-{
-    return (force);
-}
-
-/*
- * Function:
- *	TemplateAction
- *
- * Parameters:
- *	w	   - template widget
- *	event	   - event that caused this action
- *	params	   - parameters
- *	num_params - number of parameters
- *
- * Description:
- *	This function does nothing.
- */
-/*ARGSUSED*/
-static void
-TemplateAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
-{
-}
+/*

+

+Copyright 1987, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/IntrinsicP.h>

+#include <X11/StringDefs.h>

+#include <X11/Xaw/TemplateP.h>

+

+/*

+ * Class Methods

+ */

+static void TemplateInitialize(Widget, Widget, ArgList, Cardinal*);

+

+/*

+ * Prototypes

+ */

+static Bool TemplateFunction(TemplateWidget, int, int, Bool);

+

+/*

+ * Actions

+ */

+static void TemplateAction(Widget, XEvent*, String*, Cardinal*);

+

+/*

+ * Initialization

+ */

+#define offset(field) XtOffsetOf(TemplateRec, template.field)

+static XtResource resources[] = {

+/*{

+    name,

+    class,

+    type,

+    size,

+    offset,

+    default_type,

+    default_addr

+  },*/

+  {

+    XtNtemplateResource,

+    XtCTemplateResource,

+    XtRTemplateResource,

+    sizeof(char*),

+    offset(resource),

+    XtRString,

+    (XtPointer)"default"

+  },

+};

+#undef offset

+

+static XtActionsRec actions[] =

+{

+    /*{name,		procedure},*/

+    {"template",	TemplateAction},

+};

+

+static char translations[] =

+"<Key>:"	"template()\n"

+;

+

+#define Superclass	(&widgetClassRec)

+TemplateClassRec templateClassRec = {

+  /* core */

+  {

+    (WidgetClass)Superclass,		/* superclass */

+    "Template",				/* class_name */

+    sizeof(TemplateRec),		/* widget_size */

+    NULL,				/* class_initialize */

+    NULL,				/* class_part_initialize */

+    False,				/* class_inited */

+    TemplateInitialize,			/* initialize */

+    NULL,				/* initialize_hook */

+    XtInheritRealize,			/* realize */

+    actions,				/* actions */

+    XtNumber(actions),			/* num_actions */

+    resources,				/* resources */

+    XtNumber(resources),		/* num_resources */

+    NULLQUARK,				/* xrm_class */

+    True,				/* compress_motion */

+    True,				/* compress_exposure */

+    True,				/* compress_enterleave */

+    False,				/* visible_interest */

+    NULL,				/* destroy */

+    NULL,				/* resize */

+    NULL,				/* expose */

+    NULL,				/* set_values */

+    NULL,				/* set_values_hook */

+    XtInheritSetValuesAlmost,		/* set_values_almost */

+    NULL,				/* get_values_hook */

+    NULL,				/* accept_focus */

+    XtVersion,				/* version */

+    NULL,				/* callback_private */

+    translations,			/* tm_table */

+    XtInheritQueryGeometry,		/* query_geometry */

+    XtInheritDisplayAccelerator,	/* display_accelerator */

+    NULL,				/* extension */

+  },

+  /* template */

+  {

+    NULL,				/* extension */

+  }

+};

+

+WidgetClass templateWidgetClass = (WidgetClass)&templateClassRec;

+

+/*

+ * Implementation

+ */

+/*

+ * Function:

+ *	TemplateInitialize

+ *

+ * Parameters:

+ *	request - requested widget

+ *	w	- the widget

+ *	args	- arguments

+ *	num_args - number of arguments

+ *

+ * Description:

+ *	Initializes widget instance.

+ */

+/*ARGSUSED*/

+static void

+TemplateInitialize(Widget request, Widget w, ArgList args, Cardinal *num_args)

+{

+    TemplateWidget tw = (TemplateWidget)w;

+

+    tw->template.private = NULL;

+}

+

+/*

+ * Function:

+ *	TemplateFunction

+ *

+ * Parameters:

+ *	tw    - template widget

+ *	x     - x coordinate

+ *	y     - y coordinate

+ *	force - force action

+ *

+ * Description:

+ *	This function does nothing.

+ *

+ * Return:

+ *	Parameter force

+ */

+/*ARGSUSED*/

+static Bool

+TemplateFunction(TemplateWidget tw, int x, int y, Bool force)

+{

+    return (force);

+}

+

+/*

+ * Function:

+ *	TemplateAction

+ *

+ * Parameters:

+ *	w	   - template widget

+ *	event	   - event that caused this action

+ *	params	   - parameters

+ *	num_params - number of parameters

+ *

+ * Description:

+ *	This function does nothing.

+ */

+/*ARGSUSED*/

+static void

+TemplateAction(Widget w, XEvent *event, String *params, Cardinal *num_params)

+{

+}

diff --git a/X11/Xaw/Template.h b/X11/Xaw/Template.h
index 5ec0974cf..a46ac32bc 100644
--- a/X11/Xaw/Template.h
+++ b/X11/Xaw/Template.h
@@ -1,70 +1,67 @@
-/* $Xorg: Template.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */
-
-/*
-
-Copyright 1987, 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/Xaw/Template.h,v 1.5 2001/01/17 19:42:32 dawes Exp $ */
-
-#ifndef _Template_h
-#define _Template_h
-
-#include <X11/Intrinsic.h>
-
-/****************************************************************
- *
- * Template widget
- *
- ****************************************************************/
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- destroyCallback     Callback		Pointer		NULL
- height		     Height		Dimension	0
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-/* define any special resource names here that are not in <X11/StringDefs.h> */
-#define XtNtemplateResource "templateResource"
-
-#define XtCTemplateResource "TemplateResource"
-
-/* declare specific TemplateWidget class and instance datatypes */
-typedef struct _TemplateClassRec *TemplateWidgetClass;
-typedef struct _TemplateRec *TemplateWidget;
-
-/* declare the class constant */
-extern WidgetClass templateWidgetClass;
-
-#endif /* _Template_h */
+/*

+

+Copyright 1987, 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 _Template_h

+#define _Template_h

+

+#include <X11/Intrinsic.h>

+

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

+ *

+ * Template widget

+ *

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

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ background	     Background		Pixel		XtDefaultBackground

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ destroyCallback     Callback		Pointer		NULL

+ height		     Height		Dimension	0

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+/* define any special resource names here that are not in <X11/StringDefs.h> */

+#define XtNtemplateResource "templateResource"

+

+#define XtCTemplateResource "TemplateResource"

+

+/* declare specific TemplateWidget class and instance datatypes */

+typedef struct _TemplateClassRec *TemplateWidgetClass;

+typedef struct _TemplateRec *TemplateWidget;

+

+/* declare the class constant */

+extern WidgetClass templateWidgetClass;

+

+#endif /* _Template_h */

diff --git a/X11/Xaw/TemplateP.h b/X11/Xaw/TemplateP.h
index f3e3d67d5..f61a059ab 100644
--- a/X11/Xaw/TemplateP.h
+++ b/X11/Xaw/TemplateP.h
@@ -1,68 +1,65 @@
-/* $Xorg: TemplateP.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */
-
-/*
-
-Copyright 1987, 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/Xaw/TemplateP.h,v 1.6 2001/01/17 19:42:32 dawes Exp $ */
-
-#ifndef _TemplateP_h
-#define _TemplateP_h
-
-#include <X11/Xaw/Template.h>
-
-/* include superclass private header file */
-#include <X11/CoreP.h>
-
-/* define unique representation types not found in <X11/StringDefs.h> */
-#define XtRTemplateResource "TemplateResource"
-
-typedef struct {
-    XtPointer extension;
-} TemplateClassPart;
-
-typedef struct _TemplateClassRec {
-    CoreClassPart	core_class;
-    TemplateClassPart	template_class;
-} TemplateClassRec;
-
-extern TemplateClassRec templateClassRec;
-
-typedef struct {
-    /* resources */
-    char* resource;
-    /* private */
-    char *private;
-} TemplatePart;
-
-typedef struct _TemplateRec {
-    CorePart		core;
-#if defined(__cplusplus) || defined(c_plusplus)
-    TemplatePart	c_template;
-#else
-    TemplatePart	template;
-#endif
-} TemplateRec;
-
-#endif /* _TemplateP_h */
+/*

+

+Copyright 1987, 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 _TemplateP_h

+#define _TemplateP_h

+

+#include <X11/Xaw/Template.h>

+

+/* include superclass private header file */

+#include <X11/CoreP.h>

+

+/* define unique representation types not found in <X11/StringDefs.h> */

+#define XtRTemplateResource "TemplateResource"

+

+typedef struct {

+    XtPointer extension;

+} TemplateClassPart;

+

+typedef struct _TemplateClassRec {

+    CoreClassPart	core_class;

+    TemplateClassPart	template_class;

+} TemplateClassRec;

+

+extern TemplateClassRec templateClassRec;

+

+typedef struct {

+    /* resources */

+    char* resource;

+    /* private */

+    char *private;

+} TemplatePart;

+

+typedef struct _TemplateRec {

+    CorePart		core;

+#if defined(__cplusplus) || defined(c_plusplus)

+    TemplatePart	c_template;

+#else

+    TemplatePart	template;

+#endif

+} TemplateRec;

+

+#endif /* _TemplateP_h */

diff --git a/X11/Xaw/Text.h b/X11/Xaw/Text.h
index af80ffcdb..1f9b04915 100644
--- a/X11/Xaw/Text.h
+++ b/X11/Xaw/Text.h
@@ -1,373 +1,370 @@
-/* $Xorg: Text.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/Text.h,v 1.14 2001/01/17 19:42:34 dawes Exp $ */
-
-#ifndef _XawText_h
-#define _XawText_h
-
-#include <X11/Xaw/Simple.h>
-
-/*
-
- Class: 	textWidgetClass
- Class Name:	Text
- Superclass:	Simple
-
- Resources added by the Text widget:
-
- Name		     Class	     RepType		Default Value
- ----		     -----	     -------		-------------
- autoFill	    AutoFill	     Boolean		False
- bottomMargin	    Margin	     Position		2
- displayPosition    TextPosition     XawTextPosition	0
- insertPosition	    TextPosition     XawTextPosition	0
- justify	    JustifyMode	     JustifyMode	left
- leftColumn	    Column	     Column		0
- rightColumn	    Column	     Column		0
- leftMargin	    Margin	     Position		2
- rightMargin	    Margin	     Position		4
- positionCallback   Callback	     Callback		NULL
- scrollHorizontal   Scroll	     Boolean		False
- scrollVertical     Scroll	     Boolean		False
- selectTypes        SelectTypes      Pointer            see documentation
- textSink	    TextSink	     Widget		NULL
- textSource	    TextSource	     Widget		NULL
- topMargin	    Margin	     Position		2
- unrealizeCallback  Callback	     Callback		NULL
- wrap		    Wrap	     XawTextWrapMode	XawTextWrapNever
-
-*/
-
-typedef long XawTextPosition;
-
-#ifndef notdef
-typedef enum {
-  XawtextScrollNever,
-  XawtextScrollWhenNeeded,
-  XawtextScrollAlways
-} XawTextScrollMode;
-
-typedef enum {
-  XawtextResizeNever,
-  XawtextResizeWidth,
-  XawtextResizeHeight,
-  XawtextResizeBoth
-} XawTextResizeMode;
-#endif
-
-typedef enum {
-  XawtextWrapNever,
-  XawtextWrapLine,
-  XawtextWrapWord
-} XawTextWrapMode;
-
-typedef enum {
-  XawsdLeft,
-  XawsdRight
-} XawTextScanDirection;
-
-typedef enum {
-  XawtextRead,
-  XawtextAppend,
-  XawtextEdit
-} XawTextEditType;
-
-typedef enum {
-  XawselectNull,
-  XawselectPosition,
-  XawselectChar,
-  XawselectWord,
-  XawselectLine,
-  XawselectParagraph,
-  XawselectAll,
-  XawselectAlphaNumeric
-} XawTextSelectType;
-
-typedef enum {
-    XawjustifyLeft,
-    XawjustifyRight,
-    XawjustifyCenter,
-    XawjustifyFull
-} XawTextJustifyMode;
-
-typedef struct {
-    int  firstPos;
-    int  length;
-    char *ptr;
-    unsigned long format;
-} XawTextBlock, *XawTextBlockPtr;
-
-#ifndef OLDXAW
-typedef struct {
-    int line_number;
-    int column_number;
-    XawTextPosition insert_position;
-    XawTextPosition last_position;
-    Boolean overwrite_mode;
-} XawTextPositionInfo;
-
-typedef struct {
-    XawTextPosition left, right;
-    XawTextBlock *block;
-} XawTextPropertyInfo;
-
-typedef struct _XawTextAnchor XawTextAnchor;
-typedef struct _XawTextEntity XawTextEntity;
-typedef struct _XawTextProperty XawTextProperty;
-typedef struct _XawTextPropertyList XawTextPropertyList;
-#endif
-
-#include <X11/Xaw/TextSink.h>
-#include <X11/Xaw/TextSrc.h>
-
-#define XtEtextScrollNever "never"
-#define XtEtextScrollWhenNeeded "whenneeded"
-#define XtEtextScrollAlways "always"
-#define XtEtextResizeNever "never"
-#define XtEtextResizeWidth "width"
-#define XtEtextResizeHeight "height"
-#define XtEtextResizeBoth "both"
-
-#define XtEtextWrapNever	"never"
-#define XtEtextWrapLine		"line"
-#define XtEtextWrapWord		"word"
-
-#define XtNautoFill "autoFill"
-#define XtNbottomMargin "bottomMargin"
-#define XtNdialogHOffset "dialogHOffset"
-#define XtNdialogVOffset "dialogVOffset"
-#define XtNdisplayCaret "displayCaret"
-#define XtNdisplayPosition "displayPosition"
-#define XtNleftMargin "leftMargin"
-#define XtNrightMargin "rightMargin"
-#define XtNpositionCallback "positionCallback"
-#define XtNscrollVertical "scrollVertical"
-#define XtNscrollHorizontal "scrollHorizontal"
-#define XtNselectTypes "selectTypes"
-#define XtNtopMargin "topMargin"
-#define XtNwrap "wrap"
-
-#define XtCColumn		"Column"
-#define XtNleftColumn		"leftColumn"
-#define XtNrightColumn		"rightColumn"
-
-#define XtCJustifyMode		XtCJustify
-#define XtNjustifyMode		XtNjustify
-#define XtEtextJustifyLeft	"left"
-#define XtEtextJustifyRight	"right"
-#define XtEtextJustifyCenter	"center"
-#define XtEtextJustifyFull	"full"
-
-#define XtCAutoFill "AutoFill"
-#define XtCSelectTypes "SelectTypes"
-#define XtCWrap "Wrap"
-#ifndef notdef
-#define XtCScroll		"Scroll"
-#endif
-
-#ifndef _XtStringDefs_h_
-#define XtNinsertPosition "insertPosition"
-#ifndef notdef
-#define XtNresize "resize"
-#define XtCResize "Resize"
-#endif
-#define XtNselection		"selection"
-#endif
-
-/* return Error code for XawTextSearch */
-#define XawTextSearchError      (-12345L)
-
-/* return codes from XawTextReplace */
-#define XawReplaceError	       -1
-#define XawEditDone		0
-#define XawEditError		1
-#define XawPositionError	2
-
-/* XrmQuark is not unsigned long */
-#define XawTextFormat(tw,fmt) ((unsigned long)_XawTextFormat(tw) == (fmt))
-
-extern unsigned long FMT8BIT;
-extern unsigned long XawFmt8Bit;
-extern unsigned long XawFmtWide;
-
-extern WidgetClass textWidgetClass;
-
-typedef struct _TextClassRec *TextWidgetClass;
-typedef struct _TextRec      *TextWidget;
-
-_XFUNCPROTOBEGIN
-
-XrmQuark _XawTextFormat
-(
- TextWidget		tw
- );
-
-void XawTextDisplay
-(
- Widget			w
- );
-
-void XawTextEnableRedisplay
-(
- Widget			w
- );
-
-void XawTextDisableRedisplay
-(
- Widget			w
- );
-
-void XawTextSetSelectionArray
-(
- Widget			w,
- XawTextSelectType	*sarray
- );
-
-void XawTextGetSelectionPos
-(
- Widget			w,
- XawTextPosition	*begin_return,
- XawTextPosition	*end_return
- );
-
-void XawTextSetSource
-(
- Widget			w,
- Widget			source,
- XawTextPosition	top
- );
-
-int XawTextReplace
-(
- Widget			w,
- XawTextPosition	start,
- XawTextPosition	end,
- XawTextBlock		*text
- );
-
-XawTextPosition XawTextTopPosition
-(
- Widget			w
- );
-
-XawTextPosition XawTextLastPosition
-(
- Widget			w
- );
-
-void XawTextSetInsertionPoint
-(
- Widget			w,
- XawTextPosition	position
- );
-
-XawTextPosition XawTextGetInsertionPoint
-(
- Widget			w
- );
-
-void XawTextUnsetSelection
-(
- Widget			w
- );
-
-void XawTextSetSelection
-(
- Widget			w,
- XawTextPosition	left,
- XawTextPosition	right
- );
-
-void XawTextInvalidate
-(
- Widget			w,
- XawTextPosition	from,
- XawTextPosition	to
-);
-
-Widget XawTextGetSource
-(
- Widget			w
- );
-
-Widget XawTextGetSink
-(
- Widget			w
- );
-
-XawTextPosition XawTextSearch
-(
- Widget			w,
-#if NeedWidePrototypes
- int			dir,
-#else
- XawTextScanDirection	dir,
-#endif
- XawTextBlock		*text
- );
-
-void XawTextDisplayCaret
-(
- Widget			w,
-#if NeedWidePrototypes
- int			visible
-#else
- Boolean		visible
-#endif
- );
-
-_XFUNCPROTOEND
-
-/*
- * For R3 compatability only
- */
-#include <X11/Xaw/AsciiSrc.h>
-#include <X11/Xaw/AsciiSink.h>
-
-#endif /* _XawText_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawText_h

+#define _XawText_h

+

+#include <X11/Xaw/Simple.h>

+

+/*

+

+ Class: 	textWidgetClass

+ Class Name:	Text

+ Superclass:	Simple

+

+ Resources added by the Text widget:

+

+ Name		     Class	     RepType		Default Value

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

+ autoFill	    AutoFill	     Boolean		False

+ bottomMargin	    Margin	     Position		2

+ displayPosition    TextPosition     XawTextPosition	0

+ insertPosition	    TextPosition     XawTextPosition	0

+ justify	    JustifyMode	     JustifyMode	left

+ leftColumn	    Column	     Column		0

+ rightColumn	    Column	     Column		0

+ leftMargin	    Margin	     Position		2

+ rightMargin	    Margin	     Position		4

+ positionCallback   Callback	     Callback		NULL

+ scrollHorizontal   Scroll	     Boolean		False

+ scrollVertical     Scroll	     Boolean		False

+ selectTypes        SelectTypes      Pointer            see documentation

+ textSink	    TextSink	     Widget		NULL

+ textSource	    TextSource	     Widget		NULL

+ topMargin	    Margin	     Position		2

+ unrealizeCallback  Callback	     Callback		NULL

+ wrap		    Wrap	     XawTextWrapMode	XawTextWrapNever

+

+*/

+

+typedef long XawTextPosition;

+

+#ifndef notdef

+typedef enum {

+  XawtextScrollNever,

+  XawtextScrollWhenNeeded,

+  XawtextScrollAlways

+} XawTextScrollMode;

+

+typedef enum {

+  XawtextResizeNever,

+  XawtextResizeWidth,

+  XawtextResizeHeight,

+  XawtextResizeBoth

+} XawTextResizeMode;

+#endif

+

+typedef enum {

+  XawtextWrapNever,

+  XawtextWrapLine,

+  XawtextWrapWord

+} XawTextWrapMode;

+

+typedef enum {

+  XawsdLeft,

+  XawsdRight

+} XawTextScanDirection;

+

+typedef enum {

+  XawtextRead,

+  XawtextAppend,

+  XawtextEdit

+} XawTextEditType;

+

+typedef enum {

+  XawselectNull,

+  XawselectPosition,

+  XawselectChar,

+  XawselectWord,

+  XawselectLine,

+  XawselectParagraph,

+  XawselectAll,

+  XawselectAlphaNumeric

+} XawTextSelectType;

+

+typedef enum {

+    XawjustifyLeft,

+    XawjustifyRight,

+    XawjustifyCenter,

+    XawjustifyFull

+} XawTextJustifyMode;

+

+typedef struct {

+    int  firstPos;

+    int  length;

+    char *ptr;

+    unsigned long format;

+} XawTextBlock, *XawTextBlockPtr;

+

+#ifndef OLDXAW

+typedef struct {

+    int line_number;

+    int column_number;

+    XawTextPosition insert_position;

+    XawTextPosition last_position;

+    Boolean overwrite_mode;

+} XawTextPositionInfo;

+

+typedef struct {

+    XawTextPosition left, right;

+    XawTextBlock *block;

+} XawTextPropertyInfo;

+

+typedef struct _XawTextAnchor XawTextAnchor;

+typedef struct _XawTextEntity XawTextEntity;

+typedef struct _XawTextProperty XawTextProperty;

+typedef struct _XawTextPropertyList XawTextPropertyList;

+#endif

+

+#include <X11/Xaw/TextSink.h>

+#include <X11/Xaw/TextSrc.h>

+

+#define XtEtextScrollNever "never"

+#define XtEtextScrollWhenNeeded "whenneeded"

+#define XtEtextScrollAlways "always"

+#define XtEtextResizeNever "never"

+#define XtEtextResizeWidth "width"

+#define XtEtextResizeHeight "height"

+#define XtEtextResizeBoth "both"

+

+#define XtEtextWrapNever	"never"

+#define XtEtextWrapLine		"line"

+#define XtEtextWrapWord		"word"

+

+#define XtNautoFill "autoFill"

+#define XtNbottomMargin "bottomMargin"

+#define XtNdialogHOffset "dialogHOffset"

+#define XtNdialogVOffset "dialogVOffset"

+#define XtNdisplayCaret "displayCaret"

+#define XtNdisplayPosition "displayPosition"

+#define XtNleftMargin "leftMargin"

+#define XtNrightMargin "rightMargin"

+#define XtNpositionCallback "positionCallback"

+#define XtNscrollVertical "scrollVertical"

+#define XtNscrollHorizontal "scrollHorizontal"

+#define XtNselectTypes "selectTypes"

+#define XtNtopMargin "topMargin"

+#define XtNwrap "wrap"

+

+#define XtCColumn		"Column"

+#define XtNleftColumn		"leftColumn"

+#define XtNrightColumn		"rightColumn"

+

+#define XtCJustifyMode		XtCJustify

+#define XtNjustifyMode		XtNjustify

+#define XtEtextJustifyLeft	"left"

+#define XtEtextJustifyRight	"right"

+#define XtEtextJustifyCenter	"center"

+#define XtEtextJustifyFull	"full"

+

+#define XtCAutoFill "AutoFill"

+#define XtCSelectTypes "SelectTypes"

+#define XtCWrap "Wrap"

+#ifndef notdef

+#define XtCScroll		"Scroll"

+#endif

+

+#ifndef _XtStringDefs_h_

+#define XtNinsertPosition "insertPosition"

+#ifndef notdef

+#define XtNresize "resize"

+#define XtCResize "Resize"

+#endif

+#define XtNselection		"selection"

+#endif

+

+/* return Error code for XawTextSearch */

+#define XawTextSearchError      (-12345L)

+

+/* return codes from XawTextReplace */

+#define XawReplaceError	       -1

+#define XawEditDone		0

+#define XawEditError		1

+#define XawPositionError	2

+

+/* XrmQuark is not unsigned long */

+#define XawTextFormat(tw,fmt) ((unsigned long)_XawTextFormat(tw) == (fmt))

+

+extern unsigned long FMT8BIT;

+extern unsigned long XawFmt8Bit;

+extern unsigned long XawFmtWide;

+

+extern WidgetClass textWidgetClass;

+

+typedef struct _TextClassRec *TextWidgetClass;

+typedef struct _TextRec      *TextWidget;

+

+_XFUNCPROTOBEGIN

+

+XrmQuark _XawTextFormat

+(

+ TextWidget		tw

+ );

+

+void XawTextDisplay

+(

+ Widget			w

+ );

+

+void XawTextEnableRedisplay

+(

+ Widget			w

+ );

+

+void XawTextDisableRedisplay

+(

+ Widget			w

+ );

+

+void XawTextSetSelectionArray

+(

+ Widget			w,

+ XawTextSelectType	*sarray

+ );

+

+void XawTextGetSelectionPos

+(

+ Widget			w,

+ XawTextPosition	*begin_return,

+ XawTextPosition	*end_return

+ );

+

+void XawTextSetSource

+(

+ Widget			w,

+ Widget			source,

+ XawTextPosition	top

+ );

+

+int XawTextReplace

+(

+ Widget			w,

+ XawTextPosition	start,

+ XawTextPosition	end,

+ XawTextBlock		*text

+ );

+

+XawTextPosition XawTextTopPosition

+(

+ Widget			w

+ );

+

+XawTextPosition XawTextLastPosition

+(

+ Widget			w

+ );

+

+void XawTextSetInsertionPoint

+(

+ Widget			w,

+ XawTextPosition	position

+ );

+

+XawTextPosition XawTextGetInsertionPoint

+(

+ Widget			w

+ );

+

+void XawTextUnsetSelection

+(

+ Widget			w

+ );

+

+void XawTextSetSelection

+(

+ Widget			w,

+ XawTextPosition	left,

+ XawTextPosition	right

+ );

+

+void XawTextInvalidate

+(

+ Widget			w,

+ XawTextPosition	from,

+ XawTextPosition	to

+);

+

+Widget XawTextGetSource

+(

+ Widget			w

+ );

+

+Widget XawTextGetSink

+(

+ Widget			w

+ );

+

+XawTextPosition XawTextSearch

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			dir,

+#else

+ XawTextScanDirection	dir,

+#endif

+ XawTextBlock		*text

+ );

+

+void XawTextDisplayCaret

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			visible

+#else

+ Boolean		visible

+#endif

+ );

+

+_XFUNCPROTOEND

+

+/*

+ * For R3 compatability only

+ */

+#include <X11/Xaw/AsciiSrc.h>

+#include <X11/Xaw/AsciiSink.h>

+

+#endif /* _XawText_h */

diff --git a/X11/Xaw/TextP.h b/X11/Xaw/TextP.h
index d058e8bd3..a22f11e60 100644
--- a/X11/Xaw/TextP.h
+++ b/X11/Xaw/TextP.h
@@ -1,323 +1,317 @@
-/*
-* $Xorg: TextP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextP.h,v 3.21 2001/12/14 19:54:44 dawes Exp $ */
-
-#ifndef _XawTextP_h
-#define _XawTextP_h
-
-#include <X11/Xfuncproto.h>
-
-#include <X11/Xaw/Text.h>
-#include <X11/Xaw/SimpleP.h>
-
-_XFUNCPROTOBEGIN
-
-#define MAXCUT	30000	/* Maximum number of characters that can be cut */
-
-#define XawTextGetLastPosition(ctx)				\
-	XawTextSourceScan((ctx)->text.source, 0,		\
-			  XawstAll, XawsdRight, 1, True)
-#define GETLASTPOS	XawTextGetLastPosition(ctx)
-
-#define zeroPosition ((XawTextPosition)0)
-
-extern XtActionsRec _XawTextActionsTable[];
-extern Cardinal _XawTextActionsTableCount;
-
-extern char _XawDefaultTextTranslations[];
-
-#define XawLF	  0x0a
-#define XawCR	  0x0d
-#define XawTAB	  0x09
-#define XawBS	  0x08
-#define XawSP	  0x20
-#define XawDEL	  0x7f
-#define XawESC	  0x1b
-#define XawBSLASH '\\'
-
-/* constants that subclasses may want to know */
-#define DEFAULT_TEXT_HEIGHT ((Dimension)~0)
-#define DEFAULT_TAB_SIZE	8
-
-/* displayable text management data structures */
-typedef struct {
-    XawTextPosition position;
-    Position y;
-#ifndef OLDXAW
-    unsigned int textWidth;
-#else
-    Dimension textWidth;
-#endif
-} XawTextLineTableEntry, *XawTextLineTableEntryPtr;
-
-typedef struct {
-    XawTextPosition left, right;
-    XawTextSelectType type;
-    Atom *selections;
-    int atom_count;
-    int array_size;
-} XawTextSelection;
-
-typedef struct _XawTextSelectionSalt {
-    struct _XawTextSelectionSalt *next;
-    XawTextSelection	s;
-    /* 
-     * The element "contents" stores the CT string which is gotten in the
-     * function _XawTextSaltAwaySelection()
-    */ 
-    char		*contents;
-    int			length;
-} XawTextSelectionSalt;
-
-#ifndef OLDXAW
-typedef struct _XawTextKillRing {
-    struct _XawTextKillRing *next;
-    char *contents;
-    int length;
-    unsigned refcount;
-    unsigned long format;
-} XawTextKillRing;
-
-extern XawTextKillRing *xaw_text_kill_ring;
-#endif
-
-/* Line Tables are n+1 long - last position displayed is in last lt entry */
-typedef struct {
-    XawTextPosition top;	 /* Top of the displayed text */
-    int lines;			 /* How many lines in this table */
-#ifndef OLDXAW
-    int base_line;		 /* line number of first entry */
-#endif
-    XawTextLineTableEntry *info; /* A dynamic array, one entry per line  */
-} XawTextLineTable, *XawTextLineTablePtr;
-
-typedef struct _XawTextMargin {
-    Position left, right, top, bottom;
-} XawTextMargin;
-
-typedef struct _XmuScanline XmuTextUpdate;
-
-#define VMargins(ctx)  ((ctx)->text.margin.top + (ctx)->text.margin.bottom)
-#define HMargins(ctx)  ((ctx)->text.left_margin + (ctx)->text.margin.right)
-#define RVMargins(ctx) ((ctx)->text.r_margin.top + (ctx)->text.r_margin.bottom)
-#define RHMargins(ctx) ((ctx)->text.r_margin.left + (ctx)->text.r_margin.right)
-
-#define IsPositionVisible(ctx, pos) \
-(pos >= ctx->text.lt.info[0].position && \
-		 pos < ctx->text.lt.info[ctx->text.lt.lines].position)
-
-/*
- * Search & Replace data structure
- */
-struct SearchAndReplace {
-    Boolean selection_changed;	/* flag so that the selection cannot be
-				   changed out from underneath query-replace.*/
-    Widget search_popup;	/* The poppup widget that allows searches.*/
-    Widget label1;		/* The label widgets for the search window. */
-    Widget label2;
-    Widget left_toggle; 	/* The left search toggle radioGroup. */
-    Widget right_toggle;	/* The right search toggle radioGroup. */
-    Widget rep_label;		/* The Replace label string. */
-    Widget rep_text;		/* The Replace text field. */
-    Widget search_text; 	/* The Search text field. */
-    Widget rep_one;		/* The Replace one button. */
-    Widget rep_all;		/* The Replace all button. */
-#ifndef OLDXAW
-    Widget case_sensitive;	/* The "Case Sensitive" toggle */
-#endif
-};
-
-/* New fields for the Text widget class record */
-typedef struct {
-  XtPointer extension;
-} TextClassPart;
-
-/* Full class record declaration */
-typedef struct _TextClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    TextClassPart	text_class;
-} TextClassRec;
-
-extern TextClassRec textClassRec;
-
-/* New fields for the Text widget record */
-typedef struct _TextPart {
-    /* resources */
-    Widget source, sink;
-    XawTextPosition insertPos;
-    XawTextSelection s;
-    XawTextSelectType *sarray;		     /* Array to cycle for selections */
-    XawTextSelectionSalt *salt;		     /* salted away selections */
-    int left_margin;
-    int dialog_horiz_offset, dialog_vert_offset; /* position for popup dialog */
-    Boolean display_caret;		     /* insertion pt visible iff T */
-    Boolean auto_fill;			     /* Auto fill mode? */
-    XawTextScrollMode scroll_vert, scroll_horiz;
-    XawTextWrapMode wrap;		     /* The type of wrapping */
-    XawTextResizeMode resize;
-    XawTextMargin r_margin;		     /* The real margins */
-#ifndef OLDXAW
-    XtCallbackList position_callbacks;
-#else
-    XtPointer pad1;
-#endif
-
-    /* private state */
-    XawTextMargin margin;		     /* The current margins */
-    XawTextLineTable lt;
-    XawTextScanDirection extendDir;
-    XawTextSelection origSel;		     /* the selection being modified */
-    Time lasttime;			     /* timestamp of last processed action */
-    Time time;				     /* time of last key or button action */
-    Position ev_x, ev_y;		     /* x, y coords for key or button action */
-    Widget vbar, hbar;			     /* The scroll bars (none = NULL) */
-    struct SearchAndReplace *search;	     /* Search and replace structure */
-    Widget file_insert;			     /* The file insert popup widget */
-    XmuTextUpdate *update;		     /* Position intervals to update */
-#ifndef OLDXAW
-    int line_number;
-    short column_number;
-    unsigned char kill_ring;
-    Boolean selection_state;
-#else
-    XtPointer pad2;
-    int pad3;
-#endif
-    int from_left;			     /* Cursor position */
-    XawTextPosition lastPos;		     /* Last position of source */
-    GC gc;
-    Boolean showposition;		     /* True if we need to show the position */
-    Boolean hasfocus;			     /* TRUE if we currently have input focus*/
-    Boolean update_disabled;		     /* TRUE if display updating turned off */
-    Boolean clear_to_eol;		     /* Clear to eol when painting text? */
-    XawTextPosition old_insert;		     /* Last insertPos for batched updates */
-    short mult;				     /* Multiplier */
-#ifndef OLDXAW
-    XawTextKillRing *kill_ring_ptr;
-#else
-    XtPointer pad4;
-#endif
-
-    /* private state, shared w/Source and Sink */
-    Boolean redisplay_needed;		     /* in SetValues */
-    XawTextSelectionSalt *salt2;	     /* salted away selections */
-
-#ifndef OLDXAW
-    char numeric;
-    char source_changed;
-    Boolean overwrite;                      /* Overwrite mode */
-
-    /* new resources and states, for text edition
-     * Note: a fixed width font is required for these resources/states.
-     */
-    short left_column, right_column;
-    XawTextJustifyMode justify;
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} TextPart;
-
-#define XtRWrapMode	"WrapMode"
-#define XtRScrollMode	"ScrollMode"
-#define XtRResizeMode	"ResizeMode"
-#define XtRJustifyMode	"JustifyMode"
-
-/* full instance record */
-typedef struct _TextRec {
-    CorePart	core;
-    SimplePart	simple;
-    TextPart	text;
-} TextRec;
-
-/*
- * Semi-private functions
- * for use by other Xaw modules only
- */
-void _XawTextBuildLineTable
-(
- TextWidget		ctx,
- XawTextPosition	top_pos,
- _XtBoolean		force_rebuild
- );
-
-char *_XawTextGetSTRING
-(
- TextWidget		ctx,
- XawTextPosition	left,
- XawTextPosition	right
- );
-
-void _XawTextSaltAwaySelection
-(
- TextWidget		ctx,
- Atom			*selections,
- int			num_atoms
- );
-
-void _XawTextPosToXY
-(
- Widget			w,
- XawTextPosition	pos,
- Position		*x,
- Position		*y
- );
-
-void _XawTextNeedsUpdating
-(
- TextWidget		ctx,
- XawTextPosition	left,
- XawTextPosition	right
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawTextP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawTextP_h

+#define _XawTextP_h

+

+#include <X11/Xfuncproto.h>

+

+#include <X11/Xaw/Text.h>

+#include <X11/Xaw/SimpleP.h>

+

+_XFUNCPROTOBEGIN

+

+#define MAXCUT	30000	/* Maximum number of characters that can be cut */

+

+#define XawTextGetLastPosition(ctx)				\

+	XawTextSourceScan((ctx)->text.source, 0,		\

+			  XawstAll, XawsdRight, 1, True)

+#define GETLASTPOS	XawTextGetLastPosition(ctx)

+

+#define zeroPosition ((XawTextPosition)0)

+

+extern XtActionsRec _XawTextActionsTable[];

+extern Cardinal _XawTextActionsTableCount;

+

+extern char _XawDefaultTextTranslations[];

+

+#define XawLF	  0x0a

+#define XawCR	  0x0d

+#define XawTAB	  0x09

+#define XawBS	  0x08

+#define XawSP	  0x20

+#define XawDEL	  0x7f

+#define XawESC	  0x1b

+#define XawBSLASH '\\'

+

+/* constants that subclasses may want to know */

+#define DEFAULT_TEXT_HEIGHT ((Dimension)~0)

+#define DEFAULT_TAB_SIZE	8

+

+/* displayable text management data structures */

+typedef struct {

+    XawTextPosition position;

+    Position y;

+#ifndef OLDXAW

+    unsigned int textWidth;

+#else

+    Dimension textWidth;

+#endif

+} XawTextLineTableEntry, *XawTextLineTableEntryPtr;

+

+typedef struct {

+    XawTextPosition left, right;

+    XawTextSelectType type;

+    Atom *selections;

+    int atom_count;

+    int array_size;

+} XawTextSelection;

+

+typedef struct _XawTextSelectionSalt {

+    struct _XawTextSelectionSalt *next;

+    XawTextSelection	s;

+    /* 

+     * The element "contents" stores the CT string which is gotten in the

+     * function _XawTextSaltAwaySelection()

+    */ 

+    char		*contents;

+    int			length;

+} XawTextSelectionSalt;

+

+#ifndef OLDXAW

+typedef struct _XawTextKillRing {

+    struct _XawTextKillRing *next;

+    char *contents;

+    int length;

+    unsigned refcount;

+    unsigned long format;

+} XawTextKillRing;

+

+extern XawTextKillRing *xaw_text_kill_ring;

+#endif

+

+/* Line Tables are n+1 long - last position displayed is in last lt entry */

+typedef struct {

+    XawTextPosition top;	 /* Top of the displayed text */

+    int lines;			 /* How many lines in this table */

+#ifndef OLDXAW

+    int base_line;		 /* line number of first entry */

+#endif

+    XawTextLineTableEntry *info; /* A dynamic array, one entry per line  */

+} XawTextLineTable, *XawTextLineTablePtr;

+

+typedef struct _XawTextMargin {

+    Position left, right, top, bottom;

+} XawTextMargin;

+

+typedef struct _XmuScanline XmuTextUpdate;

+

+#define VMargins(ctx)  ((ctx)->text.margin.top + (ctx)->text.margin.bottom)

+#define HMargins(ctx)  ((ctx)->text.left_margin + (ctx)->text.margin.right)

+#define RVMargins(ctx) ((ctx)->text.r_margin.top + (ctx)->text.r_margin.bottom)

+#define RHMargins(ctx) ((ctx)->text.r_margin.left + (ctx)->text.r_margin.right)

+

+#define IsPositionVisible(ctx, pos) \

+(pos >= ctx->text.lt.info[0].position && \

+		 pos < ctx->text.lt.info[ctx->text.lt.lines].position)

+

+/*

+ * Search & Replace data structure

+ */

+struct SearchAndReplace {

+    Boolean selection_changed;	/* flag so that the selection cannot be

+				   changed out from underneath query-replace.*/

+    Widget search_popup;	/* The poppup widget that allows searches.*/

+    Widget label1;		/* The label widgets for the search window. */

+    Widget label2;

+    Widget left_toggle; 	/* The left search toggle radioGroup. */

+    Widget right_toggle;	/* The right search toggle radioGroup. */

+    Widget rep_label;		/* The Replace label string. */

+    Widget rep_text;		/* The Replace text field. */

+    Widget search_text; 	/* The Search text field. */

+    Widget rep_one;		/* The Replace one button. */

+    Widget rep_all;		/* The Replace all button. */

+#ifndef OLDXAW

+    Widget case_sensitive;	/* The "Case Sensitive" toggle */

+#endif

+};

+

+/* New fields for the Text widget class record */

+typedef struct {

+  XtPointer extension;

+} TextClassPart;

+

+/* Full class record declaration */

+typedef struct _TextClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    TextClassPart	text_class;

+} TextClassRec;

+

+extern TextClassRec textClassRec;

+

+/* New fields for the Text widget record */

+typedef struct _TextPart {

+    /* resources */

+    Widget source, sink;

+    XawTextPosition insertPos;

+    XawTextSelection s;

+    XawTextSelectType *sarray;		     /* Array to cycle for selections */

+    XawTextSelectionSalt *salt;		     /* salted away selections */

+    int left_margin;

+    int dialog_horiz_offset, dialog_vert_offset; /* position for popup dialog */

+    Boolean display_caret;		     /* insertion pt visible iff T */

+    Boolean auto_fill;			     /* Auto fill mode? */

+    XawTextScrollMode scroll_vert, scroll_horiz;

+    XawTextWrapMode wrap;		     /* The type of wrapping */

+    XawTextResizeMode resize;

+    XawTextMargin r_margin;		     /* The real margins */

+#ifndef OLDXAW

+    XtCallbackList position_callbacks;

+#else

+    XtPointer pad1;

+#endif

+

+    /* private state */

+    XawTextMargin margin;		     /* The current margins */

+    XawTextLineTable lt;

+    XawTextScanDirection extendDir;

+    XawTextSelection origSel;		     /* the selection being modified */

+    Time lasttime;			     /* timestamp of last processed action */

+    Time time;				     /* time of last key or button action */

+    Position ev_x, ev_y;		     /* x, y coords for key or button action */

+    Widget vbar, hbar;			     /* The scroll bars (none = NULL) */

+    struct SearchAndReplace *search;	     /* Search and replace structure */

+    Widget file_insert;			     /* The file insert popup widget */

+    XmuTextUpdate *update;		     /* Position intervals to update */

+#ifndef OLDXAW

+    int line_number;

+    short column_number;

+    unsigned char kill_ring;

+    Boolean selection_state;

+#else

+    XtPointer pad2;

+    int pad3;

+#endif

+    int from_left;			     /* Cursor position */

+    XawTextPosition lastPos;		     /* Last position of source */

+    GC gc;

+    Boolean showposition;		     /* True if we need to show the position */

+    Boolean hasfocus;			     /* TRUE if we currently have input focus*/

+    Boolean update_disabled;		     /* TRUE if display updating turned off */

+    Boolean clear_to_eol;		     /* Clear to eol when painting text? */

+    XawTextPosition old_insert;		     /* Last insertPos for batched updates */

+    short mult;				     /* Multiplier */

+#ifndef OLDXAW

+    XawTextKillRing *kill_ring_ptr;

+#else

+    XtPointer pad4;

+#endif

+

+    /* private state, shared w/Source and Sink */

+    Boolean redisplay_needed;		     /* in SetValues */

+    XawTextSelectionSalt *salt2;	     /* salted away selections */

+

+#ifndef OLDXAW

+    char numeric;

+    char source_changed;

+    Boolean overwrite;                      /* Overwrite mode */

+

+    /* new resources and states, for text edition

+     * Note: a fixed width font is required for these resources/states.

+     */

+    short left_column, right_column;

+    XawTextJustifyMode justify;

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} TextPart;

+

+#define XtRWrapMode	"WrapMode"

+#define XtRScrollMode	"ScrollMode"

+#define XtRResizeMode	"ResizeMode"

+#define XtRJustifyMode	"JustifyMode"

+

+/* full instance record */

+typedef struct _TextRec {

+    CorePart	core;

+    SimplePart	simple;

+    TextPart	text;

+} TextRec;

+

+/*

+ * Semi-private functions

+ * for use by other Xaw modules only

+ */

+void _XawTextBuildLineTable

+(

+ TextWidget		ctx,

+ XawTextPosition	top_pos,

+ _XtBoolean		force_rebuild

+ );

+

+char *_XawTextGetSTRING

+(

+ TextWidget		ctx,

+ XawTextPosition	left,

+ XawTextPosition	right

+ );

+

+void _XawTextSaltAwaySelection

+(

+ TextWidget		ctx,

+ Atom			*selections,

+ int			num_atoms

+ );

+

+void _XawTextPosToXY

+(

+ Widget			w,

+ XawTextPosition	pos,

+ Position		*x,

+ Position		*y

+ );

+

+void _XawTextNeedsUpdating

+(

+ TextWidget		ctx,

+ XawTextPosition	left,

+ XawTextPosition	right

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawTextP_h */

diff --git a/X11/Xaw/TextSink.h b/X11/Xaw/TextSink.h
index 291b9600d..f49a02bbf 100644
--- a/X11/Xaw/TextSink.h
+++ b/X11/Xaw/TextSink.h
@@ -1,364 +1,359 @@
-/*
- * $Xorg: TextSink.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.9 2001/01/17 19:42:35 dawes Exp $ */
-
-#ifndef _XawTextSink_h
-#define _XawTextSink_h
-
-#include <X11/Xaw/Text.h>
-
-/***********************************************************************
- *
- * TextSink Object
- *
- ***********************************************************************/
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- font                Font            XFontStruct *      XtDefaultFont
- foreground          Foreground      Pixel              XtDefaultForeground
- background          Background      Pixel              XtDefaultBackground
- cursorColor	     Color	      Pixel		XtDefaultForeground
-*/
- 
-/* Class record constants */
-
-extern WidgetClass textSinkObjectClass;
-
-typedef struct _TextSinkClassRec *TextSinkObjectClass;
-typedef struct _TextSinkRec      *TextSinkObject;
-
-typedef enum {XawisOn, XawisOff} XawTextInsertState;
-
-#ifndef OLDXAW
-#ifndef XtNcursorColor
-#define XtNcursorColor		"cursorColor"
-#endif
-
-#define XawNtextProperties	"textProperties"
-#define XawCTextProperties	"TextProperties"
-#define XawRTextProperties	"XawTextProperties"
-#endif
-
-/*
- * Public Functions
- */
-_XFUNCPROTOBEGIN
-
-/*
- * Function:
- *	XawTextSinkDisplayText
- *
- * Parameters:
- *	w	  - the TextSink Object
- *	x	  - location to start drawing text
- *	y	  - ""
- *	pos1	  - location of starting and ending points in the text buffer
- *	pos2	  - ""
- *	highlight - hightlight this text?
- *
- * Description:
- *	Stub function that in subclasses will display text. 
- *
- * Note:
- *	  This function doesn't actually display anything, it is only a place
- *	holder.
- */
-void XawTextSinkDisplayText
-(
- Widget			w,
-#if NeedWidePrototypes
- int			x,
- int			y,
-#else
- Position		x,
- Position		y,
-#endif
- XawTextPosition	pos1,
- XawTextPosition	pos2,
-#if NeedWidePrototypes
- int			highlight
-#else
- Boolean		highlight
-#endif
- );
-
-/*
- * Function:
- *	XawTextSinkInsertCursor
- *
- * Parameters:
- *	w	- the TextSink Object.
- *	x	- location for the cursor.
- *	y	- ""
- *	state	- whether to turn the cursor on, or off
- *
- * Description:
- *	Places the InsertCursor.
- *
- * Note:
- *	  This function doesn't actually display anything, it is only a place
- *	holder.
- */
-void XawTextSinkInsertCursor
-(
- Widget			w,
-#if NeedWidePrototypes
- int			x,
- int			y,
- int			state
-#else
- Position		x,
- Position		y,
- XawTextInsertState	state
-#endif
- );
-
-/*
- * Function:
- *	XawTextSinkClearToBackground
- *
- * Parameters:
- *	w	- TextSink Object
- *	x	- location of area to clear
- *	y	- ""
- *	width	- size of area to clear
- *	height	- ""
- *
- * Description:
- *	Clears a region of the sink to the background color.
- *
- * Note:
- *	  This function doesn't actually display anything, it is only a place
- *	holder.
- */
-void XawTextSinkClearToBackground
-(
- Widget			w,
-#if NeedWidePrototypes
- int			x,
- int			y,
- unsigned int		width,
- unsigned int		height
-#else
- Position		x,
- Position		y,
- Dimension		width,
- Dimension		height
-#endif
- );
-
-/*
- * Function:
- *	XawTextSinkFindPosition
- *
- * Parameters:
- *	w		- TextSink Object
- *	fromPos		- reference position
- *	fromX		- reference location
- *	width		- width of section to paint text
- *	stopAtWordBreak - returned position is a word break?
- *	resPos		- Position to return
- *	resWidth	- Width actually used
- *	resHeight	- Height actually used
- *
- * Description:
- *	Finds a position in the text.
- */
-void XawTextSinkFindPosition
-(
- Widget			w,
- XawTextPosition	fromPos,
- int			fromX,
- int			width,
-#if NeedWidePrototypes
- int			stopAtWordBreak,
-#else
- Boolean		stopAtWordBreak,
-#endif
- XawTextPosition*	pos_return,
- int			*width_return,
- int			*height_return
- );
-
-/*
- * Function:
- *	XawTextSinkFindDistance
- *
- * Parameters:
- *	w		- TextSink Object
- *	fromPos		- starting Position
- *	fromX		- x location of starting Position
- *	toPos		- end Position
- *	resWidth	- Distance between fromPos and toPos
- *	resPos		- Acutal toPos used
- *	resHeight	- Height required by this text
- *
- * Description:
- *	Find the Pixel Distance between two text Positions.
- */
-void XawTextSinkFindDistance
-(
- Widget			w,
- XawTextPosition	fromPos,
- int			fromX,
- XawTextPosition	toPos,
- int			*width_return,
- XawTextPosition	*pos_return,
- int			*height_return
- );
-
-/*
- * Function:
- *	XawTextSinkResolve
- *
- * Parameters:
- *	w	- TextSink Object
- *	pos	- reference Position
- *	fromx	- reference Location
- *	width	- width to move
- *	resPos	- resulting position
- *
- * Description:
- *	Resloves a location to a position.
- */
-void XawTextSinkResolve
-(
- Widget			w,
- XawTextPosition	fromPos,
- int			fromX,
- int			width,
- XawTextPosition	*pos_return
- );
-
-/*
- * Function:
- *	XawTextSinkMaxLines
- *
- * Parameters:
- *	w	- TextSink Object
- *	height	- height to fit lines into
- *
- * Returns:
- *	Number of lines that will fit
- *
- * Description:
- *	Finds the Maximum number of lines that will fit in a given height.
- */
-int XawTextSinkMaxLines
-(
- Widget			w,
-#if NeedWidePrototypes
- unsigned int		height
-#else
- Dimension		height
-#endif
- );
-
-/*
- * Function:
- *	XawTextSinkMaxHeight
- *
- * Parameters:
- *	w	- TextSink Object
- *	lines	- number of lines
- *
- * Returns:
- *	Height
- *
- * Description:
- *	Finds the Minium height that will contain a given number lines.
- */
-int XawTextSinkMaxHeight
-(
- Widget			w,
- int			lines
-);
-
-/*
- * Function:
- *	XawTextSinkSetTabs
- *
- * Parameters:
- *	w		- TextSink Object
- *	tab_count	- number of tabs in the list
- *	tabs		- text positions of the tabs
- * Description:
- *	Sets the Tab stops.
- */
-void XawTextSinkSetTabs
-(
- Widget			w,
- int			tab_count,
- int			*tabs
-);
-						  
-/*
- * Function:
- *	XawTextSinkGetCursorBounds
- *
- * Parameters:
- *	w	- TextSink Object
- *	rect	- X rectance containing the cursor bounds
- * Description:
- *	Finds the bounding box for the insert curor (caret).
- */
-void XawTextSinkGetCursorBounds
-(
- Widget			w,
- XRectangle		*rect_return
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XawTextSink_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawTextSink_h

+#define _XawTextSink_h

+

+#include <X11/Xaw/Text.h>

+

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

+ *

+ * TextSink Object

+ *

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

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ font                Font            XFontStruct *      XtDefaultFont

+ foreground          Foreground      Pixel              XtDefaultForeground

+ background          Background      Pixel              XtDefaultBackground

+ cursorColor	     Color	      Pixel		XtDefaultForeground

+*/

+ 

+/* Class record constants */

+

+extern WidgetClass textSinkObjectClass;

+

+typedef struct _TextSinkClassRec *TextSinkObjectClass;

+typedef struct _TextSinkRec      *TextSinkObject;

+

+typedef enum {XawisOn, XawisOff} XawTextInsertState;

+

+#ifndef OLDXAW

+#ifndef XtNcursorColor

+#define XtNcursorColor		"cursorColor"

+#endif

+

+#define XawNtextProperties	"textProperties"

+#define XawCTextProperties	"TextProperties"

+#define XawRTextProperties	"XawTextProperties"

+#endif

+

+/*

+ * Public Functions

+ */

+_XFUNCPROTOBEGIN

+

+/*

+ * Function:

+ *	XawTextSinkDisplayText

+ *

+ * Parameters:

+ *	w	  - the TextSink Object

+ *	x	  - location to start drawing text

+ *	y	  - ""

+ *	pos1	  - location of starting and ending points in the text buffer

+ *	pos2	  - ""

+ *	highlight - hightlight this text?

+ *

+ * Description:

+ *	Stub function that in subclasses will display text. 

+ *

+ * Note:

+ *	  This function doesn't actually display anything, it is only a place

+ *	holder.

+ */

+void XawTextSinkDisplayText

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			x,

+ int			y,

+#else

+ Position		x,

+ Position		y,

+#endif

+ XawTextPosition	pos1,

+ XawTextPosition	pos2,

+#if NeedWidePrototypes

+ int			highlight

+#else

+ Boolean		highlight

+#endif

+ );

+

+/*

+ * Function:

+ *	XawTextSinkInsertCursor

+ *

+ * Parameters:

+ *	w	- the TextSink Object.

+ *	x	- location for the cursor.

+ *	y	- ""

+ *	state	- whether to turn the cursor on, or off

+ *

+ * Description:

+ *	Places the InsertCursor.

+ *

+ * Note:

+ *	  This function doesn't actually display anything, it is only a place

+ *	holder.

+ */

+void XawTextSinkInsertCursor

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			x,

+ int			y,

+ int			state

+#else

+ Position		x,

+ Position		y,

+ XawTextInsertState	state

+#endif

+ );

+

+/*

+ * Function:

+ *	XawTextSinkClearToBackground

+ *

+ * Parameters:

+ *	w	- TextSink Object

+ *	x	- location of area to clear

+ *	y	- ""

+ *	width	- size of area to clear

+ *	height	- ""

+ *

+ * Description:

+ *	Clears a region of the sink to the background color.

+ *

+ * Note:

+ *	  This function doesn't actually display anything, it is only a place

+ *	holder.

+ */

+void XawTextSinkClearToBackground

+(

+ Widget			w,

+#if NeedWidePrototypes

+ int			x,

+ int			y,

+ unsigned int		width,

+ unsigned int		height

+#else

+ Position		x,

+ Position		y,

+ Dimension		width,

+ Dimension		height

+#endif

+ );

+

+/*

+ * Function:

+ *	XawTextSinkFindPosition

+ *

+ * Parameters:

+ *	w		- TextSink Object

+ *	fromPos		- reference position

+ *	fromX		- reference location

+ *	width		- width of section to paint text

+ *	stopAtWordBreak - returned position is a word break?

+ *	resPos		- Position to return

+ *	resWidth	- Width actually used

+ *	resHeight	- Height actually used

+ *

+ * Description:

+ *	Finds a position in the text.

+ */

+void XawTextSinkFindPosition

+(

+ Widget			w,

+ XawTextPosition	fromPos,

+ int			fromX,

+ int			width,

+#if NeedWidePrototypes

+ int			stopAtWordBreak,

+#else

+ Boolean		stopAtWordBreak,

+#endif

+ XawTextPosition*	pos_return,

+ int			*width_return,

+ int			*height_return

+ );

+

+/*

+ * Function:

+ *	XawTextSinkFindDistance

+ *

+ * Parameters:

+ *	w		- TextSink Object

+ *	fromPos		- starting Position

+ *	fromX		- x location of starting Position

+ *	toPos		- end Position

+ *	resWidth	- Distance between fromPos and toPos

+ *	resPos		- Acutal toPos used

+ *	resHeight	- Height required by this text

+ *

+ * Description:

+ *	Find the Pixel Distance between two text Positions.

+ */

+void XawTextSinkFindDistance

+(

+ Widget			w,

+ XawTextPosition	fromPos,

+ int			fromX,

+ XawTextPosition	toPos,

+ int			*width_return,

+ XawTextPosition	*pos_return,

+ int			*height_return

+ );

+

+/*

+ * Function:

+ *	XawTextSinkResolve

+ *

+ * Parameters:

+ *	w	- TextSink Object

+ *	pos	- reference Position

+ *	fromx	- reference Location

+ *	width	- width to move

+ *	resPos	- resulting position

+ *

+ * Description:

+ *	Resloves a location to a position.

+ */

+void XawTextSinkResolve

+(

+ Widget			w,

+ XawTextPosition	fromPos,

+ int			fromX,

+ int			width,

+ XawTextPosition	*pos_return

+ );

+

+/*

+ * Function:

+ *	XawTextSinkMaxLines

+ *

+ * Parameters:

+ *	w	- TextSink Object

+ *	height	- height to fit lines into

+ *

+ * Returns:

+ *	Number of lines that will fit

+ *

+ * Description:

+ *	Finds the Maximum number of lines that will fit in a given height.

+ */

+int XawTextSinkMaxLines

+(

+ Widget			w,

+#if NeedWidePrototypes

+ unsigned int		height

+#else

+ Dimension		height

+#endif

+ );

+

+/*

+ * Function:

+ *	XawTextSinkMaxHeight

+ *

+ * Parameters:

+ *	w	- TextSink Object

+ *	lines	- number of lines

+ *

+ * Returns:

+ *	Height

+ *

+ * Description:

+ *	Finds the Minium height that will contain a given number lines.

+ */

+int XawTextSinkMaxHeight

+(

+ Widget			w,

+ int			lines

+);

+

+/*

+ * Function:

+ *	XawTextSinkSetTabs

+ *

+ * Parameters:

+ *	w		- TextSink Object

+ *	tab_count	- number of tabs in the list

+ *	tabs		- text positions of the tabs

+ * Description:

+ *	Sets the Tab stops.

+ */

+void XawTextSinkSetTabs

+(

+ Widget			w,

+ int			tab_count,

+ int			*tabs

+);

+						  

+/*

+ * Function:

+ *	XawTextSinkGetCursorBounds

+ *

+ * Parameters:

+ *	w	- TextSink Object

+ *	rect	- X rectance containing the cursor bounds

+ * Description:

+ *	Finds the bounding box for the insert curor (caret).

+ */

+void XawTextSinkGetCursorBounds

+(

+ Widget			w,

+ XRectangle		*rect_return

+);

+

+_XFUNCPROTOEND

+

+#endif /* _XawTextSink_h */

diff --git a/X11/Xaw/TextSinkP.h b/X11/Xaw/TextSinkP.h
index 6cc873328..7c86d4b4f 100644
--- a/X11/Xaw/TextSinkP.h
+++ b/X11/Xaw/TextSinkP.h
@@ -1,306 +1,300 @@
-/*
-* $Xorg: TextSinkP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.11 2001/01/17 19:42:35 dawes Exp $ */
-
-#ifndef _XawTextSinkP_h
-#define _XawTextSinkP_h
-
-/*
- * TextSink Object Private Data
- */
-#include <X11/Xaw/TextSink.h>
-#include <X11/Xaw/TextP.h>	/* This sink works with the Text widget */
-#include <X11/Xaw/TextSrcP.h>	/* This sink works with the Text Source */
-#include <X11/Xmu/Xmu.h>
-
-#ifndef OLDXAW
-/* font/fontset defined? */
-#define XAW_TPROP_FONT		(1<<0)
-#define XAW_TPROP_FONTSET	(1<<1)
-
-/* extra attributes */
-#define XAW_TPROP_FOREGROUND	(1<<2)
-#define XAW_TPROP_BACKGROUND	(1<<3)
-#define XAW_TPROP_FPIXMAP	(1<<4)
-#define XAW_TPROP_BPIXMAP	(1<<5)
-#define XAW_TPROP_UNDERLINE	(1<<6)
-#define XAW_TPROP_OVERSTRIKE	(1<<7)
-#define XAW_TPROP_SUBSCRIPT	(1<<8)
-#define XAW_TPROP_SUPERSCRIPT	(1<<9)
-
-/* xlfd attributes */
-#define XAW_TPROP_FOUNDRY	(1<<0)
-#define XAW_TPROP_FAMILY	(1<<1)
-#define XAW_TPROP_WEIGHT	(1<<2)
-#define XAW_TPROP_SLANT		(1<<3)
-#define XAW_TPROP_SETWIDTH	(1<<4)
-#define XAW_TPROP_ADDSTYLE	(1<<5)
-#define XAW_TPROP_PIXELSIZE	(1<<6)
-#define XAW_TPROP_POINTSIZE	(1<<7)
-#define XAW_TPROP_RESX		(1<<8)
-#define XAW_TPROP_RESY		(1<<9)
-#define XAW_TPROP_SPACING	(1<<10)
-#define XAW_TPROP_AVGWIDTH	(1<<11)
-#define XAW_TPROP_REGISTRY	(1<<12)
-#define XAW_TPROP_ENCODING	(1<<13)
-struct _XawTextProperty {	/* to be extended/modified */
-    XrmQuark identifier, code;
-    unsigned long mask;
-    XFontStruct *font;
-    XFontSet fontset;
-    Pixel foreground, background;
-    Pixmap foreground_pixmap, background_pixmap;
-    XrmQuark xlfd;
-
-    unsigned long xlfd_mask;
-    XrmQuark foundry, family, weight, slant, setwidth, addstyle, pixel_size,
-	     point_size, res_x, res_y, spacing, avgwidth, registry, encoding;
-
-    short underline_position, underline_thickness;
-};
-
-struct _XawTextPropertyList {
-    XrmQuark identifier;
-    Screen *screen;
-    Colormap colormap;
-    int depth;
-    XawTextProperty **properties;
-    Cardinal num_properties;
-    XawTextPropertyList *next;
-};
-
-typedef struct _XawTextPaintStruct XawTextPaintStruct;
-struct _XawTextPaintStruct {
-    XawTextPaintStruct *next;
-    int x, y, width;
-    char *text;			/* formatted text */
-    Cardinal length;		/* length of text */
-    XawTextProperty *property;
-    int max_ascent, max_descent;
-    XmuArea *backtabs;
-    Boolean highlight;
-};
-
-typedef struct {
-    XmuArea *clip, *hightabs;			/* clip list */
-    XawTextPaintStruct *paint, *bearings;	/* drawing information */
-} XawTextPaintList;
-
-typedef struct {
-    XtPointer next_extension;
-    XrmQuark record_type;
-    long version;
-    Cardinal record_size;
-    Bool (*BeginPaint)(Widget);
-    void (*PreparePaint)(Widget, int, int,
-			 XawTextPosition, XawTextPosition, Bool);
-    void (*DoPaint)(Widget);
-    Bool (*EndPaint)(Widget);
-} TextSinkExtRec, *TextSinkExt;
-#endif
-
-typedef void (*_XawSinkDisplayTextProc)
-     (Widget, int, int, XawTextPosition, XawTextPosition, Bool);
-
-typedef void (*_XawSinkInsertCursorProc)
-     (Widget, int, int, XawTextInsertState);
-
-typedef void (*_XawSinkClearToBackgroundProc)
-     (Widget, int, int, unsigned int, unsigned int);
-
-typedef void (*_XawSinkFindPositionProc)
-     (Widget, XawTextPosition, int, int, Bool, XawTextPosition*, int*, int*);
-
-typedef void (*_XawSinkFindDistanceProc)
-     (Widget, XawTextPosition, int, XawTextPosition, int*,
-      XawTextPosition*, int*);
-
-typedef void (*_XawSinkResolveProc)
-     (Widget, XawTextPosition, int, int, XawTextPosition*);
-
-typedef int  (*_XawSinkMaxLinesProc)
-     (Widget, unsigned int);
-
-typedef int  (*_XawSinkMaxHeightProc)
-     (Widget, int);
-
-typedef void (*_XawSinkSetTabsProc)
-     (Widget, int, short*);
-
-typedef void (*_XawSinkGetCursorBoundsProc)
-     (Widget, XRectangle*);
-
-typedef struct _TextSinkClassPart {
-    _XawSinkDisplayTextProc DisplayText;
-    _XawSinkInsertCursorProc InsertCursor;
-    _XawSinkClearToBackgroundProc ClearToBackground;
-    _XawSinkFindPositionProc FindPosition;
-    _XawSinkFindDistanceProc FindDistance;
-    _XawSinkResolveProc Resolve;
-    _XawSinkMaxLinesProc MaxLines;
-    _XawSinkMaxHeightProc MaxHeight;
-    _XawSinkSetTabsProc	SetTabs;
-    _XawSinkGetCursorBoundsProc GetCursorBounds;
-#ifndef OLDXAW
-    TextSinkExt extension;
-#endif
-} TextSinkClassPart;
-
-/* Full class record */
-typedef struct _TextSinkClassRec {
-    ObjectClassPart     object_class;
-    TextSinkClassPart	text_sink_class;
-} TextSinkClassRec;
-
-extern TextSinkClassRec textSinkClassRec;
-
-/* New fields for the TextSink object */
-typedef struct {
-    /* resources */
-    Pixel foreground;		/* Foreground color */
-    Pixel background;		/* Background color */
-
-    /* private */
-    Position *tabs;		/* The tab stops as pixel values */
-    short *char_tabs;		/* The tabs stops as character values */
-    int tab_count;		/* number of items in tabs */
-
-#ifndef OLDXAW
-    /* more resources */
-    Pixel cursor_color;
-    XawTextPropertyList *properties;
-    XawTextPaintList *paint;
-    XtPointer pad[2];	/* for future use and keep binary compatability */
-#endif
-} TextSinkPart;
-
-/* Full instance record */
-typedef struct _TextSinkRec {
-    ObjectPart	 object;
-    TextSinkPart text_sink;
-} TextSinkRec;
-
-/* Semi private routines */
-#ifndef OLDXAW
-XawTextPropertyList *XawTextSinkConvertPropertyList
-(
- String			 name,
- String			 spec,
- Screen			*screen,
- Colormap		 Colormap,
- int			 depth
- );
-
-XawTextProperty *XawTextSinkGetProperty
-(
- Widget			 w,
- XrmQuark		 property
- );
-
-XawTextProperty *XawTextSinkCopyProperty
-(
- Widget			w,
- XrmQuark		property
- );
-
-XawTextProperty *XawTextSinkAddProperty
-(
- Widget			 w,
- XawTextProperty	*property
- );
-
-XawTextProperty *XawTextSinkCombineProperty
-(
- Widget			 w,
- XawTextProperty	*result_in_out,
- XawTextProperty	*property,
- Bool			 override
- );
-
-Bool XawTextSinkBeginPaint
-(
- Widget			w
- );
-
-void XawTextSinkPreparePaint
-(
- Widget			w,
- int			y,
- int			line,
- XawTextPosition	from,
- XawTextPosition	to,
- Bool			highlight
-);
-
-void XawTextSinkDoPaint
-(
- Widget			w
- );
-
-Bool XawTextSinkEndPaint
-(
- Widget			w
- );
-#endif
-
-#define XtInheritDisplayText	   ((_XawSinkDisplayTextProc)_XtInherit)
-#define XtInheritInsertCursor	   ((_XawSinkInsertCursorProc)_XtInherit)
-#define XtInheritClearToBackground ((_XawSinkClearToBackgroundProc)_XtInherit)
-#define XtInheritFindPosition	   ((_XawSinkFindPositionProc)_XtInherit)
-#define XtInheritFindDistance	   ((_XawSinkFindDistanceProc)_XtInherit)
-#define XtInheritResolve	   ((_XawSinkResolveProc)_XtInherit)
-#define XtInheritMaxLines	   ((_XawSinkMaxLinesProc)_XtInherit)
-#define XtInheritMaxHeight	   ((_XawSinkMaxHeightProc)_XtInherit)
-#define XtInheritSetTabs	   ((_XawSinkSetTabsProc)_XtInherit)
-#define XtInheritGetCursorBounds   ((_XawSinkGetCursorBoundsProc)_XtInherit)
-
-#endif /* _XawTextSinkP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawTextSinkP_h

+#define _XawTextSinkP_h

+

+/*

+ * TextSink Object Private Data

+ */

+#include <X11/Xaw/TextSink.h>

+#include <X11/Xaw/TextP.h>	/* This sink works with the Text widget */

+#include <X11/Xaw/TextSrcP.h>	/* This sink works with the Text Source */

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

+

+#ifndef OLDXAW

+/* font/fontset defined? */

+#define XAW_TPROP_FONT		(1<<0)

+#define XAW_TPROP_FONTSET	(1<<1)

+

+/* extra attributes */

+#define XAW_TPROP_FOREGROUND	(1<<2)

+#define XAW_TPROP_BACKGROUND	(1<<3)

+#define XAW_TPROP_FPIXMAP	(1<<4)

+#define XAW_TPROP_BPIXMAP	(1<<5)

+#define XAW_TPROP_UNDERLINE	(1<<6)

+#define XAW_TPROP_OVERSTRIKE	(1<<7)

+#define XAW_TPROP_SUBSCRIPT	(1<<8)

+#define XAW_TPROP_SUPERSCRIPT	(1<<9)

+

+/* xlfd attributes */

+#define XAW_TPROP_FOUNDRY	(1<<0)

+#define XAW_TPROP_FAMILY	(1<<1)

+#define XAW_TPROP_WEIGHT	(1<<2)

+#define XAW_TPROP_SLANT		(1<<3)

+#define XAW_TPROP_SETWIDTH	(1<<4)

+#define XAW_TPROP_ADDSTYLE	(1<<5)

+#define XAW_TPROP_PIXELSIZE	(1<<6)

+#define XAW_TPROP_POINTSIZE	(1<<7)

+#define XAW_TPROP_RESX		(1<<8)

+#define XAW_TPROP_RESY		(1<<9)

+#define XAW_TPROP_SPACING	(1<<10)

+#define XAW_TPROP_AVGWIDTH	(1<<11)

+#define XAW_TPROP_REGISTRY	(1<<12)

+#define XAW_TPROP_ENCODING	(1<<13)

+struct _XawTextProperty {	/* to be extended/modified */

+    XrmQuark identifier, code;

+    unsigned long mask;

+    XFontStruct *font;

+    XFontSet fontset;

+    Pixel foreground, background;

+    Pixmap foreground_pixmap, background_pixmap;

+    XrmQuark xlfd;

+

+    unsigned long xlfd_mask;

+    XrmQuark foundry, family, weight, slant, setwidth, addstyle, pixel_size,

+	     point_size, res_x, res_y, spacing, avgwidth, registry, encoding;

+

+    short underline_position, underline_thickness;

+};

+

+struct _XawTextPropertyList {

+    XrmQuark identifier;

+    Screen *screen;

+    Colormap colormap;

+    int depth;

+    XawTextProperty **properties;

+    Cardinal num_properties;

+    XawTextPropertyList *next;

+};

+

+typedef struct _XawTextPaintStruct XawTextPaintStruct;

+struct _XawTextPaintStruct {

+    XawTextPaintStruct *next;

+    int x, y, width;

+    char *text;			/* formatted text */

+    Cardinal length;		/* length of text */

+    XawTextProperty *property;

+    int max_ascent, max_descent;

+    XmuArea *backtabs;

+    Boolean highlight;

+};

+

+typedef struct {

+    XmuArea *clip, *hightabs;			/* clip list */

+    XawTextPaintStruct *paint, *bearings;	/* drawing information */

+} XawTextPaintList;

+

+typedef struct {

+    XtPointer next_extension;

+    XrmQuark record_type;

+    long version;

+    Cardinal record_size;

+    Bool (*BeginPaint)(Widget);

+    void (*PreparePaint)(Widget, int, int,

+			 XawTextPosition, XawTextPosition, Bool);

+    void (*DoPaint)(Widget);

+    Bool (*EndPaint)(Widget);

+} TextSinkExtRec, *TextSinkExt;

+#endif

+

+typedef void (*_XawSinkDisplayTextProc)

+     (Widget, int, int, XawTextPosition, XawTextPosition, Bool);

+

+typedef void (*_XawSinkInsertCursorProc)

+     (Widget, int, int, XawTextInsertState);

+

+typedef void (*_XawSinkClearToBackgroundProc)

+     (Widget, int, int, unsigned int, unsigned int);

+

+typedef void (*_XawSinkFindPositionProc)

+     (Widget, XawTextPosition, int, int, Bool, XawTextPosition*, int*, int*);

+

+typedef void (*_XawSinkFindDistanceProc)

+     (Widget, XawTextPosition, int, XawTextPosition, int*,

+      XawTextPosition*, int*);

+

+typedef void (*_XawSinkResolveProc)

+     (Widget, XawTextPosition, int, int, XawTextPosition*);

+

+typedef int  (*_XawSinkMaxLinesProc)

+     (Widget, unsigned int);

+

+typedef int  (*_XawSinkMaxHeightProc)

+     (Widget, int);

+

+typedef void (*_XawSinkSetTabsProc)

+     (Widget, int, short*);

+

+typedef void (*_XawSinkGetCursorBoundsProc)

+     (Widget, XRectangle*);

+

+typedef struct _TextSinkClassPart {

+    _XawSinkDisplayTextProc DisplayText;

+    _XawSinkInsertCursorProc InsertCursor;

+    _XawSinkClearToBackgroundProc ClearToBackground;

+    _XawSinkFindPositionProc FindPosition;

+    _XawSinkFindDistanceProc FindDistance;

+    _XawSinkResolveProc Resolve;

+    _XawSinkMaxLinesProc MaxLines;

+    _XawSinkMaxHeightProc MaxHeight;

+    _XawSinkSetTabsProc	SetTabs;

+    _XawSinkGetCursorBoundsProc GetCursorBounds;

+#ifndef OLDXAW

+    TextSinkExt extension;

+#endif

+} TextSinkClassPart;

+

+/* Full class record */

+typedef struct _TextSinkClassRec {

+    ObjectClassPart     object_class;

+    TextSinkClassPart	text_sink_class;

+} TextSinkClassRec;

+

+extern TextSinkClassRec textSinkClassRec;

+

+/* New fields for the TextSink object */

+typedef struct {

+    /* resources */

+    Pixel foreground;		/* Foreground color */

+    Pixel background;		/* Background color */

+

+    /* private */

+    Position *tabs;		/* The tab stops as pixel values */

+    short *char_tabs;		/* The tabs stops as character values */

+    int tab_count;		/* number of items in tabs */

+

+#ifndef OLDXAW

+    /* more resources */

+    Pixel cursor_color;

+    XawTextPropertyList *properties;

+    XawTextPaintList *paint;

+    XtPointer pad[2];	/* for future use and keep binary compatability */

+#endif

+} TextSinkPart;

+

+/* Full instance record */

+typedef struct _TextSinkRec {

+    ObjectPart	 object;

+    TextSinkPart text_sink;

+} TextSinkRec;

+

+/* Semi private routines */

+#ifndef OLDXAW

+XawTextPropertyList *XawTextSinkConvertPropertyList

+(

+ String			 name,

+ String			 spec,

+ Screen			*screen,

+ Colormap		 Colormap,

+ int			 depth

+ );

+

+XawTextProperty *XawTextSinkGetProperty

+(

+ Widget			 w,

+ XrmQuark		 property

+ );

+

+XawTextProperty *XawTextSinkCopyProperty

+(

+ Widget			w,

+ XrmQuark		property

+ );

+

+XawTextProperty *XawTextSinkAddProperty

+(

+ Widget			 w,

+ XawTextProperty	*property

+ );

+

+XawTextProperty *XawTextSinkCombineProperty

+(

+ Widget			 w,

+ XawTextProperty	*result_in_out,

+ XawTextProperty	*property,

+ Bool			 override

+ );

+

+Bool XawTextSinkBeginPaint

+(

+ Widget			w

+ );

+

+void XawTextSinkPreparePaint

+(

+ Widget			w,

+ int			y,

+ int			line,

+ XawTextPosition	from,

+ XawTextPosition	to,

+ Bool			highlight

+);

+

+void XawTextSinkDoPaint

+(

+ Widget			w

+ );

+

+Bool XawTextSinkEndPaint

+(

+ Widget			w

+ );

+#endif

+

+#define XtInheritDisplayText	   ((_XawSinkDisplayTextProc)_XtInherit)

+#define XtInheritInsertCursor	   ((_XawSinkInsertCursorProc)_XtInherit)

+#define XtInheritClearToBackground ((_XawSinkClearToBackgroundProc)_XtInherit)

+#define XtInheritFindPosition	   ((_XawSinkFindPositionProc)_XtInherit)

+#define XtInheritFindDistance	   ((_XawSinkFindDistanceProc)_XtInherit)

+#define XtInheritResolve	   ((_XawSinkResolveProc)_XtInherit)

+#define XtInheritMaxLines	   ((_XawSinkMaxLinesProc)_XtInherit)

+#define XtInheritMaxHeight	   ((_XawSinkMaxHeightProc)_XtInherit)

+#define XtInheritSetTabs	   ((_XawSinkSetTabsProc)_XtInherit)

+#define XtInheritGetCursorBounds   ((_XawSinkGetCursorBoundsProc)_XtInherit)

+

+#endif /* _XawTextSinkP_h */

diff --git a/X11/Xaw/TextSrc.h b/X11/Xaw/TextSrc.h
index 817132d48..7042d9139 100644
--- a/X11/Xaw/TextSrc.h
+++ b/X11/Xaw/TextSrc.h
@@ -1,280 +1,275 @@
-/*
- * $Xorg: TextSrc.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $
- */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.11 2001/01/17 19:42:35 dawes Exp $ */
-
-#ifndef _XawTextSrc_h
-#define _XawTextSrc_h
-
-#include <X11/Xaw/Text.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- callback	     Callback		Callback	NULL
- editType	     EditType		XawTextEditType	XawtextRead
- enableUndo	     Undo		Boolean		False
- sourceChanged	     Changed		Boolean		False
-
-*/
- 
-/* Class record constants */
-extern WidgetClass textSrcObjectClass;
-
-typedef struct _TextSrcClassRec *TextSrcObjectClass;
-typedef struct _TextSrcRec      *TextSrcObject;
-
-typedef enum {
-    XawstPositions,
-    XawstWhiteSpace,
-    XawstEOL,
-    XawstParagraph,
-    XawstAll,
-    XawstAlphaNumeric
-  } XawTextScanType;
-
-typedef enum {
-    Normal,
-    Selected
-} highlightType;
-
-typedef enum {
-    XawsmTextSelect,
-    XawsmTextExtend
-} XawTextSelectionMode;
-
-typedef enum {
-    XawactionStart,
-    XawactionAdjust,
-    XawactionEnd
-} XawTextSelectionAction;
-
-#define XawTextReadError -1
-#define XawTextScanError -1
-
-#ifndef OLDXAW
-#define XtNenableUndo		"enableUndo"
-#define XtCUndo			"Undo"
-
-#define XtNsourceChanged	"sourceChanged"
-#define XtCChanged		"Changed"
-
-#define XtNpropertyCallback	"propertyCallback"
-#endif
-
-/*
- * Public Functions
- */
-_XFUNCPROTOBEGIN
-
-/*
- * Function:
- *	XawTextSourceRead
- *
- * Parameters:
- *	w      - TextSrc Object
- *	pos    - position of the text to retreive
- *	text   - text block that will contain returned text
- *	length - maximum number of characters to read
- *
- * Description:
- *	This function reads the source.
- *
- * Returns:
- *	The number of characters read into the buffer
- */
-XawTextPosition XawTextSourceRead
-(
- Widget			w,
- XawTextPosition	pos,
- XawTextBlock		*text_return,
- int			length
- );
-
-/*
- * Function:
- *	XawTextSourceReplace
- *
- * Parameters:
- *	src	 - Text Source Object
- *	startPos - ends of text that will be removed
- *	endPos	 - ""
- *	text	 - new text to be inserted into buffer at startPos
- *
- * Description:
- *	Replaces a block of text with new text
- *
- * Returns:
- *	XawEditError or XawEditDone
- */
-int XawTextSourceReplace
-(
- Widget			w,
- XawTextPosition	start,
- XawTextPosition	end,
- XawTextBlock		*text
- );
-
-/*
- * Function:
- *	XawTextSourceScan
- *
- * Parameters:
- *	w	 - TextSrc Object
- *	position - position to start scanning
- *	type	 - type of thing to scan for
- *	dir	 - direction to scan
- *	count	 - which occurance if this thing to search for
- *	include	 - whether or not to include the character found in
- *		   the position that is returned. 
- *
- * Description:
- *	Scans the text source for the number and type of item specified.
- *
- * Returns:
- *	The position of the text
- */
-XawTextPosition XawTextSourceScan
-(
- Widget			w,
- XawTextPosition	position,
-#if NeedWidePrototypes
- int			type,
- int			dir,
- int			count,
- int			include
-#else
- XawTextScanType	type,
- XawTextScanDirection	dir,
- int			count,
- Boolean		include
-#endif
- );
-
-/*
- * Function:
- *	XawTextSourceSearch
- *
- * Parameters:
- *	w	 - TextSource Object
- *	position - position to start scanning
- *	dir	 - direction to search
- *	text	 - the text block to search for
- *
- * Description:
- *	Searchs the text source for the text block passed.
- *
- * Returns:
- *	The position of the text we are searching for or XawTextSearchError
- */
-XawTextPosition XawTextSourceSearch
-(
- Widget			w,
- XawTextPosition	position,
-#if NeedWidePrototypes
- int			dir,
-#else
- XawTextScanDirection	dir,
-#endif
- XawTextBlock		*text
- );
-
-/*
- * Function:
- *	XawTextSourceConvertSelection
- *
- * Parameters:
- *	w	  - TextSrc object
- *	selection - current selection atom
- *	target	  - current target atom
- *	type	  - type to conver the selection to
- *	value	  - return value that has been converted
- *	length	  - ""
- *	format	  - format of the returned value
- *
- * Returns:
- *	True if the selection has been converted
- */
-Boolean XawTextSourceConvertSelection
-(
- Widget			w,
- Atom			*selection,
- Atom			*target,
- Atom			*type,
- XtPointer		*value_return,
- unsigned long		*length_return,
- int			*format_return
- );
-
-/*
- * Function:
- *	XawTextSourceSetSelection
- *
- * Parameters:
- *	w	  - TextSrc object
- *	left	  - bounds of the selection
- *	right	  - ""
- *	selection - selection atom
- *
- * Description:
- *	Allows special setting of the selection.
- */
-void XawTextSourceSetSelection
-(
- Widget			w,
- XawTextPosition	start,
- XawTextPosition	end,
- Atom			selection
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawTextSrc_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawTextSrc_h

+#define _XawTextSrc_h

+

+#include <X11/Xaw/Text.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ callback	     Callback		Callback	NULL

+ editType	     EditType		XawTextEditType	XawtextRead

+ enableUndo	     Undo		Boolean		False

+ sourceChanged	     Changed		Boolean		False

+

+*/

+ 

+/* Class record constants */

+extern WidgetClass textSrcObjectClass;

+

+typedef struct _TextSrcClassRec *TextSrcObjectClass;

+typedef struct _TextSrcRec      *TextSrcObject;

+

+typedef enum {

+    XawstPositions,

+    XawstWhiteSpace,

+    XawstEOL,

+    XawstParagraph,

+    XawstAll,

+    XawstAlphaNumeric

+  } XawTextScanType;

+

+typedef enum {

+    Normal,

+    Selected

+} highlightType;

+

+typedef enum {

+    XawsmTextSelect,

+    XawsmTextExtend

+} XawTextSelectionMode;

+

+typedef enum {

+    XawactionStart,

+    XawactionAdjust,

+    XawactionEnd

+} XawTextSelectionAction;

+

+#define XawTextReadError -1

+#define XawTextScanError -1

+

+#ifndef OLDXAW

+#define XtNenableUndo		"enableUndo"

+#define XtCUndo			"Undo"

+

+#define XtNsourceChanged	"sourceChanged"

+#define XtCChanged		"Changed"

+

+#define XtNpropertyCallback	"propertyCallback"

+#endif

+

+/*

+ * Public Functions

+ */

+_XFUNCPROTOBEGIN

+

+/*

+ * Function:

+ *	XawTextSourceRead

+ *

+ * Parameters:

+ *	w      - TextSrc Object

+ *	pos    - position of the text to retreive

+ *	text   - text block that will contain returned text

+ *	length - maximum number of characters to read

+ *

+ * Description:

+ *	This function reads the source.

+ *

+ * Returns:

+ *	The number of characters read into the buffer

+ */

+XawTextPosition XawTextSourceRead

+(

+ Widget			w,

+ XawTextPosition	pos,

+ XawTextBlock		*text_return,

+ int			length

+ );

+

+/*

+ * Function:

+ *	XawTextSourceReplace

+ *

+ * Parameters:

+ *	src	 - Text Source Object

+ *	startPos - ends of text that will be removed

+ *	endPos	 - ""

+ *	text	 - new text to be inserted into buffer at startPos

+ *

+ * Description:

+ *	Replaces a block of text with new text

+ *

+ * Returns:

+ *	XawEditError or XawEditDone

+ */

+int XawTextSourceReplace

+(

+ Widget			w,

+ XawTextPosition	start,

+ XawTextPosition	end,

+ XawTextBlock		*text

+ );

+

+/*

+ * Function:

+ *	XawTextSourceScan

+ *

+ * Parameters:

+ *	w	 - TextSrc Object

+ *	position - position to start scanning

+ *	type	 - type of thing to scan for

+ *	dir	 - direction to scan

+ *	count	 - which occurance if this thing to search for

+ *	include	 - whether or not to include the character found in

+ *		   the position that is returned. 

+ *

+ * Description:

+ *	Scans the text source for the number and type of item specified.

+ *

+ * Returns:

+ *	The position of the text

+ */

+XawTextPosition XawTextSourceScan

+(

+ Widget			w,

+ XawTextPosition	position,

+#if NeedWidePrototypes

+ int			type,

+ int			dir,

+ int			count,

+ int			include

+#else

+ XawTextScanType	type,

+ XawTextScanDirection	dir,

+ int			count,

+ Boolean		include

+#endif

+ );

+

+/*

+ * Function:

+ *	XawTextSourceSearch

+ *

+ * Parameters:

+ *	w	 - TextSource Object

+ *	position - position to start scanning

+ *	dir	 - direction to search

+ *	text	 - the text block to search for

+ *

+ * Description:

+ *	Searchs the text source for the text block passed.

+ *

+ * Returns:

+ *	The position of the text we are searching for or XawTextSearchError

+ */

+XawTextPosition XawTextSourceSearch

+(

+ Widget			w,

+ XawTextPosition	position,

+#if NeedWidePrototypes

+ int			dir,

+#else

+ XawTextScanDirection	dir,

+#endif

+ XawTextBlock		*text

+ );

+

+/*

+ * Function:

+ *	XawTextSourceConvertSelection

+ *

+ * Parameters:

+ *	w	  - TextSrc object

+ *	selection - current selection atom

+ *	target	  - current target atom

+ *	type	  - type to conver the selection to

+ *	value	  - return value that has been converted

+ *	length	  - ""

+ *	format	  - format of the returned value

+ *

+ * Returns:

+ *	True if the selection has been converted

+ */

+Boolean XawTextSourceConvertSelection

+(

+ Widget			w,

+ Atom			*selection,

+ Atom			*target,

+ Atom			*type,

+ XtPointer		*value_return,

+ unsigned long		*length_return,

+ int			*format_return

+ );

+

+/*

+ * Function:

+ *	XawTextSourceSetSelection

+ *

+ * Parameters:

+ *	w	  - TextSrc object

+ *	left	  - bounds of the selection

+ *	right	  - ""

+ *	selection - selection atom

+ *

+ * Description:

+ *	Allows special setting of the selection.

+ */

+void XawTextSourceSetSelection

+(

+ Widget			w,

+ XawTextPosition	start,

+ XawTextPosition	end,

+ Atom			selection

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawTextSrc_h */

diff --git a/X11/Xaw/TextSrcP.h b/X11/Xaw/TextSrcP.h
index e26557b90..c338bc02c 100644
--- a/X11/Xaw/TextSrcP.h
+++ b/X11/Xaw/TextSrcP.h
@@ -1,264 +1,258 @@
-/*
-* $Xorg: TextSrcP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $
-*/
-
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.14 2001/12/14 19:54:45 dawes Exp $ */
-
-#ifndef _XawTextSrcP_h
-#define _XawTextSrcP_h
-
-/*
- * TextSrc Object Private Data
- */
-#include <X11/Xfuncproto.h>
-
-#include <X11/Xaw/TextSrc.h>
-#include <X11/Xaw/TextP.h>	/* This source works with the Text widget */
-
-_XFUNCPROTOBEGIN
-
-#ifndef OLDXAW
-struct _XawTextAnchor {
-    XawTextPosition position;
-    XawTextEntity *entities, *cache;
-};
-
-#define	XAW_TENTF_HIDE		0x0001
-#define XAW_TENTF_READ		0x0002
-#define XAW_TENTF_REPLACE	0x0004
-struct _XawTextEntity {
-    short type;
-    short flags;
-    XawTextEntity *next;
-    XtPointer data;
-    XawTextPosition offset;	/* from the anchor */
-    Cardinal length;
-    XrmQuark property;
-};
-#endif
-
-#if 0	/* no longer used */
-/* New fields for the TextSrc object class */
-typedef struct {
-  XtPointer		next_extension;
-  XrmQuark		record_type;
-  long			version;
-  Cardinal		record_size;
-  int			(*Input)();
-} TextSrcExtRec, *TextSrcExt;
-#endif
-
-typedef XawTextPosition (*_XawSrcReadProc)
-     (Widget, XawTextPosition, XawTextBlock*, int);
-
-typedef int (*_XawSrcReplaceProc)
-     (Widget, XawTextPosition, XawTextPosition, XawTextBlock*);
-
-typedef XawTextPosition (*_XawSrcScanProc)
-     (Widget, XawTextPosition, XawTextScanType, XawTextScanDirection,
-      int, Bool);
-
-typedef XawTextPosition (*_XawSrcSearchProc)
-     (Widget, XawTextPosition, XawTextScanDirection, XawTextBlock*);
-
-typedef void (*_XawSrcSetSelectionProc)
-     (Widget, XawTextPosition, XawTextPosition, Atom);
-
-typedef Boolean (*_XawSrcConvertSelectionProc)
-     (Widget, Atom*, Atom*, Atom*, XtPointer*, unsigned long*, int*);
-
-typedef struct _TextSrcClassPart {
-    _XawSrcReadProc Read;
-    _XawSrcReplaceProc Replace;
-    _XawSrcScanProc Scan;
-    _XawSrcSearchProc Search;
-    _XawSrcSetSelectionProc SetSelection;
-    _XawSrcConvertSelectionProc ConvertSelection;
-#ifndef OLDXAW
-    XtPointer extension;
-#endif
-} TextSrcClassPart;
-
-/* Full class record */
-typedef struct _TextSrcClassRec {
-    ObjectClassPart     object_class;
-    TextSrcClassPart	textSrc_class;
-} TextSrcClassRec;
-
-extern TextSrcClassRec textSrcClassRec;
-
-#ifndef OLDXAW
-typedef struct _XawTextUndo XawTextUndo;
-#endif
-
-/* New fields for the TextSrc object */
-typedef struct {
-    /* resources */
-    XawTextEditType	edit_mode;
-    XrmQuark text_format;		/* 2 formats: FMT8BIT for Ascii
-					   FMTWIDE for ISO 10646 */
-#ifndef OLDXAW
-    XtCallbackList callback;		/* A callback list to call when the
-					   source is changed */
-    Boolean changed;
-    Boolean enable_undo;
-
-    /* private state */
-    Boolean undo_state;			/* to protect undo manipulation */
-    XawTextUndo *undo;
-    WidgetList text;			/* TextWidget's using this source */
-    Cardinal num_text;
-    XtCallbackList property_callback;
-    XawTextAnchor **anchors;
-    int num_anchors;
-    XtPointer pad[1];	/* for future use and keep binary compatability */
-#endif
-} TextSrcPart;
-
-/* Full instance record */
-typedef struct _TextSrcRec {
-    ObjectPart	object;
-    TextSrcPart	textSrc;
-} TextSrcRec;
-
-/*
- * Semiprivate declarations of functions used in other modules
- */
-char* _XawTextWCToMB
-(
- Display	*display,
- wchar_t	*wstr,
- int		*len_in_out
- );
-
-wchar_t* _XawTextMBToWC
-(
- Display	*display,
- char		*str,
- int		*len_in_out
- );
-
-#ifndef OLDXAW
-XawTextAnchor *XawTextSourceAddAnchor
-(
- Widget			source,
- XawTextPosition	position
- );
-
-XawTextAnchor *XawTextSourceFindAnchor
-(
- Widget			source,
- XawTextPosition	position
- );
-
-XawTextAnchor *XawTextSourceNextAnchor
-(
- Widget			 source,
- XawTextAnchor		*anchor
- );
-
-XawTextAnchor *XawTextSourcePrevAnchor
-(
- Widget			 source,
- XawTextAnchor		*anchor
- );
-
-XawTextAnchor *XawTextSourceRemoveAnchor
-(
- Widget			 source,
- XawTextAnchor		*anchor
- );
-
-Bool XawTextSourceAnchorAndEntity
-(
- Widget			  w,
- XawTextPosition	  position,
- XawTextAnchor		**anchor_return,
- XawTextEntity		**entity_return
- );
-
-XawTextEntity *XawTextSourceAddEntity
-(
- Widget			source,
- int			type,
- int			flags,
- XtPointer		data,
- XawTextPosition	position,
- Cardinal		length,
- XrmQuark		property
- );
-
-void XawTextSourceClearEntities
-(
- Widget			w,
- XawTextPosition	left,
- XawTextPosition	right
- );
-#endif
-
-#if 0	/* no longer used */
-typedef XawTextPosition (*_XawTextPositionFunc)();
-#endif
-
-#define XtInheritInput			((_XawTextPositionFunc)_XtInherit)
-#define XtInheritRead			((_XawSrcReadProc)_XtInherit)
-#define XtInheritReplace		((_XawSrcReplaceProc)_XtInherit)
-#define XtInheritScan			((_XawSrcScanProc)_XtInherit)
-#define XtInheritSearch			((_XawSrcSearchProc)_XtInherit)
-#define XtInheritSetSelection		((_XawSrcSetSelectionProc)_XtInherit)
-#define XtInheritConvertSelection     ((_XawSrcConvertSelectionProc)_XtInherit)
-#if 0
-#define XtTextSrcExtVersion	      1
-#define XtTextSrcExtTypeString        "XT_TEXTSRC_EXT"
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XawTextSrcP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawTextSrcP_h

+#define _XawTextSrcP_h

+

+/*

+ * TextSrc Object Private Data

+ */

+#include <X11/Xfuncproto.h>

+

+#include <X11/Xaw/TextSrc.h>

+#include <X11/Xaw/TextP.h>	/* This source works with the Text widget */

+

+_XFUNCPROTOBEGIN

+

+#ifndef OLDXAW

+struct _XawTextAnchor {

+    XawTextPosition position;

+    XawTextEntity *entities, *cache;

+};

+

+#define	XAW_TENTF_HIDE		0x0001

+#define XAW_TENTF_READ		0x0002

+#define XAW_TENTF_REPLACE	0x0004

+struct _XawTextEntity {

+    short type;

+    short flags;

+    XawTextEntity *next;

+    XtPointer data;

+    XawTextPosition offset;	/* from the anchor */

+    Cardinal length;

+    XrmQuark property;

+};

+#endif

+

+#if 0	/* no longer used */

+/* New fields for the TextSrc object class */

+typedef struct {

+  XtPointer		next_extension;

+  XrmQuark		record_type;

+  long			version;

+  Cardinal		record_size;

+  int			(*Input)();

+} TextSrcExtRec, *TextSrcExt;

+#endif

+

+typedef XawTextPosition (*_XawSrcReadProc)

+     (Widget, XawTextPosition, XawTextBlock*, int);

+

+typedef int (*_XawSrcReplaceProc)

+     (Widget, XawTextPosition, XawTextPosition, XawTextBlock*);

+

+typedef XawTextPosition (*_XawSrcScanProc)

+     (Widget, XawTextPosition, XawTextScanType, XawTextScanDirection,

+      int, Bool);

+

+typedef XawTextPosition (*_XawSrcSearchProc)

+     (Widget, XawTextPosition, XawTextScanDirection, XawTextBlock*);

+

+typedef void (*_XawSrcSetSelectionProc)

+     (Widget, XawTextPosition, XawTextPosition, Atom);

+

+typedef Boolean (*_XawSrcConvertSelectionProc)

+     (Widget, Atom*, Atom*, Atom*, XtPointer*, unsigned long*, int*);

+

+typedef struct _TextSrcClassPart {

+    _XawSrcReadProc Read;

+    _XawSrcReplaceProc Replace;

+    _XawSrcScanProc Scan;

+    _XawSrcSearchProc Search;

+    _XawSrcSetSelectionProc SetSelection;

+    _XawSrcConvertSelectionProc ConvertSelection;

+#ifndef OLDXAW

+    XtPointer extension;

+#endif

+} TextSrcClassPart;

+

+/* Full class record */

+typedef struct _TextSrcClassRec {

+    ObjectClassPart     object_class;

+    TextSrcClassPart	textSrc_class;

+} TextSrcClassRec;

+

+extern TextSrcClassRec textSrcClassRec;

+

+#ifndef OLDXAW

+typedef struct _XawTextUndo XawTextUndo;

+#endif

+

+/* New fields for the TextSrc object */

+typedef struct {

+    /* resources */

+    XawTextEditType	edit_mode;

+    XrmQuark text_format;		/* 2 formats: FMT8BIT for Ascii

+					   FMTWIDE for ISO 10646 */

+#ifndef OLDXAW

+    XtCallbackList callback;		/* A callback list to call when the

+					   source is changed */

+    Boolean changed;

+    Boolean enable_undo;

+

+    /* private state */

+    Boolean undo_state;			/* to protect undo manipulation */

+    XawTextUndo *undo;

+    WidgetList text;			/* TextWidget's using this source */

+    Cardinal num_text;

+    XtCallbackList property_callback;

+    XawTextAnchor **anchors;

+    int num_anchors;

+    XtPointer pad[1];	/* for future use and keep binary compatability */

+#endif

+} TextSrcPart;

+

+/* Full instance record */

+typedef struct _TextSrcRec {

+    ObjectPart	object;

+    TextSrcPart	textSrc;

+} TextSrcRec;

+

+/*

+ * Semiprivate declarations of functions used in other modules

+ */

+char* _XawTextWCToMB

+(

+ Display	*display,

+ wchar_t	*wstr,

+ int		*len_in_out

+ );

+

+wchar_t* _XawTextMBToWC

+(

+ Display	*display,

+ char		*str,

+ int		*len_in_out

+ );

+

+#ifndef OLDXAW

+XawTextAnchor *XawTextSourceAddAnchor

+(

+ Widget			source,

+ XawTextPosition	position

+ );

+

+XawTextAnchor *XawTextSourceFindAnchor

+(

+ Widget			source,

+ XawTextPosition	position

+ );

+

+XawTextAnchor *XawTextSourceNextAnchor

+(

+ Widget			 source,

+ XawTextAnchor		*anchor

+ );

+

+XawTextAnchor *XawTextSourcePrevAnchor

+(

+ Widget			 source,

+ XawTextAnchor		*anchor

+ );

+

+XawTextAnchor *XawTextSourceRemoveAnchor

+(

+ Widget			 source,

+ XawTextAnchor		*anchor

+ );

+

+Bool XawTextSourceAnchorAndEntity

+(

+ Widget			  w,

+ XawTextPosition	  position,

+ XawTextAnchor		**anchor_return,

+ XawTextEntity		**entity_return

+ );

+

+XawTextEntity *XawTextSourceAddEntity

+(

+ Widget			source,

+ int			type,

+ int			flags,

+ XtPointer		data,

+ XawTextPosition	position,

+ Cardinal		length,

+ XrmQuark		property

+ );

+

+void XawTextSourceClearEntities

+(

+ Widget			w,

+ XawTextPosition	left,

+ XawTextPosition	right

+ );

+#endif

+

+#if 0	/* no longer used */

+typedef XawTextPosition (*_XawTextPositionFunc)();

+#endif

+

+#define XtInheritInput			((_XawTextPositionFunc)_XtInherit)

+#define XtInheritRead			((_XawSrcReadProc)_XtInherit)

+#define XtInheritReplace		((_XawSrcReplaceProc)_XtInherit)

+#define XtInheritScan			((_XawSrcScanProc)_XtInherit)

+#define XtInheritSearch			((_XawSrcSearchProc)_XtInherit)

+#define XtInheritSetSelection		((_XawSrcSetSelectionProc)_XtInherit)

+#define XtInheritConvertSelection     ((_XawSrcConvertSelectionProc)_XtInherit)

+#if 0

+#define XtTextSrcExtVersion	      1

+#define XtTextSrcExtTypeString        "XT_TEXTSRC_EXT"

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XawTextSrcP_h */

diff --git a/X11/Xaw/Tip.h b/X11/Xaw/Tip.h
index f5b8d9be5..d3c1da5ad 100644
--- a/X11/Xaw/Tip.h
+++ b/X11/Xaw/Tip.h
@@ -1,120 +1,118 @@
-/*
- * Copyright (c) 1999 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software 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 XFREE86 PROJECT 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 XFree86 Project 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
- * XFree86 Project.
- *
- * Author: Paulo César Pereira de Andrade
- */
-
-/* $XFree86$ */
-
-#ifndef _XawTip_h
-#define _XawTip_h
-
-/*
- * Tip Widget
- */
-
-#include <X11/Xaw/Simple.h>
-
-/* Resources:
-
-  Name		    Class		RepType		Default Value
-  ----		    -----		-------		-------------
-  background	    Background		Pixel		XtDefaultBackground
-  backgroundPixmap  BackgroundPixmap	Pixmap		XtUnspecifiedPixmap
-  border	    BorderColor		Pixel		XtDefaultForeground
-  borderWidth	    BorderWidth		Dimension	1
-  bottomMargin	    VerticalMargins	Dimension	2
-  destroyCallback   Callback		XtCallbackList	NULL
-  displayList	    DisplayList		XawDisplayList*	NULL
-  font		    Font		XFontStruct*	XtDefaultFont
-  foreground	    Foreground		Pixel		XtDefaultForeground
-  height	    Height		Dimension	text height
-  leftMargin	    HorizontalMargins	Dimension	6
-  rightMargin	    HorizontalMargins	Dimension	6
-  timeout	    Timeout		Int		500
-  topMargin	    VerticalMargins	Dimension	2
-  width		    Width		Dimension	text width
-  x		    Position		Position	0
-  y		    Position		Position	0
-
-*/
-
-typedef struct _TipClassRec *TipWidgetClass;
-typedef struct _TipRec *TipWidget;
-
-extern WidgetClass tipWidgetClass;
-
-#define XtNbottomMargin		"bottomMargin"
-#define XawNdisplayList		"displayList"
-#define XtNencoding		"encoding"
-#define XtNleftMargin		"leftMargin"
-#define XtNrightMargin		"rightMargin"
-#define XtNtimeout		"timeout"
-#define XtNtopMargin		"topMargin"
-#define XtNtip			"tip"
-
-#define XawCDisplayList		"DisplayList"
-#define XtCHorizontalMargins	"HorizontalMargins"
-#define XtCTimeout		"Timeout"
-#define XtCVerticalMargins	"VerticalMargins"
-#define XtCTip			"Tip"
-
-#define XawRDisplayList		"XawDisplayList"
-
-/*
- * Public Functions
- */
-/*
- * Function:
- *	XawTipEnable
- *
- * Parameters:
- *	w - widget
- *
- * Description:
- *	Enables the tip event handler for this widget.
- */
-void XawTipEnable
-(
- Widget		w
- );
-
-/*
- * Function:
- *	XawTipEnable
- *
- * Parameters:
- *	w - widget
- *
- * Description:
- *	Disables the tip event handler for this widget.
- */
-void XawTipDisable
-(
- Widget		w
- );
-
-#endif /* _XawTip_h */
+/*

+ * Copyright (c) 1999 by The XFree86 Project, Inc.

+ *

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

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software 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 XFREE86 PROJECT 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 XFree86 Project 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

+ * XFree86 Project.

+ *

+ * Author: Paulo César Pereira de Andrade

+ */

+

+#ifndef _XawTip_h

+#define _XawTip_h

+

+/*

+ * Tip Widget

+ */

+

+#include <X11/Xaw/Simple.h>

+

+/* Resources:

+

+  Name		    Class		RepType		Default Value

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

+  background	    Background		Pixel		XtDefaultBackground

+  backgroundPixmap  BackgroundPixmap	Pixmap		XtUnspecifiedPixmap

+  border	    BorderColor		Pixel		XtDefaultForeground

+  borderWidth	    BorderWidth		Dimension	1

+  bottomMargin	    VerticalMargins	Dimension	2

+  destroyCallback   Callback		XtCallbackList	NULL

+  displayList	    DisplayList		XawDisplayList*	NULL

+  font		    Font		XFontStruct*	XtDefaultFont

+  foreground	    Foreground		Pixel		XtDefaultForeground

+  height	    Height		Dimension	text height

+  leftMargin	    HorizontalMargins	Dimension	6

+  rightMargin	    HorizontalMargins	Dimension	6

+  timeout	    Timeout		Int		500

+  topMargin	    VerticalMargins	Dimension	2

+  width		    Width		Dimension	text width

+  x		    Position		Position	0

+  y		    Position		Position	0

+

+*/

+

+typedef struct _TipClassRec *TipWidgetClass;

+typedef struct _TipRec *TipWidget;

+

+extern WidgetClass tipWidgetClass;

+

+#define XtNbottomMargin		"bottomMargin"

+#define XawNdisplayList		"displayList"

+#define XtNencoding		"encoding"

+#define XtNleftMargin		"leftMargin"

+#define XtNrightMargin		"rightMargin"

+#define XtNtimeout		"timeout"

+#define XtNtopMargin		"topMargin"

+#define XtNtip			"tip"

+

+#define XawCDisplayList		"DisplayList"

+#define XtCHorizontalMargins	"HorizontalMargins"

+#define XtCTimeout		"Timeout"

+#define XtCVerticalMargins	"VerticalMargins"

+#define XtCTip			"Tip"

+

+#define XawRDisplayList		"XawDisplayList"

+

+/*

+ * Public Functions

+ */

+/*

+ * Function:

+ *	XawTipEnable

+ *

+ * Parameters:

+ *	w - widget

+ *

+ * Description:

+ *	Enables the tip event handler for this widget.

+ */

+void XawTipEnable

+(

+ Widget		w

+ );

+

+/*

+ * Function:

+ *	XawTipEnable

+ *

+ * Parameters:

+ *	w - widget

+ *

+ * Description:

+ *	Disables the tip event handler for this widget.

+ */

+void XawTipDisable

+(

+ Widget		w

+ );

+

+#endif /* _XawTip_h */

diff --git a/X11/Xaw/TipP.h b/X11/Xaw/TipP.h
index 2b9e12619..f72f20a97 100644
--- a/X11/Xaw/TipP.h
+++ b/X11/Xaw/TipP.h
@@ -1,77 +1,75 @@
-/*
- * Copyright (c) 1999 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software 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 XFREE86 PROJECT 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 XFree86 Project 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
- * XFree86 Project.
- *
- * Author: Paulo César Pereira de Andrade
- */
-
-/* $XFree86$ */
-
-#ifndef _XawTipP_h
-#define _XawTipP_h
-
-#include <X11/Xaw/Tip.h>
-#include <X11/CoreP.h>
-#include <X11/Xaw/XawInit.h>
-
-typedef struct {
-    XtPointer extension;
-} TipClassPart;
-
-typedef struct _TipClassRec {
-    CoreClassPart core_class;
-    TipClassPart tip_class;
-} TipClassRec;
-
-extern TipClassRec tipClassRec;
-
-typedef struct _TipPart {
-    /* resources */
-    Pixel foreground;
-    XFontStruct	*font;
-    XFontSet fontset;
-    Dimension top_margin;
-    Dimension bottom_margin;
-    Dimension left_margin;
-    Dimension right_margin;
-    int backing_store;
-    int timeout;
-    XawDisplayList *display_list;
-
-    /* private */
-    GC gc;
-    XtIntervalId timer;
-    String label;
-    Boolean international;
-    unsigned char encoding;
-    XtPointer pad[4];
-} TipPart;
-
-typedef struct _TipRec {
-    CorePart core;
-    TipPart tip;
-} TipRec;
-
-#endif /* _XawTipP_h */
+/*

+ * Copyright (c) 1999 by The XFree86 Project, Inc.

+ *

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

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software 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 XFREE86 PROJECT 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 XFree86 Project 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

+ * XFree86 Project.

+ *

+ * Author: Paulo César Pereira de Andrade

+ */

+

+#ifndef _XawTipP_h

+#define _XawTipP_h

+

+#include <X11/Xaw/Tip.h>

+#include <X11/CoreP.h>

+#include <X11/Xaw/XawInit.h>

+

+typedef struct {

+    XtPointer extension;

+} TipClassPart;

+

+typedef struct _TipClassRec {

+    CoreClassPart core_class;

+    TipClassPart tip_class;

+} TipClassRec;

+

+extern TipClassRec tipClassRec;

+

+typedef struct _TipPart {

+    /* resources */

+    Pixel foreground;

+    XFontStruct	*font;

+    XFontSet fontset;

+    Dimension top_margin;

+    Dimension bottom_margin;

+    Dimension left_margin;

+    Dimension right_margin;

+    int backing_store;

+    int timeout;

+    XawDisplayList *display_list;

+

+    /* private */

+    GC gc;

+    XtIntervalId timer;

+    String label;

+    Boolean international;

+    unsigned char encoding;

+    XtPointer pad[4];

+} TipPart;

+

+typedef struct _TipRec {

+    CorePart core;

+    TipPart tip;

+} TipRec;

+

+#endif /* _XawTipP_h */

diff --git a/X11/Xaw/Toggle.h b/X11/Xaw/Toggle.h
index 4858961f2..5a2ce041b 100644
--- a/X11/Xaw/Toggle.h
+++ b/X11/Xaw/Toggle.h
@@ -1,181 +1,179 @@
-/*
- * $Xorg: Toggle.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $
- *
-Copyright 1989, 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/Xaw/Toggle.h,v 1.5 2001/01/17 19:42:35 dawes Exp $ */
-
-/*
- * ToggleP.h - Private definitions for Toggle widget
- *
- * Author: Chris D. Peterson
- *         MIT X Consortium
- *         kit@expo.lcs.mit.edu
- *  
- * Date:   January 12, 1989
- */
-
-#ifndef _XawToggle_h
-#define _XawToggle_h
-
-#include <X11/Xaw/Command.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- radioGroup          RadioGroup         Widget          NULL              +
- radioData           RadioData          Pointer         (XPointer) Widget  ++
- state               State              Boolean         Off
-
- background	     Background		Pixel		XtDefaultBackground
- bitmap		     Pixmap		Pixmap		None
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- callback	     Callback		Pointer		NULL
- cursor		     Cursor		Cursor		None
- destroyCallback     Callback		Pointer		NULL
- displayList	     DisplayList	XawDisplayList*	NULL
- font		     Font		XFontStructx*	XtDefaultFont
- foreground	     Foreground		Pixel		XtDefaultForeground
- height		     Height		Dimension	text height
- highlightThickness  Thickness		Dimension	2
- insensitiveBorder   Insensitive	Pixmap		Gray
- internalHeight	     Height		Dimension	2
- internalWidth	     Width		Dimension	4
- justify	     Justify		XtJustify	XtJustifyCenter
- label		     Label		String		NULL
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- resize		     Resize		Boolean		True
- sensitive	     Sensitive		Boolean		True
- width		     Width		Dimension	text width
- x		     Position		Position	0
- y		     Position		Position	0
-
-+ To use the toggle as a radio toggle button, set this resource to point to
-  any other widget in the radio group.
-
-++ This is the data returned from a call to XtToggleGetCurrent, by default
-   this is set to the name of toggle widget.
-
-*/
-
-/*
- * These should be in StringDefs.h but aren't so we will define
- * them here if they are needed
- */
-#define XtCWidget "Widget"
-#define XtCState "State"
-#define XtCRadioGroup "RadioGroup"
-#define XtCRadioData "RadioData"
-
-#ifndef _XtStringDefs_h_
-#define XtRWidget "Widget"
-#endif
-
-#define XtNstate "state"
-#define XtNradioGroup "radioGroup"
-#define XtNradioData "radioData"
-
-extern WidgetClass               toggleWidgetClass;
-
-typedef struct _ToggleClassRec   *ToggleWidgetClass;
-typedef struct _ToggleRec        *ToggleWidget;
-
-/*
- * Public Functions
- */
-
-_XFUNCPROTOBEGIN
-   
-/*
- * Function:
- *	XawToggleChangeRadioGroup
- *
- * Parameters:
- *	w	    - toggle widget to change lists
- *	radio_group - any widget in the new list
- *
- * Description:
- *	Allows a toggle widget to change radio lists.
- */
-void XawToggleChangeRadioGroup
-(
- Widget		w,
- Widget		radio_group
- );
-
-/*
- * Function:
- *	XawToggleGetCurrent
- *
- * Parameters:
- *	radio_group - any toggle widget in the toggle list
- *
- * Description:
- *	  Returns the RadioData associated with the toggle
- *                   widget that is currently active in a toggle list.
- * Returns:
- *	The XtNradioData associated with the toggle widget
- */
-
-XtPointer XawToggleGetCurrent
-(
- Widget		radio_group
- );
-
-/*
- * Function:
- *	XawToggleSetCurrent
- *
- * Parameters:
- *	radio_group - any toggle widget in the toggle list
- *	radio_data - radio data of the toggle widget to set
- *
- * Description:
- *	Sets the Toggle widget associated with the radio_data specified.
- */
-void XawToggleSetCurrent
-(
- Widget		radio_group,
- XtPointer	radio_data
- );
-
-/*
- * Function:
- *	XawToggleUnsetCurrent
- *
- * Parameters:
- *	radio_group - any toggle widget in the toggle list
- *
- * Description:
- *	Unsets all Toggles in the radio_group specified.
- */
-void XawToggleUnsetCurrent
-(
- Widget		radio_group
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawToggle_h */
+/*

+ *

+Copyright 1989, 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.

+ */

+

+/*

+ * ToggleP.h - Private definitions for Toggle widget

+ *

+ * Author: Chris D. Peterson

+ *         MIT X Consortium

+ *         kit@expo.lcs.mit.edu

+ *  

+ * Date:   January 12, 1989

+ */

+

+#ifndef _XawToggle_h

+#define _XawToggle_h

+

+#include <X11/Xaw/Command.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ radioGroup          RadioGroup         Widget          NULL              +

+ radioData           RadioData          Pointer         (XPointer) Widget  ++

+ state               State              Boolean         Off

+

+ background	     Background		Pixel		XtDefaultBackground

+ bitmap		     Pixmap		Pixmap		None

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ callback	     Callback		Pointer		NULL

+ cursor		     Cursor		Cursor		None

+ destroyCallback     Callback		Pointer		NULL

+ displayList	     DisplayList	XawDisplayList*	NULL

+ font		     Font		XFontStructx*	XtDefaultFont

+ foreground	     Foreground		Pixel		XtDefaultForeground

+ height		     Height		Dimension	text height

+ highlightThickness  Thickness		Dimension	2

+ insensitiveBorder   Insensitive	Pixmap		Gray

+ internalHeight	     Height		Dimension	2

+ internalWidth	     Width		Dimension	4

+ justify	     Justify		XtJustify	XtJustifyCenter

+ label		     Label		String		NULL

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ resize		     Resize		Boolean		True

+ sensitive	     Sensitive		Boolean		True

+ width		     Width		Dimension	text width

+ x		     Position		Position	0

+ y		     Position		Position	0

+

++ To use the toggle as a radio toggle button, set this resource to point to

+  any other widget in the radio group.

+

+++ This is the data returned from a call to XtToggleGetCurrent, by default

+   this is set to the name of toggle widget.

+

+*/

+

+/*

+ * These should be in StringDefs.h but aren't so we will define

+ * them here if they are needed

+ */

+#define XtCWidget "Widget"

+#define XtCState "State"

+#define XtCRadioGroup "RadioGroup"

+#define XtCRadioData "RadioData"

+

+#ifndef _XtStringDefs_h_

+#define XtRWidget "Widget"

+#endif

+

+#define XtNstate "state"

+#define XtNradioGroup "radioGroup"

+#define XtNradioData "radioData"

+

+extern WidgetClass               toggleWidgetClass;

+

+typedef struct _ToggleClassRec   *ToggleWidgetClass;

+typedef struct _ToggleRec        *ToggleWidget;

+

+/*

+ * Public Functions

+ */

+

+_XFUNCPROTOBEGIN

+   

+/*

+ * Function:

+ *	XawToggleChangeRadioGroup

+ *

+ * Parameters:

+ *	w	    - toggle widget to change lists

+ *	radio_group - any widget in the new list

+ *

+ * Description:

+ *	Allows a toggle widget to change radio lists.

+ */

+void XawToggleChangeRadioGroup

+(

+ Widget		w,

+ Widget		radio_group

+ );

+

+/*

+ * Function:

+ *	XawToggleGetCurrent

+ *

+ * Parameters:

+ *	radio_group - any toggle widget in the toggle list

+ *

+ * Description:

+ *	  Returns the RadioData associated with the toggle

+ *                   widget that is currently active in a toggle list.

+ * Returns:

+ *	The XtNradioData associated with the toggle widget

+ */

+

+XtPointer XawToggleGetCurrent

+(

+ Widget		radio_group

+ );

+

+/*

+ * Function:

+ *	XawToggleSetCurrent

+ *

+ * Parameters:

+ *	radio_group - any toggle widget in the toggle list

+ *	radio_data - radio data of the toggle widget to set

+ *

+ * Description:

+ *	Sets the Toggle widget associated with the radio_data specified.

+ */

+void XawToggleSetCurrent

+(

+ Widget		radio_group,

+ XtPointer	radio_data

+ );

+

+/*

+ * Function:

+ *	XawToggleUnsetCurrent

+ *

+ * Parameters:

+ *	radio_group - any toggle widget in the toggle list

+ *

+ * Description:

+ *	Unsets all Toggles in the radio_group specified.

+ */

+void XawToggleUnsetCurrent

+(

+ Widget		radio_group

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawToggle_h */

diff --git a/X11/Xaw/ToggleP.h b/X11/Xaw/ToggleP.h
index c1477379d..af2b5dcb7 100644
--- a/X11/Xaw/ToggleP.h
+++ b/X11/Xaw/ToggleP.h
@@ -1,95 +1,92 @@
-/* $Xorg: ToggleP.h,v 1.4 2001/02/09 02:03:47 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/Xaw/ToggleP.h,v 1.7 2001/01/17 19:42:35 dawes Exp $ */
-
-/* 
- * Author: Chris D. Peterson
- *         MIT X Consortium
- *         kit@expo.lcs.mit.edu
- *  
- * Date:   January 12, 1989
- *
- */
-
-#ifndef _XawToggleP_h
-#define _XawToggleP_h
-
-#include <X11/Xaw/Toggle.h>
-#include <X11/Xaw/CommandP.h>
-
-/*
- * Toggle Widget Private Data
- */
-#define streq(a, b)	(strcmp((a), (b)) == 0)
-
-typedef struct _RadioGroup {
-    struct _RadioGroup *prev, *next; /* Pointers to other elements in group  */
-    Widget widget;		     /* Widget corrosponding to this element */
-} RadioGroup;
-
-/* New fields for the Toggle widget class */
-typedef struct _ToggleClass  {
-    XtActionProc Set;
-    XtActionProc Unset;
-    XtPointer extension;
-} ToggleClassPart;
-
-/* class record declaration */
-typedef struct _ToggleClassRec {
-    CoreClassPart	core_class;
-    SimpleClassPart	simple_class;
-    LabelClassPart	label_class;
-    CommandClassPart	command_class;
-    ToggleClassPart	toggle_class;
-} ToggleClassRec;
-
-extern ToggleClassRec toggleClassRec;
-
-/* New fields for the Toggle widget */
-typedef struct {
-    /* resources */
-    Widget widget;
-    XtPointer radio_data;
-
-    /* private */
-    RadioGroup *radio_group;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} TogglePart;
-
-/* Full widget declaration */
-typedef struct _ToggleRec {
-    CorePart	core;
-    SimplePart	simple;
-    LabelPart	label;
-    CommandPart	command;
-    TogglePart	toggle;
-} ToggleRec;
-
-#endif /* _XawToggleP_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.

+

+*/

+

+/* 

+ * Author: Chris D. Peterson

+ *         MIT X Consortium

+ *         kit@expo.lcs.mit.edu

+ *  

+ * Date:   January 12, 1989

+ *

+ */

+

+#ifndef _XawToggleP_h

+#define _XawToggleP_h

+

+#include <X11/Xaw/Toggle.h>

+#include <X11/Xaw/CommandP.h>

+

+/*

+ * Toggle Widget Private Data

+ */

+#define streq(a, b)	(strcmp((a), (b)) == 0)

+

+typedef struct _RadioGroup {

+    struct _RadioGroup *prev, *next; /* Pointers to other elements in group  */

+    Widget widget;		     /* Widget corrosponding to this element */

+} RadioGroup;

+

+/* New fields for the Toggle widget class */

+typedef struct _ToggleClass  {

+    XtActionProc Set;

+    XtActionProc Unset;

+    XtPointer extension;

+} ToggleClassPart;

+

+/* class record declaration */

+typedef struct _ToggleClassRec {

+    CoreClassPart	core_class;

+    SimpleClassPart	simple_class;

+    LabelClassPart	label_class;

+    CommandClassPart	command_class;

+    ToggleClassPart	toggle_class;

+} ToggleClassRec;

+

+extern ToggleClassRec toggleClassRec;

+

+/* New fields for the Toggle widget */

+typedef struct {

+    /* resources */

+    Widget widget;

+    XtPointer radio_data;

+

+    /* private */

+    RadioGroup *radio_group;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} TogglePart;

+

+/* Full widget declaration */

+typedef struct _ToggleRec {

+    CorePart	core;

+    SimplePart	simple;

+    LabelPart	label;

+    CommandPart	command;

+    TogglePart	toggle;

+} ToggleRec;

+

+#endif /* _XawToggleP_h */

diff --git a/X11/Xaw/Tree.h b/X11/Xaw/Tree.h
index ae0990aa5..63d0931ce 100644
--- a/X11/Xaw/Tree.h
+++ b/X11/Xaw/Tree.h
@@ -1,138 +1,135 @@
-/*
- * $Xorg: Tree.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $
- *
-
-Copyright 1990, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
- * Copyright 1989 Prentice Hall
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation.
- * 
- * Prentice Hall and the authors disclaim all warranties with regard
- * to this software, including all implied warranties of merchantability and
- * fitness.  In no event shall Prentice Hall or the authors be liable
- * for any special, indirect or cosequential 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.
- * 
- * Authors:  Jim Fulton, MIT X Consortium,
- *           based on a version by Douglas Young, Prentice Hall
- * 
- * This widget is based on the Tree widget described on pages 397-419 of
- * Douglas Young's book "The X Window System, Programming and Applications 
- * with Xt OSF/Motif Edition."  The layout code has been rewritten to use
- * additional blank space to make the structure of the graph easier to see
- * as well as to support vertical trees.
- */
-/* $XFree86: xc/lib/Xaw/Tree.h,v 1.6 2001/01/17 19:42:35 dawes Exp $ */
-
-
-#ifndef _XawTree_h
-#define _XawTree_h
-
-#include <X11/Xmu/Converters.h>
-
-/******************************************************************************
- * 
- * Tree Widget (subclass of ConstraintClass)
- * 
- ******************************************************************************
- * 
- * Parameters:
- * 
- *  Name                Class              Type            Default
- *  ----                -----              ----            -------
- * 
- *  autoReconfigure     AutoReconfigure    Boolean         FALSE
- *  background          Background         Pixel           XtDefaultBackground
- *  foreground          Foreground         Pixel           XtDefaultForeground
- *  gravity             Gravity            XtGravity       West
- *  hSpace              HSpace             Dimension       20
- *  lineWidth           LineWidth          Dimension       0
- *  vSpace              VSpace             Dimension       6
- * 
- * 
- * Constraint Resources attached to children:
- * 
- *  treeGC              TreeGC             GC              NULL
- *  treeParent          TreeParent         Widget          NULL
- * 
- * 
- *****************************************************************************/
-
-                                        /* new instance field names */
-#ifndef _XtStringDefs_h_
-#define XtNhSpace "hSpace"
-#define XtNvSpace "vSpace"
-#define XtCHSpace "HSpace"
-#define XtCVSpace "VSpace"
-#endif
-
-#define XtNautoReconfigure "autoReconfigure"
-#define XtNlineWidth "lineWidth"
-#define XtNtreeGC "treeGC"
-#define XtNtreeParent "treeParent"
-#define XtNgravity "gravity"
-
-                                        /* new class field names */
-#define XtCAutoReconfigure "AutoReconfigure"
-#define XtCLineWidth "LineWidth"
-#define XtCTreeGC "TreeGC"
-#define XtCTreeParent "TreeParent"
-#define XtCGravity "Gravity"
-
-#define XtRGC "GC"
-
-#ifndef OLDXAW
-#ifndef XawNdisplayList
-#define XawNdisplayList "displayList"
-#endif
- 
-#ifndef XawCDisplayList
-#define XawCDisplayList "DisplayList"
-#endif
-
-#ifndef XawRDisplayList
-#define XawRDisplayList "XawDisplayList"
-#endif
-#endif
-                                        /* external declarations */
-extern WidgetClass treeWidgetClass;
-
-typedef struct _TreeClassRec *TreeWidgetClass;
-typedef struct _TreeRec      *TreeWidget;
-
-_XFUNCPROTOBEGIN
-
-void XawTreeForceLayout
-(
- Widget		tree
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawTree_h */
+/*

+ *

+

+Copyright 1990, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+ * Copyright 1989 Prentice Hall

+ *

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose and without fee is hereby granted, provided that the above

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

+ * and this permission notice appear in supporting documentation.

+ * 

+ * Prentice Hall and the authors disclaim all warranties with regard

+ * to this software, including all implied warranties of merchantability and

+ * fitness.  In no event shall Prentice Hall or the authors be liable

+ * for any special, indirect or cosequential 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.

+ * 

+ * Authors:  Jim Fulton, MIT X Consortium,

+ *           based on a version by Douglas Young, Prentice Hall

+ * 

+ * This widget is based on the Tree widget described on pages 397-419 of

+ * Douglas Young's book "The X Window System, Programming and Applications 

+ * with Xt OSF/Motif Edition."  The layout code has been rewritten to use

+ * additional blank space to make the structure of the graph easier to see

+ * as well as to support vertical trees.

+ */

+

+#ifndef _XawTree_h

+#define _XawTree_h

+

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

+

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

+ * 

+ * Tree Widget (subclass of ConstraintClass)

+ * 

+ ******************************************************************************

+ * 

+ * Parameters:

+ * 

+ *  Name                Class              Type            Default

+ *  ----                -----              ----            -------

+ * 

+ *  autoReconfigure     AutoReconfigure    Boolean         FALSE

+ *  background          Background         Pixel           XtDefaultBackground

+ *  foreground          Foreground         Pixel           XtDefaultForeground

+ *  gravity             Gravity            XtGravity       West

+ *  hSpace              HSpace             Dimension       20

+ *  lineWidth           LineWidth          Dimension       0

+ *  vSpace              VSpace             Dimension       6

+ * 

+ * 

+ * Constraint Resources attached to children:

+ * 

+ *  treeGC              TreeGC             GC              NULL

+ *  treeParent          TreeParent         Widget          NULL

+ * 

+ * 

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

+

+                                        /* new instance field names */

+#ifndef _XtStringDefs_h_

+#define XtNhSpace "hSpace"

+#define XtNvSpace "vSpace"

+#define XtCHSpace "HSpace"

+#define XtCVSpace "VSpace"

+#endif

+

+#define XtNautoReconfigure "autoReconfigure"

+#define XtNlineWidth "lineWidth"

+#define XtNtreeGC "treeGC"

+#define XtNtreeParent "treeParent"

+#define XtNgravity "gravity"

+

+                                        /* new class field names */

+#define XtCAutoReconfigure "AutoReconfigure"

+#define XtCLineWidth "LineWidth"

+#define XtCTreeGC "TreeGC"

+#define XtCTreeParent "TreeParent"

+#define XtCGravity "Gravity"

+

+#define XtRGC "GC"

+

+#ifndef OLDXAW

+#ifndef XawNdisplayList

+#define XawNdisplayList "displayList"

+#endif

+ 

+#ifndef XawCDisplayList

+#define XawCDisplayList "DisplayList"

+#endif

+

+#ifndef XawRDisplayList

+#define XawRDisplayList "XawDisplayList"

+#endif

+#endif

+                                        /* external declarations */

+extern WidgetClass treeWidgetClass;

+

+typedef struct _TreeClassRec *TreeWidgetClass;

+typedef struct _TreeRec      *TreeWidget;

+

+_XFUNCPROTOBEGIN

+

+void XawTreeForceLayout

+(

+ Widget		tree

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawTree_h */

diff --git a/X11/Xaw/TreeP.h b/X11/Xaw/TreeP.h
index 00e59c0a4..5d1c8d423 100644
--- a/X11/Xaw/TreeP.h
+++ b/X11/Xaw/TreeP.h
@@ -1,141 +1,137 @@
-/*
- * $Xorg: TreeP.h,v 1.4 2001/02/09 02:03:47 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.
-
- * Copyright 1989 Prentice Hall
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation.
- * 
- * Prentice Hall and the authors disclaim all warranties with regard
- * to this software, including all implied warranties of merchantability and
- * fitness.  In no event shall Prentice Hall or the authors be liable
- * for any special, indirect or cosequential 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.
- * 
- * Authors:  Jim Fulton, MIT X Consortium,
- *           based on a version by Douglas Young, Prentice Hall
- * 
- * This widget is based on the Tree widget described on pages 397-419 of
- * Douglas Young's book "The X Window System, Programming and Applications 
- * with Xt OSF/Motif Edition."  The layout code has been rewritten to use
- * additional blank space to make the structure of the graph easier to see
- * as well as to support vertical trees.
- */
-/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.6 2001/01/17 19:42:35 dawes Exp $ */
-
-
-#ifndef _XawTreeP_h
-#define _XawTreeP_h
-
-#include <X11/Xaw/Tree.h>
-
-typedef struct _TreeClassPart {
-    XtPointer extension;
-} TreeClassPart;
-
-typedef struct _TreeClassRec {
-    CoreClassPart core_class;
-    CompositeClassPart composite_class;
-    ConstraintClassPart constraint_class;
-    TreeClassPart tree_class;
-} TreeClassRec;
-
-extern TreeClassRec treeClassRec;
-
-typedef struct {
-    /* fields available through resources */
-    Dimension hpad;			/* hSpace/HSpace */
-    Dimension vpad;			/* vSpace/VSpace */
-    Dimension line_width;		/* lineWidth/LineWidth */
-    Pixel foreground;			/* foreground/Foreground */
-    XtGravity gravity;			/* gravity/Gravity */
-    Boolean auto_reconfigure;		/* autoReconfigure/AutoReconfigure */
-    /* private fields */
-    GC gc;				/* used to draw lines */
-    Widget tree_root;			/* hidden root off all children */
-    Dimension *largest;			/* list of largest per depth */
-    int n_largest;			/* number of elements in largest */
-    Dimension maxwidth, maxheight;	/* for shrink wrapping */
-#ifndef OLDXAW
-    XawDisplayList *display_list;
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} TreePart;
-
-
-typedef struct _TreeRec {
-    CorePart core;
-    CompositePart composite;
-    ConstraintPart constraint;
-    TreePart tree;
-}  TreeRec;
-
-
-/*
- * structure attached to all children
- */
-typedef struct _TreeConstraintsPart {
-    /* resources */
-    Widget parent;			/* treeParent/TreeParent */
-    GC gc;				/* treeGC/TreeGC */
-    /* private data */
-    Widget *children;
-    int n_children;
-    int max_children;
-    Dimension bbsubwidth, bbsubheight;	/* bounding box of sub tree */
-    Dimension bbwidth, bbheight;	/* bounding box including node */
-    Position x, y;
-#ifndef OLDXAW
-    XtPointer pad[2];	/* leave some space for future optimizations, and
-			 * keep binary compatability
-			 */
-#endif
-} TreeConstraintsPart;
-
-typedef struct _TreeConstraintsRec {
-   TreeConstraintsPart tree;
-} TreeConstraintsRec, *TreeConstraints;
-
-
-/*
- * useful macros
- */
-
-#define TREE_CONSTRAINT(w) \
-                   ((TreeConstraints)((w)->core.constraints))
-
-#define TREE_INITIAL_DEPTH 10		/* for allocating largest array */
-#define TREE_HORIZONTAL_DEFAULT_SPACING 20
-#define TREE_VERTICAL_DEFAULT_SPACING 6
-
-#endif /* _XawTreeP_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.

+

+ * Copyright 1989 Prentice Hall

+ *

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose and without fee is hereby granted, provided that the above

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

+ * and this permission notice appear in supporting documentation.

+ * 

+ * Prentice Hall and the authors disclaim all warranties with regard

+ * to this software, including all implied warranties of merchantability and

+ * fitness.  In no event shall Prentice Hall or the authors be liable

+ * for any special, indirect or cosequential 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.

+ * 

+ * Authors:  Jim Fulton, MIT X Consortium,

+ *           based on a version by Douglas Young, Prentice Hall

+ * 

+ * This widget is based on the Tree widget described on pages 397-419 of

+ * Douglas Young's book "The X Window System, Programming and Applications 

+ * with Xt OSF/Motif Edition."  The layout code has been rewritten to use

+ * additional blank space to make the structure of the graph easier to see

+ * as well as to support vertical trees.

+ */

+

+#ifndef _XawTreeP_h

+#define _XawTreeP_h

+

+#include <X11/Xaw/Tree.h>

+

+typedef struct _TreeClassPart {

+    XtPointer extension;

+} TreeClassPart;

+

+typedef struct _TreeClassRec {

+    CoreClassPart core_class;

+    CompositeClassPart composite_class;

+    ConstraintClassPart constraint_class;

+    TreeClassPart tree_class;

+} TreeClassRec;

+

+extern TreeClassRec treeClassRec;

+

+typedef struct {

+    /* fields available through resources */

+    Dimension hpad;			/* hSpace/HSpace */

+    Dimension vpad;			/* vSpace/VSpace */

+    Dimension line_width;		/* lineWidth/LineWidth */

+    Pixel foreground;			/* foreground/Foreground */

+    XtGravity gravity;			/* gravity/Gravity */

+    Boolean auto_reconfigure;		/* autoReconfigure/AutoReconfigure */

+    /* private fields */

+    GC gc;				/* used to draw lines */

+    Widget tree_root;			/* hidden root off all children */

+    Dimension *largest;			/* list of largest per depth */

+    int n_largest;			/* number of elements in largest */

+    Dimension maxwidth, maxheight;	/* for shrink wrapping */

+#ifndef OLDXAW

+    XawDisplayList *display_list;

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} TreePart;

+

+

+typedef struct _TreeRec {

+    CorePart core;

+    CompositePart composite;

+    ConstraintPart constraint;

+    TreePart tree;

+}  TreeRec;

+

+

+/*

+ * structure attached to all children

+ */

+typedef struct _TreeConstraintsPart {

+    /* resources */

+    Widget parent;			/* treeParent/TreeParent */

+    GC gc;				/* treeGC/TreeGC */

+    /* private data */

+    Widget *children;

+    int n_children;

+    int max_children;

+    Dimension bbsubwidth, bbsubheight;	/* bounding box of sub tree */

+    Dimension bbwidth, bbheight;	/* bounding box including node */

+    Position x, y;

+#ifndef OLDXAW

+    XtPointer pad[2];	/* leave some space for future optimizations, and

+			 * keep binary compatability

+			 */

+#endif

+} TreeConstraintsPart;

+

+typedef struct _TreeConstraintsRec {

+   TreeConstraintsPart tree;

+} TreeConstraintsRec, *TreeConstraints;

+

+

+/*

+ * useful macros

+ */

+

+#define TREE_CONSTRAINT(w) \

+                   ((TreeConstraints)((w)->core.constraints))

+

+#define TREE_INITIAL_DEPTH 10		/* for allocating largest array */

+#define TREE_HORIZONTAL_DEFAULT_SPACING 20

+#define TREE_VERTICAL_DEFAULT_SPACING 6

+

+#endif /* _XawTreeP_h */

+

+

+

diff --git a/X11/Xaw/VendorEP.h b/X11/Xaw/VendorEP.h
index dc85b3644..ba073bc15 100644
--- a/X11/Xaw/VendorEP.h
+++ b/X11/Xaw/VendorEP.h
@@ -1,84 +1,81 @@
-/* $Xorg: VendorEP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */
-
-/*
- * Copyright 1991 by OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of OMRON not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  OMRON makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * OMRON 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 TORTUOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE. 
- *
- *	Author:	Seiji Kuwari	OMRON Corporation
- *				kuwa@omron.co.jp
- *				kuwa%omron.co.jp@uunet.uu.net
- */				
-
-/*
-
-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/Xaw/VendorEP.h,v 1.5 2001/01/17 19:42:36 dawes Exp $ */
-
-#ifndef _VendorEP_h
-#define _VendorEP_h
-
-#include <X11/Xaw/XawImP.h>
-
-typedef struct {
-    XtPointer	extension;
-} XawVendorShellExtClassPart;
-
-typedef	struct _VendorShellExtClassRec {
-    ObjectClassPart	object_class;
-    XawVendorShellExtClassPart	vendor_shell_ext_class;
-} XawVendorShellExtClassRec;
-
-typedef struct {
-    Widget	parent;
-    XawImPart	im;
-    XawIcPart	ic;
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} XawVendorShellExtPart;
-
-typedef	struct XawVendorShellExtRec {
-    ObjectPart	object;
-    XawVendorShellExtPart	vendor_ext;
-} XawVendorShellExtRec, *XawVendorShellExtWidget;
-
-#endif	/* _VendorEP_h */
+/*

+ * Copyright 1991 by OMRON Corporation

+ *

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

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

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

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of OMRON not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  OMRON makes no representations about the

+ * suitability of this software for any purpose.  It is provided "as is"

+ * without express or implied warranty.

+ *

+ * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

+ * OMRON 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 TORTUOUS ACTION,

+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+ * SOFTWARE. 

+ *

+ *	Author:	Seiji Kuwari	OMRON Corporation

+ *				kuwa@omron.co.jp

+ *				kuwa%omron.co.jp@uunet.uu.net

+ */				

+

+/*

+

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

+#define _VendorEP_h

+

+#include <X11/Xaw/XawImP.h>

+

+typedef struct {

+    XtPointer	extension;

+} XawVendorShellExtClassPart;

+

+typedef	struct _VendorShellExtClassRec {

+    ObjectClassPart	object_class;

+    XawVendorShellExtClassPart	vendor_shell_ext_class;

+} XawVendorShellExtClassRec;

+

+typedef struct {

+    Widget	parent;

+    XawImPart	im;

+    XawIcPart	ic;

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} XawVendorShellExtPart;

+

+typedef	struct XawVendorShellExtRec {

+    ObjectPart	object;

+    XawVendorShellExtPart	vendor_ext;

+} XawVendorShellExtRec, *XawVendorShellExtWidget;

+

+#endif	/* _VendorEP_h */

diff --git a/X11/Xaw/Viewport.h b/X11/Xaw/Viewport.h
index a4b678c83..142b9c8f5 100644
--- a/X11/Xaw/Viewport.h
+++ b/X11/Xaw/Viewport.h
@@ -1,121 +1,118 @@
-/* $Xorg: Viewport.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */
-
-/************************************************************
-
-Copyright 1987, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 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.
-
-********************************************************/
-/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.6 2001/01/17 19:42:36 dawes Exp $ */
-
-#ifndef _XawViewport_h
-#define _XawViewport_h
-
-#include <X11/Xaw/Form.h>
-#include <X11/Xaw/Reports.h>
-
-/* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- allowHoriz	     Boolean		Boolean		False
- allowVert	     Boolean		Boolean		False
- background	     Background		Pixel		XtDefaultBackground
- border		     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- destroyCallback     Callback		Pointer		NULL
- forceBars	     Boolean		Boolean		False
- height		     Height		Dimension	0
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- reportCallback	     ReportCallback	Pointer		NULL
- sensitive	     Sensitive		Boolean		True
- useBottom	     Boolean		Boolean		False
- useRight	     Boolean		Boolean		False
- width		     Width		Dimension	0
- x		     Position		Position	0
- y		     Position		Position	0
-
-*/
-
-#ifndef _XtStringDefs_h_
-#define XtNforceBars "forceBars"
-#define XtNallowHoriz "allowHoriz"
-#define XtNallowVert "allowVert"
-#define XtNuseBottom "useBottom"
-#define XtNuseRight "useRight"
-#endif
-
-extern WidgetClass viewportWidgetClass;
-
-typedef struct _ViewportClassRec *ViewportWidgetClass;
-typedef struct _ViewportRec  *ViewportWidget;
-
-_XFUNCPROTOBEGIN
-
-void XawViewportSetLocation
-(
- Widget			gw,
-#if NeedWidePrototypes
- double			xoff,
- double			yoff
-#else
- float			xoff,
- float			yoff
-#endif
- );
-
-void XawViewportSetCoordinates
-(
- Widget			gw,
-#if NeedWidePrototypes
- int			x,
- int			y
-#else
- Position		x,
- Position		y
-#endif
- );
-
-_XFUNCPROTOEND
-
-#endif /* _XawViewport_h */
+/************************************************************

+

+Copyright 1987, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _XawViewport_h

+#define _XawViewport_h

+

+#include <X11/Xaw/Form.h>

+#include <X11/Xaw/Reports.h>

+

+/* Resources:

+

+ Name		     Class		RepType		Default Value

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

+ allowHoriz	     Boolean		Boolean		False

+ allowVert	     Boolean		Boolean		False

+ background	     Background		Pixel		XtDefaultBackground

+ border		     BorderColor	Pixel		XtDefaultForeground

+ borderWidth	     BorderWidth	Dimension	1

+ destroyCallback     Callback		Pointer		NULL

+ forceBars	     Boolean		Boolean		False

+ height		     Height		Dimension	0

+ mappedWhenManaged   MappedWhenManaged	Boolean		True

+ reportCallback	     ReportCallback	Pointer		NULL

+ sensitive	     Sensitive		Boolean		True

+ useBottom	     Boolean		Boolean		False

+ useRight	     Boolean		Boolean		False

+ width		     Width		Dimension	0

+ x		     Position		Position	0

+ y		     Position		Position	0

+

+*/

+

+#ifndef _XtStringDefs_h_

+#define XtNforceBars "forceBars"

+#define XtNallowHoriz "allowHoriz"

+#define XtNallowVert "allowVert"

+#define XtNuseBottom "useBottom"

+#define XtNuseRight "useRight"

+#endif

+

+extern WidgetClass viewportWidgetClass;

+

+typedef struct _ViewportClassRec *ViewportWidgetClass;

+typedef struct _ViewportRec  *ViewportWidget;

+

+_XFUNCPROTOBEGIN

+

+void XawViewportSetLocation

+(

+ Widget			gw,

+#if NeedWidePrototypes

+ double			xoff,

+ double			yoff

+#else

+ float			xoff,

+ float			yoff

+#endif

+ );

+

+void XawViewportSetCoordinates

+(

+ Widget			gw,

+#if NeedWidePrototypes

+ int			x,

+ int			y

+#else

+ Position		x,

+ Position		y

+#endif

+ );

+

+_XFUNCPROTOEND

+

+#endif /* _XawViewport_h */

diff --git a/X11/Xaw/ViewportP.h b/X11/Xaw/ViewportP.h
index 9de6eaed8..1be7e3936 100644
--- a/X11/Xaw/ViewportP.h
+++ b/X11/Xaw/ViewportP.h
@@ -1,109 +1,107 @@
-/*
- * $Xorg: ViewportP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $
- * Private declarations for ViewportWidgetClass
- */
-
-/************************************************************
-
-Copyright 1987, 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 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.
-
-********************************************************/
-/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.7 2001/01/17 19:42:36 dawes Exp $ */
-
-#ifndef _ViewportP_h
-#define _ViewportP_h
-
-#include <X11/Xaw/Viewport.h>
-#include <X11/Xaw/FormP.h>
-
-typedef struct {
-    XtPointer extension;
-} ViewportClassPart;
-
-typedef struct _ViewportClassRec {
-    CoreClassPart	core_class;
-    CompositeClassPart	composite_class;
-    ConstraintClassPart	constraint_class;
-    FormClassPart	form_class;
-    ViewportClassPart	viewport_class;
-} ViewportClassRec;
-
-extern ViewportClassRec viewportClassRec;
-
-typedef struct _ViewportPart {
-    /* resources */
-    Boolean forcebars;		/* Whether we should always display
-				   the selected scrollbars */
-    Boolean allowhoriz;		/* Whether we allow horizontal scrollbars */
-    Boolean allowvert;		/* Whether we allow vertical scrollbars */
-    Boolean usebottom;		/* True if horiz bars appear at bottom */
-    Boolean useright;		/* True if vert bars appear at right */
-    XtCallbackList report_callbacks;/* when size/position changes */
-
-    /* private */
-    Widget clip, child;		/* The clipping and (scrolled) child widgets */
-    Widget horiz_bar, vert_bar;	/* What scrollbars we currently have */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} ViewportPart;
-
-typedef struct _ViewportRec {
-    CorePart		core;
-    CompositePart	composite;
-    ConstraintPart	constraint;
-    FormPart		form;
-    ViewportPart	viewport;
-} ViewportRec;
-
-typedef struct {
-    Bool reparented;		/* True if child has been re-parented */
-} ViewportConstraintsPart;
-
-typedef struct _ViewportConstraintsRec {
-    FormConstraintsPart		form;
-    ViewportConstraintsPart	viewport;
-} ViewportConstraintsRec, *ViewportConstraints;
-
-#endif /* _ViewportP_h */
+/*

+ * Private declarations for ViewportWidgetClass

+ */

+

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

+

+Copyright 1987, 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 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.

+

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

+

+#ifndef _ViewportP_h

+#define _ViewportP_h

+

+#include <X11/Xaw/Viewport.h>

+#include <X11/Xaw/FormP.h>

+

+typedef struct {

+    XtPointer extension;

+} ViewportClassPart;

+

+typedef struct _ViewportClassRec {

+    CoreClassPart	core_class;

+    CompositeClassPart	composite_class;

+    ConstraintClassPart	constraint_class;

+    FormClassPart	form_class;

+    ViewportClassPart	viewport_class;

+} ViewportClassRec;

+

+extern ViewportClassRec viewportClassRec;

+

+typedef struct _ViewportPart {

+    /* resources */

+    Boolean forcebars;		/* Whether we should always display

+				   the selected scrollbars */

+    Boolean allowhoriz;		/* Whether we allow horizontal scrollbars */

+    Boolean allowvert;		/* Whether we allow vertical scrollbars */

+    Boolean usebottom;		/* True if horiz bars appear at bottom */

+    Boolean useright;		/* True if vert bars appear at right */

+    XtCallbackList report_callbacks;/* when size/position changes */

+

+    /* private */

+    Widget clip, child;		/* The clipping and (scrolled) child widgets */

+    Widget horiz_bar, vert_bar;	/* What scrollbars we currently have */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} ViewportPart;

+

+typedef struct _ViewportRec {

+    CorePart		core;

+    CompositePart	composite;

+    ConstraintPart	constraint;

+    FormPart		form;

+    ViewportPart	viewport;

+} ViewportRec;

+

+typedef struct {

+    Bool reparented;		/* True if child has been re-parented */

+} ViewportConstraintsPart;

+

+typedef struct _ViewportConstraintsRec {

+    FormConstraintsPart		form;

+    ViewportConstraintsPart	viewport;

+} ViewportConstraintsRec, *ViewportConstraints;

+

+#endif /* _ViewportP_h */

diff --git a/X11/Xaw/XawImP.h b/X11/Xaw/XawImP.h
index e36f5050f..546b7b777 100644
--- a/X11/Xaw/XawImP.h
+++ b/X11/Xaw/XawImP.h
@@ -1,213 +1,210 @@
-/* $Xorg: XawImP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */
-
-/*
- * Copyright 1991 by OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of OMRON not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  OMRON makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * OMRON 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 TORTUOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE. 
- *
- *	Author:	Seiji Kuwari	OMRON Corporation
- *				kuwa@omron.co.jp
- *				kuwa%omron.co.jp@uunet.uu.net
- */				
-
-/*
-
-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/Xaw/XawImP.h,v 3.8 2001/01/17 19:42:36 dawes Exp $ */
-
-#ifndef _XawImP_h
-#define _XawImP_h
-
-#define XtNinputMethod		"inputMethod"
-#define XtCInputMethod		"InputMethod"
-#define XtNpreeditType		"preeditType"
-#define XtCPreeditType		"PreeditType"
-#define XtNopenIm		"openIm"
-#define XtCOpenIm		"OpenIm"
-#define XtNsharedIc		"sharedIc"
-#define XtCSharedIc		"SharedIc"
-
-#include <X11/Xaw/Text.h>
-
-#define	CIICFocus	(1 << 0)
-#define	CIFontSet	(1 << 1)
-#define	CIFg		(1 << 2)
-#define	CIBg		(1 << 3)
-#define	CIBgPixmap	(1 << 4)
-#define	CICursorP	(1 << 5)
-#define	CILineS		(1 << 6)
-
-typedef	struct _XawImPart {
-    XIM			xim;
-    XrmResourceList	resources;
-    Cardinal		num_resources;
-    Boolean		open_im;
-    Boolean		initialized;
-    Dimension		area_height;
-    String		input_method;
-    String		preedit_type;
-} XawImPart;
-
-typedef struct _XawIcTablePart {
-    Widget		widget;
-    XIC			xic;
-    XIMStyle		input_style;
-    unsigned long	flg;
-    unsigned long	prev_flg;
-    Boolean		ic_focused;
-    XFontSet		font_set;
-    Pixel		foreground;
-    Pixel		background;
-    Pixmap		bg_pixmap;
-    XawTextPosition	cursor_position;
-    unsigned long	line_spacing;
-    Boolean		openic_error;
-    struct _XawIcTablePart *next;
-} XawIcTablePart, *XawIcTableList;
-
-typedef	struct _XawIcPart {
-    XIMStyle		input_style;
-    Boolean		shared_ic;
-    XawIcTableList	shared_ic_table;
-    XawIcTableList	current_ic_table;
-    XawIcTableList	ic_table;
-} XawIcPart;
-
-typedef	struct _contextDataRec {
-    Widget		parent;
-    Widget		ve;
-} contextDataRec;
-
-typedef	struct _contextErrDataRec {
-    Widget		widget;
-    XIM			xim;
-} contextErrDataRec;
-
-void _XawImResizeVendorShell
-(
- Widget			w
- );
-
-Dimension _XawImGetShellHeight
-(
- Widget			w
-);
-
-void _XawImRealize
-(
- Widget			w
- );
-
-void _XawImInitialize
-(
- Widget			w,
- Widget			ext
- );
-
-void _XawImReconnect
-(
- Widget			w
- );
-
-void _XawImRegister
-(
- Widget			w
- );
-
-void _XawImUnregister
-(
- Widget			w
- );
-
-void _XawImSetValues
-(
- Widget			w,
- ArgList		args,
- Cardinal		num_args
- );
-
-void _XawImSetFocusValues
-(
- Widget			w,
- ArgList		args,
- Cardinal		num_args
-);
-
-void _XawImUnsetFocus
-(
- Widget			w
- );
-
-int _XawImWcLookupString
-(
- Widget			w,
- XKeyPressedEvent	*event,
- wchar_t		*buffer_return,
- int			bytes_buffer,
- KeySym			*keysym_return
- );
-
-int _XawLookupString
-(
- Widget			w,
- XKeyEvent		*event,
- char			*buffer_return,
- int			buffer_size,
- KeySym			*keysym_return
- );
-
-int _XawImGetImAreaHeight
-(
- Widget			w
- );
-
-void _XawImCallVendorShellExtResize
-(
- Widget			w
- );
-
-void _XawImDestroy
-(
- Widget			w,
- Widget			ext
- );
-
-#endif	/* _XawImP_h */
+/*

+ * Copyright 1991 by OMRON Corporation

+ *

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

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

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

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of OMRON not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  OMRON makes no representations about the

+ * suitability of this software for any purpose.  It is provided "as is"

+ * without express or implied warranty.

+ *

+ * OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

+ * OMRON 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 TORTUOUS ACTION,

+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+ * SOFTWARE. 

+ *

+ *	Author:	Seiji Kuwari	OMRON Corporation

+ *				kuwa@omron.co.jp

+ *				kuwa%omron.co.jp@uunet.uu.net

+ */				

+

+/*

+

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

+#define _XawImP_h

+

+#define XtNinputMethod		"inputMethod"

+#define XtCInputMethod		"InputMethod"

+#define XtNpreeditType		"preeditType"

+#define XtCPreeditType		"PreeditType"

+#define XtNopenIm		"openIm"

+#define XtCOpenIm		"OpenIm"

+#define XtNsharedIc		"sharedIc"

+#define XtCSharedIc		"SharedIc"

+

+#include <X11/Xaw/Text.h>

+

+#define	CIICFocus	(1 << 0)

+#define	CIFontSet	(1 << 1)

+#define	CIFg		(1 << 2)

+#define	CIBg		(1 << 3)

+#define	CIBgPixmap	(1 << 4)

+#define	CICursorP	(1 << 5)

+#define	CILineS		(1 << 6)

+

+typedef	struct _XawImPart {

+    XIM			xim;

+    XrmResourceList	resources;

+    Cardinal		num_resources;

+    Boolean		open_im;

+    Boolean		initialized;

+    Dimension		area_height;

+    String		input_method;

+    String		preedit_type;

+} XawImPart;

+

+typedef struct _XawIcTablePart {

+    Widget		widget;

+    XIC			xic;

+    XIMStyle		input_style;

+    unsigned long	flg;

+    unsigned long	prev_flg;

+    Boolean		ic_focused;

+    XFontSet		font_set;

+    Pixel		foreground;

+    Pixel		background;

+    Pixmap		bg_pixmap;

+    XawTextPosition	cursor_position;

+    unsigned long	line_spacing;

+    Boolean		openic_error;

+    struct _XawIcTablePart *next;

+} XawIcTablePart, *XawIcTableList;

+

+typedef	struct _XawIcPart {

+    XIMStyle		input_style;

+    Boolean		shared_ic;

+    XawIcTableList	shared_ic_table;

+    XawIcTableList	current_ic_table;

+    XawIcTableList	ic_table;

+} XawIcPart;

+

+typedef	struct _contextDataRec {

+    Widget		parent;

+    Widget		ve;

+} contextDataRec;

+

+typedef	struct _contextErrDataRec {

+    Widget		widget;

+    XIM			xim;

+} contextErrDataRec;

+

+void _XawImResizeVendorShell

+(

+ Widget			w

+ );

+

+Dimension _XawImGetShellHeight

+(

+ Widget			w

+);

+

+void _XawImRealize

+(

+ Widget			w

+ );

+

+void _XawImInitialize

+(

+ Widget			w,

+ Widget			ext

+ );

+

+void _XawImReconnect

+(

+ Widget			w

+ );

+

+void _XawImRegister

+(

+ Widget			w

+ );

+

+void _XawImUnregister

+(

+ Widget			w

+ );

+

+void _XawImSetValues

+(

+ Widget			w,

+ ArgList		args,

+ Cardinal		num_args

+ );

+

+void _XawImSetFocusValues

+(

+ Widget			w,

+ ArgList		args,

+ Cardinal		num_args

+);

+

+void _XawImUnsetFocus

+(

+ Widget			w

+ );

+

+int _XawImWcLookupString

+(

+ Widget			w,

+ XKeyPressedEvent	*event,

+ wchar_t		*buffer_return,

+ int			bytes_buffer,

+ KeySym			*keysym_return

+ );

+

+int _XawLookupString

+(

+ Widget			w,

+ XKeyEvent		*event,

+ char			*buffer_return,

+ int			buffer_size,

+ KeySym			*keysym_return

+ );

+

+int _XawImGetImAreaHeight

+(

+ Widget			w

+ );

+

+void _XawImCallVendorShellExtResize

+(

+ Widget			w

+ );

+

+void _XawImDestroy

+(

+ Widget			w,

+ Widget			ext

+ );

+

+#endif	/* _XawImP_h */

diff --git a/X11/Xaw/XawInit.h b/X11/Xaw/XawInit.h
index 1953f616c..7d2cee138 100644
--- a/X11/Xaw/XawInit.h
+++ b/X11/Xaw/XawInit.h
@@ -1,64 +1,62 @@
-/* $Xorg: XawInit.h,v 1.5 2001/02/09 02:03:47 xorgcvs Exp $
- *
-Copyright 1989, 1994, 1998  The Open Group
-Copyright 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
-
-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/Xaw/XawInit.h,v 1.12 2001/01/17 19:42:36 dawes Exp $ */
-
-/* $XdotOrg: xc/lib/Xaw/XawInit.h,v 1.2 2004/04/23 18:43:38 eich Exp $ */
-#ifndef _XawInit_h
-#define _XawInit_h
-
-#define XawVendor	XVENDORNAMESHORT
-
-#ifdef OLDXAW
-#define XawVersion	6700002L
-#else
-#define	XawVersion	7000002L
-
-typedef struct _XawDL XawDisplayList;
-#endif /* OLDXAW */
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-void XawInitializeWidgetSet(void);
-#ifndef OLDXAW
-void XawInitializeDefaultConverters(void);
-#endif
-
-extern Widget XawOpenApplication(
-    XtAppContext *app_context_return,
-    Display      *dpy,
-    Screen       *screen,
-    String        application_name,
-    String        application_class,
-    WidgetClass   widget_class,
-    int          *argc,
-    String       *argv
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XawInit_h */
+/*

+ *

+Copyright 1989, 1994, 1998  The Open Group

+Copyright 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>

+

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

+#define _XawInit_h

+

+#define XawVendor	XVENDORNAMESHORT

+

+#ifdef OLDXAW

+#define XawVersion	6700002L

+#else

+#define	XawVersion	7000002L

+

+typedef struct _XawDL XawDisplayList;

+#endif /* OLDXAW */

+

+#include <X11/Intrinsic.h>

+#include <X11/Xfuncproto.h>

+

+_XFUNCPROTOBEGIN

+

+void XawInitializeWidgetSet(void);

+#ifndef OLDXAW

+void XawInitializeDefaultConverters(void);

+#endif

+

+extern Widget XawOpenApplication(

+    XtAppContext *app_context_return,

+    Display      *dpy,

+    Screen       *screen,

+    String        application_name,

+    String        application_class,

+    WidgetClass   widget_class,

+    int          *argc,

+    String       *argv

+);

+

+_XFUNCPROTOEND

+

+#endif /* _XawInit_h */

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

+

diff --git a/X11/Xtos.h b/X11/Xtos.h
index 013b2416c..f5cf3a6e2 100644
--- a/X11/Xtos.h
+++ b/X11/Xtos.h
@@ -1,77 +1,72 @@
-/*
-* $Xorg: Xtos.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $
-*/
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 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.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/Xtos.h,v 3.12tsi Exp $ */
-
-#ifndef _Xtos_h
-#define _Xtos_h
-
-#define ALLOCATE_LOCAL_FALLBACK(_size) XtMalloc((unsigned long)(_size))
-#define DEALLOCATE_LOCAL_FALLBACK(_ptr) XtFree((XtPointer)(_ptr))
-#include <X11/Xalloca.h>
-
-#ifdef CRAY
-#define WORD64
-#endif
-
-#if defined (_LP64) || \
-    defined(__alpha) || defined(__alpha__) || \
-    defined(__ia64__) || defined(ia64) || \
-    defined(__sparc64__) || \
-    defined(__s390x__) || \
-    (defined(__hppa__) && defined(__LP64__)) || \
-    defined(__amd64__) || defined(amd64) || \
-    defined(__powerpc64__) || \
-    (defined(sgi) && (_MIPS_SZLONG == 64))
-#define LONG64
-#endif
-
-#endif /* _Xtos_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
+/***********************************************************

+

+Copyright 1987, 1988, 1994, 1998  The Open Group

+

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

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

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

+copyright notice and this permission notice appear in supporting

+documentation.

+

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

+all copies or substantial portions of the Software.

+

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

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

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

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

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

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

+

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

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

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

+

+

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

+

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

+

+#ifndef _Xtos_h

+#define _Xtos_h

+

+#define ALLOCATE_LOCAL_FALLBACK(_size) XtMalloc((unsigned long)(_size))

+#define DEALLOCATE_LOCAL_FALLBACK(_ptr) XtFree((XtPointer)(_ptr))

+#include <X11/Xalloca.h>

+

+#ifdef CRAY

+#define WORD64

+#endif

+

+#if defined (_LP64) || \

+    defined(__alpha) || defined(__alpha__) || \

+    defined(__ia64__) || defined(ia64) || \

+    defined(__sparc64__) || \

+    defined(__s390x__) || \

+    (defined(__hppa__) && defined(__LP64__)) || \

+    defined(__amd64__) || defined(amd64) || \

+    defined(__powerpc64__) || \

+    (defined(sgi) && (_MIPS_SZLONG == 64))

+#define LONG64

+#endif

+

+#endif /* _Xtos_h */

+/* DON'T ADD STUFF AFTER THIS #endif */

diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index b64ad5d0c..a99317ad0 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -77,10 +77,10 @@ struct _glapi_table;
 

 #if defined (GLX_USE_TLS)

 

-_GLAPI_EXPORT extern TLS struct _glapi_table * _glapi_tls_Dispatch

+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch

     __attribute__((tls_model("initial-exec")));

 

-_GLAPI_EXPORT extern TLS void * _glapi_tls_Context

+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context

     __attribute__((tls_model("initial-exec")));

 

 _GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;

diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index 9b419ba77..e5110ecfc 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -471,7 +471,7 @@ struct _glapi_table
    void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 428 */

    void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 429 */

    void (GLAPIENTRYP ClampColor)(GLenum target, GLenum clamp); /* 430 */

-   void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, const GLfloat depth, const GLint stencil); /* 431 */

+   void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 431 */

    void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 432 */

    void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 433 */

    void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 434 */

diff --git a/xorg-server/glx/glapitemp.h b/xorg-server/glx/glapitemp.h
index 4101a63d3..5f6b91f2c 100644
--- a/xorg-server/glx/glapitemp.h
+++ b/xorg-server/glx/glapitemp.h
@@ -2637,7 +2637,7 @@ KEYWORD1 void KEYWORD2 NAME(ClampColor)(GLenum target, GLenum clamp)
    DISPATCH(ClampColor, (target, clamp), (F, "glClampColor(0x%x, 0x%x);\n", target, clamp));

 }

 

-KEYWORD1 void KEYWORD2 NAME(ClearBufferfi)(GLenum buffer, GLint drawbuffer, const GLfloat depth, const GLint stencil)

+KEYWORD1 void KEYWORD2 NAME(ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)

 {

    DISPATCH(ClearBufferfi, (buffer, drawbuffer, depth, stencil), (F, "glClearBufferfi(0x%x, %d, %f, %d);\n", buffer, drawbuffer, depth, stencil));

 }