Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

70 files changed, 345 insertions, 69 deletions

diff --git a/include/X11/Xaw/AsciiSink.h b/include/X11/Xaw/AsciiSink.h
index 2f0a216..2349274 100644
--- a/include/X11/Xaw/AsciiSink.h
+++ b/include/X11/Xaw/AsciiSink.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.6 2001/12/14 19:54:38 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */
 
 #ifndef _XawAsciiSink_h
 #define _XawAsciiSink_h
diff --git a/include/X11/Xaw/AsciiSinkP.h b/include/X11/Xaw/AsciiSinkP.h
index 7c19dd0..b160092 100644
--- a/include/X11/Xaw/AsciiSinkP.h
+++ b/include/X11/Xaw/AsciiSinkP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.10 2001/12/14 19:54:38 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.9 2001/01/17 19:42:25 dawes Exp $ */
 
 #ifndef _XawAsciiSinkP_h
 #define _XawAsciiSinkP_h
diff --git a/include/X11/Xaw/AsciiSrc.h b/include/X11/Xaw/AsciiSrc.h
index 289a8c1..8728dd9 100644
--- a/include/X11/Xaw/AsciiSrc.h
+++ b/include/X11/Xaw/AsciiSrc.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:38 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */
 
 
 /*
diff --git a/include/X11/Xaw/AsciiSrcP.h b/include/X11/Xaw/AsciiSrcP.h
index c12aba6..22d3008 100644
--- a/include/X11/Xaw/AsciiSrcP.h
+++ b/include/X11/Xaw/AsciiSrcP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.9 2001/12/14 19:54:38 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/AsciiText.h b/include/X11/Xaw/AsciiText.h
index 1df99cf..e6b4bc8 100644
--- a/include/X11/Xaw/AsciiText.h
+++ b/include/X11/Xaw/AsciiText.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.6 2001/12/14 19:54:39 dawes Exp $ */
+/* $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
diff --git a/include/X11/Xaw/AsciiTextP.h b/include/X11/Xaw/AsciiTextP.h
index 68907e1..25e3eee 100644
--- a/include/X11/Xaw/AsciiTextP.h
+++ b/include/X11/Xaw/AsciiTextP.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.9 2001/12/14 19:54:39 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/Box.h b/include/X11/Xaw/Box.h
index 7ea8815..17db281 100644
--- a/include/X11/Xaw/Box.h
+++ b/include/X11/Xaw/Box.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Box.h,v 1.8 2001/12/14 19:54:39 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Box.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */
 
 #ifndef _XawBox_h
 #define _XawBox_h
diff --git a/include/X11/Xaw/BoxP.h b/include/X11/Xaw/BoxP.h
index bc1607e..a64142e 100644
--- a/include/X11/Xaw/BoxP.h
+++ b/include/X11/Xaw/BoxP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.11 2001/12/14 19:54:39 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.10 2001/01/17 19:42:25 dawes Exp $ */
 
 #ifndef _XawBoxP_h
 #define _XawBoxP_h
diff --git a/include/X11/Xaw/Command.h b/include/X11/Xaw/Command.h
index 95f98df..49eb991 100644
--- a/include/X11/Xaw/Command.h
+++ b/include/X11/Xaw/Command.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Command.h,v 1.6 2001/12/14 19:54:39 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Command.h,v 1.5 2001/01/17 19:42:26 dawes Exp $ */
 
 #ifndef _XawCommand_h
 #define _XawCommand_h
diff --git a/include/X11/Xaw/CommandP.h b/include/X11/Xaw/CommandP.h
index 541281c..bc639f8 100644
--- a/include/X11/Xaw/CommandP.h
+++ b/include/X11/Xaw/CommandP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.8 2001/12/14 19:54:39 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.7 2001/01/17 19:42:26 dawes Exp $ */
 
 #ifndef _XawCommandP_h
 #define _XawCommandP_h
diff --git a/include/X11/Xaw/Dialog.h b/include/X11/Xaw/Dialog.h
index 5ad325a..96fd36d 100644
--- a/include/X11/Xaw/Dialog.h
+++ b/include/X11/Xaw/Dialog.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.6 2001/12/14 19:54:39 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.5 2001/01/17 19:42:26 dawes Exp $ */
 
 #ifndef _XawDialog_h
 #define _XawDialog_h
diff --git a/include/X11/Xaw/DialogP.h b/include/X11/Xaw/DialogP.h
index 43e0425..fcc2240 100644
--- a/include/X11/Xaw/DialogP.h
+++ b/include/X11/Xaw/DialogP.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.9 2001/12/14 19:54:39 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.8 2001/01/17 19:42:26 dawes Exp $ */
 
 #ifndef _DialogP_h
 #define _DialogP_h
diff --git a/include/X11/Xaw/Form.h b/include/X11/Xaw/Form.h
index e8aaeb9..9eb1ad7 100644
--- a/include/X11/Xaw/Form.h
+++ b/include/X11/Xaw/Form.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Form.h,v 1.9 2001/12/14 19:54:40 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Form.h,v 1.8 2001/01/17 19:42:26 dawes Exp $ */
 
 #ifndef _XawForm_h
 #define _XawForm_h
diff --git a/include/X11/Xaw/FormP.h b/include/X11/Xaw/FormP.h
index f77843f..7203dda 100644
--- a/include/X11/Xaw/FormP.h
+++ b/include/X11/Xaw/FormP.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/FormP.h,v 1.14 2001/12/19 21:37:30 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/FormP.h,v 1.13 2001/12/14 19:54:40 dawes Exp $ */
 
 /* Form widget private definitions */
 
diff --git a/include/X11/Xaw/Grip.h b/include/X11/Xaw/Grip.h
index 4f08213..1c19f60 100644
--- a/include/X11/Xaw/Grip.h
+++ b/include/X11/Xaw/Grip.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Grip.h,v 1.7 2001/12/14 19:54:40 dawes Exp $ */
+/* $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)
diff --git a/include/X11/Xaw/GripP.h b/include/X11/Xaw/GripP.h
index 21cc845..f40a8d1 100644
--- a/include/X11/Xaw/GripP.h
+++ b/include/X11/Xaw/GripP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/GripP.h,v 1.8 2001/12/14 19:54:40 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/GripP.h,v 1.7 2001/01/17 19:42:26 dawes Exp $ */
 
 #ifndef _XawGripP_h
 #define _XawGripP_h
diff --git a/include/X11/Xaw/Label.h b/include/X11/Xaw/Label.h
index f0a2be0..fc3942b 100644
--- a/include/X11/Xaw/Label.h
+++ b/include/X11/Xaw/Label.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Label.h,v 1.7 2001/12/14 19:54:40 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Label.h,v 1.6 2001/01/17 19:42:27 dawes Exp $ */
 
 #ifndef _XawLabel_h
 #define _XawLabel_h
diff --git a/include/X11/Xaw/LabelP.h b/include/X11/Xaw/LabelP.h
index 41a9bd0..9f49fdd 100644
--- a/include/X11/Xaw/LabelP.h
+++ b/include/X11/Xaw/LabelP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.8 2001/12/14 19:54:40 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */
 
 #ifndef _XawLabelP_h
 #define _XawLabelP_h
diff --git a/include/X11/Xaw/List.h b/include/X11/Xaw/List.h
index b693411..2115eef 100644
--- a/include/X11/Xaw/List.h
+++ b/include/X11/Xaw/List.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.8 2001/12/14 19:54:40 dawes Exp $ */
+/* $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 
diff --git a/include/X11/Xaw/ListP.h b/include/X11/Xaw/ListP.h
index 12915f0..2b8fc46 100644
--- a/include/X11/Xaw/ListP.h
+++ b/include/X11/Xaw/ListP.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.9 2001/12/14 19:54:40 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/ListP.h,v 1.8 2001/01/17 19:42:27 dawes Exp $ */
 
 
 /* 
diff --git a/include/X11/Xaw/MenuButtoP.h b/include/X11/Xaw/MenuButtoP.h
index ed168f1..416fdf9 100644
--- a/include/X11/Xaw/MenuButtoP.h
+++ b/include/X11/Xaw/MenuButtoP.h
@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.8 2001/12/14 19:54:41 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/MenuButton.h b/include/X11/Xaw/MenuButton.h
index 949dbc5..59744c2 100644
--- a/include/X11/Xaw/MenuButton.h
+++ b/include/X11/Xaw/MenuButton.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.6 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/include/X11/Xaw/MultiSink.h b/include/X11/Xaw/MultiSink.h
index c1d9e05..49ef1df 100644
--- a/include/X11/Xaw/MultiSink.h
+++ b/include/X11/Xaw/MultiSink.h
@@ -70,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.6 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */
 
 #ifndef _XawMultiSink_h
 #define _XawMultiSink_h
diff --git a/include/X11/Xaw/MultiSinkP.h b/include/X11/Xaw/MultiSinkP.h
index a84d53f..537e0b1 100644
--- a/include/X11/Xaw/MultiSinkP.h
+++ b/include/X11/Xaw/MultiSinkP.h
@@ -71,7 +71,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.9 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.8 2001/01/17 19:42:28 dawes Exp $ */
 
 #ifndef _XawMultiSinkP_h
 #define _XawMultiSinkP_h
diff --git a/include/X11/Xaw/MultiSrc.h b/include/X11/Xaw/MultiSrc.h
index 90d38ed..00c27f6 100644
--- a/include/X11/Xaw/MultiSrc.h
+++ b/include/X11/Xaw/MultiSrc.h
@@ -49,7 +49,7 @@ 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.7 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.6 2001/01/17 19:42:28 dawes Exp $ */
 
 /*
  * This file was modified from AsciiSrc.h.
diff --git a/include/X11/Xaw/MultiSrcP.h b/include/X11/Xaw/MultiSrcP.h
index 1931019..49f7abc 100644
--- a/include/X11/Xaw/MultiSrcP.h
+++ b/include/X11/Xaw/MultiSrcP.h
@@ -71,7 +71,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.9 2001/12/14 19:54:41 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/Paned.h b/include/X11/Xaw/Paned.h
index 3e4b050..aaa5320 100644
--- a/include/X11/Xaw/Paned.h
+++ b/include/X11/Xaw/Paned.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Paned.h,v 1.7 2001/12/14 19:54:41 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/PanedP.h b/include/X11/Xaw/PanedP.h
index 863d2a2..a94b0f3 100644
--- a/include/X11/Xaw/PanedP.h
+++ b/include/X11/Xaw/PanedP.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.8 2001/12/14 19:54:41 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/Panner.h b/include/X11/Xaw/Panner.h
index cc1ddf8..594e2eb 100644
--- a/include/X11/Xaw/Panner.h
+++ b/include/X11/Xaw/Panner.h
@@ -25,7 +25,7 @@ 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.6 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Panner.h,v 1.5 2001/01/17 19:42:28 dawes Exp $ */
 
 #ifndef _XawPanner_h
 #define _XawPanner_h
diff --git a/include/X11/Xaw/PannerP.h b/include/X11/Xaw/PannerP.h
index 1d185f2..aacf2e2 100644
--- a/include/X11/Xaw/PannerP.h
+++ b/include/X11/Xaw/PannerP.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _XawPannerP_h
 #define _XawPannerP_h
diff --git a/include/X11/Xaw/Porthole.h b/include/X11/Xaw/Porthole.h
index 774463d..68274d8 100644
--- a/include/X11/Xaw/Porthole.h
+++ b/include/X11/Xaw/Porthole.h
@@ -25,7 +25,7 @@ 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.6 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.5 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _XawPorthole_h
 #define _XawPorthole_h
diff --git a/include/X11/Xaw/PortholeP.h b/include/X11/Xaw/PortholeP.h
index 74524b9..39dcbdc 100644
--- a/include/X11/Xaw/PortholeP.h
+++ b/include/X11/Xaw/PortholeP.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:41 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _XawPortholeP_h
 #define _XawPortholeP_h
diff --git a/include/X11/Xaw/Print.h b/include/X11/Xaw/Print.h
new file mode 100644
index 0000000..bd8eb52
--- /dev/null
+++ b/include/X11/Xaw/Print.h
@@ -0,0 +1,128 @@
+/* $Xorg: Print.h,v 1.1 2003/07/11 19:46:06 gisburn Exp $ */
+/******************************************************************************
+ ******************************************************************************
+ **
+ ** (c) Copyright 2003 Danny Backx <danny.backx@skynet.be>
+ ** (c) Copyright 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+ ** 
+ ** 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
+ ** 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.
+ **
+ ** Except as contained in this notice, the names of the 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 from said
+ ** copyright holders.
+ **
+ ******************************************************************************
+ *****************************************************************************/
+ 
+
+#ifndef _XAW_PRINT_H
+#define _XAW_PRINT_H 1
+
+#include <X11/extensions/Print.h>
+
+/* XawPrintConfigureLayoutMode - define how the shell resizes/moves itself
+ * to match the paper size
+ * Values:
+ * - XawPrintLAYOUTMODE_NONE
+ *   do nothing
+ * - XawPrintLAYOUTMODE_PAGESIZE
+ *   set width/height to page size
+ *   (this is the default (mainly for compatibilty to XmPrintShell))
+ * - XawPrintLAYOUTMODE_DRAWABLEAREA
+ *   set x/y/width/height to drawable area of pag
+ */
+typedef
+enum
+{
+  XawPrintLAYOUTMODE_NONE,
+  XawPrintLAYOUTMODE_PAGESIZE,
+  XawPrintLAYOUTMODE_DRAWABLEAREA
+} XawPrintConfigureLayoutMode;
+
+
+#define XawNstartJobCallback             "XawNstartJobCallback"
+#define XawNendJobCallback               "XawNendJobCallback"
+#define XawNdocSetupCallback             "XawNdocSetupCallback"
+#define XawNpageSetupCallback            "XawNpageSetupCallback"
+#define XawNlayoutMode                   "XawNlayoutMode"
+#define XawCLayoutMode                   "XawCLayoutMode"
+#define XawNminX                         "XawNminX"
+#define XawCMinX                         "XawCMinX"
+#define XawNminY                         "XawNminY"
+#define XawCMinY                         "XawCMinY"
+#define XawNmaxX                         "XawNmaxX"
+#define XawCMaxX                         "XawCMaxX"
+#define XawNmaxY                         "XawNmaxY"
+#define XawCMaxY                         "XawCMaxY"
+#define XawNcurrDocNumInJob              "XawNcurrDocNumInJob"
+#define XawCCurrDocNumInJob              "XawCCurrDocNumInJob"
+#define XawNcurrPageNumInDoc             "XawNcurrPageNumInDoc"
+#define XawCCurrPageNumInDoc             "XawCCurrPageNumInDoc"
+#define XawNcurrPageNumInJob             "XawNcurrPageNumInJob"
+#define XawCCurrPageNumInJob             "XawCCurrPageNumInJob"
+#define XawNdefaultPixmapResolution      "XawNdefaultPixmapResolution"
+#define XawCDefaultPixmapResolution      "XawCDefaultPixmapResolution"
+
+#define XawCR_START_JOB         70
+#define XawCR_END_JOB           71
+#define XawCR_DOC_SETUP         72
+#define XawCR_PAGE_SETUP        73
+
+typedef struct
+{
+    int            reason;
+    XEvent        *event;
+    XPContext      context;
+    Boolean        last_page_in_doc;
+    Boolean        last_page_in_job;
+    XtPointer      detail;
+} XawPrintShellCallbackStruct;
+
+extern WidgetClass xawPrintShellWidgetClass;
+typedef struct XawPrintShellRec *XawPrintShellWidget;
+
+/************************************************************
+ *
+ * Public Functions.
+ *
+ ************************************************************/
+
+_XFUNCPROTOBEGIN
+
+/* Returns whether the widget passed in is a print shell or "print shell"-like
+ * widget (e.g. print preview).
+ * Note that this will return |True| for more classes than |XawPrintShell| in
+ * the future (like for |XmPrintShell| etc.)
+ */
+extern Boolean XawIsPrintShell(
+#if NeedFunctionPrototypes
+    Widget w
+#endif
+);
+
+extern void   XawPrintRedisplayWidget(
+#if NeedFunctionPrototypes
+    Widget w /* Widget */
+#endif
+);
+          
+_XFUNCPROTOEND
+
+#endif /* !_XAW_PRINT_H */
+
diff --git a/include/X11/Xaw/PrintSP.h b/include/X11/Xaw/PrintSP.h
new file mode 100644
index 0000000..e0aca27
--- /dev/null
+++ b/include/X11/Xaw/PrintSP.h
@@ -0,0 +1,135 @@
+/* $Xorg: PrintSP.h,v 1.1 2003/07/11 19:46:06 gisburn Exp $ */
+/******************************************************************************
+ ******************************************************************************
+ **
+ ** (c) Copyright 2003 Danny Backx <danny.backx@skynet.be>
+ ** (c) Copyright 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+ ** 
+ ** 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
+ ** 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.
+ **
+ ** Except as contained in this notice, the names of the 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 from said
+ ** copyright holders.
+ **
+ ******************************************************************************
+ *****************************************************************************/
+
+#ifndef _XAW_PRINTSP_H
+#define _XAW_PRINTSP_H 1
+
+#include <X11/CoreP.h>
+#include <X11/ShellP.h>
+
+_XFUNCPROTOBEGIN
+
+/* New fields for the XawPrintShell widget class record */
+
+typedef struct {
+    XtPointer       extension;          /* pointer to extension record      */
+} XawPrintShellClassPart;
+
+typedef struct XawPrintShellClassRec {
+    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;
+    XawPrintShellClassPart     print_shell_class;
+} XawPrintShellClassRec;
+
+extern XawPrintShellClassRec xawPrintShellClassRec;
+
+/* New fields for the XawPrint shell widget */
+
+typedef struct {
+    XtCallbackList               start_job_callback,
+                                 end_job_callback,
+                                 doc_setup_callback,
+                                 page_setup_callback;
+    XtEnum                       layoutmode; /* see XawPrintConfigureLayoutMode */
+    unsigned short               page_width,
+                                 page_height;
+    Dimension                    min_x,
+                                 min_y,
+                                 max_x,
+                                 max_y;
+    unsigned int                 curr_doc_num_in_job,  /* Current document number in job */
+                                 curr_page_num_in_doc, /* Current page number in doc */
+                                 curr_page_num_in_job; /* Current page number in job */
+    unsigned short               default_pixmap_resolution;
+    long                         print_resolution;
+    Boolean                      last_page_in_doc;
+    Boolean                      last_page_in_job;
+} XawPrintShellPart;
+
+typedef struct XawPrintShellRec {
+    CorePart              core;
+    CompositePart         composite;
+    ShellPart             shell;
+    WMShellPart           wm;
+    VendorShellPart       vendor;
+    TopLevelShellPart     topLevel;
+    ApplicationShellPart  application;
+    XawPrintShellPart     print;
+} XawPrintShellRec;
+extern WidgetClass xawPrintShellWidgetClass;
+
+#define PS_StartJobCallback(w) \
+    (((XawPrintShellWidget) (w))->print.start_job_callback)
+#define PS_EndJobCallback(w) \
+    (((XawPrintShellWidget) (w))->print.end_job_callback)
+#define PS_DocSetupCallback(w) \
+    (((XawPrintShellWidget) (w))->print.doc_setup_callback)
+#define PS_PageSetupCallback(w) \
+    (((XawPrintShellWidget) (w))->print.page_setup_callback)
+#define PS_LayoutMode(w) \
+    (((XawPrintShellWidget) (w))->print.layoutmode)
+#define PS_PageWidth(w) \
+    (((XawPrintShellWidget) (w))->print.page_width)
+#define PS_PageHeight(w) \
+    (((XawPrintShellWidget) (w))->print.page_height)
+#define PS_MinX(w) \
+    (((XawPrintShellWidget) (w))->print.min_x)
+#define PS_MinY(w) \
+    (((XawPrintShellWidget) (w))->print.min_y)
+#define PS_MaxX(w) \
+    (((XawPrintShellWidget) (w))->print.max_x)
+#define PS_MaxY(w) \
+    (((XawPrintShellWidget) (w))->print.max_y)
+#define PS_CurrDocNumInJob(w) \
+    (((XawPrintShellWidget) (w))->print.curr_doc_num_in_job)
+#define PS_CurrPageNumInDoc(w) \
+    (((XawPrintShellWidget) (w))->print.curr_page_num_in_doc)
+#define PS_CurrPageNumInJob(w) \
+    (((XawPrintShellWidget) (w))->print.curr_page_num_in_job)
+#define PS_DefaultPixmapResolution(w) \
+    (((XawPrintShellWidget) (w))->print.default_pixmap_resolution)
+#define PS_PrintResolution(w) \
+    (((XawPrintShellWidget) (w))->print.print_resolution)
+#define PS_LastPageInDoc(w) \
+    (((XawPrintShellWidget) (w))->print.last_page_in_doc)
+#define PS_LastPageInJob(w) \
+    (((XawPrintShellWidget) (w))->print.last_page_in_job)
+
+_XFUNCPROTOEND
+
+#endif /* !_XAW_PRINTSP_H */
+
diff --git a/include/X11/Xaw/Repeater.h b/include/X11/Xaw/Repeater.h
index d548c3b..cfb2c53 100644
--- a/include/X11/Xaw/Repeater.h
+++ b/include/X11/Xaw/Repeater.h
@@ -25,7 +25,7 @@ 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.6 2001/12/14 19:54:42 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.5 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _XawRepeater_h
 #define _XawRepeater_h
diff --git a/include/X11/Xaw/RepeaterP.h b/include/X11/Xaw/RepeaterP.h
index 3336e23..3ce0a49 100644
--- a/include/X11/Xaw/RepeaterP.h
+++ b/include/X11/Xaw/RepeaterP.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:42 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _XawRepeaterP_h
 #define _XawRepeaterP_h
diff --git a/include/X11/Xaw/Scrollbar.h b/include/X11/Xaw/Scrollbar.h
index 38ec481..c776d41 100644
--- a/include/X11/Xaw/Scrollbar.h
+++ b/include/X11/Xaw/Scrollbar.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.7 2001/12/14 19:54:42 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.6 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _Scrollbar_h
 #define _Scrollbar_h
diff --git a/include/X11/Xaw/ScrollbarP.h b/include/X11/Xaw/ScrollbarP.h
index ec0e15d..ec3af46 100644
--- a/include/X11/Xaw/ScrollbarP.h
+++ b/include/X11/Xaw/ScrollbarP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.8 2001/12/14 19:54:42 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
 
 #ifndef _ScrollbarP_h
 #define _ScrollbarP_h
diff --git a/include/X11/Xaw/Simple.h b/include/X11/Xaw/Simple.h
index ffcd59b..7ba9354 100644
--- a/include/X11/Xaw/Simple.h
+++ b/include/X11/Xaw/Simple.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Simple.h,v 1.9 2001/12/14 19:54:42 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Simple.h,v 1.8 2001/01/17 19:42:30 dawes Exp $ */
 
 #ifndef _Simple_h
 #define _Simple_h
diff --git a/include/X11/Xaw/SimpleMenP.h b/include/X11/Xaw/SimpleMenP.h
index d7c8d01..4610205 100644
--- a/include/X11/Xaw/SimpleMenP.h
+++ b/include/X11/Xaw/SimpleMenP.h
@@ -24,7 +24,7 @@ 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.13 2001/12/14 19:54:42 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/SimpleMenu.h b/include/X11/Xaw/SimpleMenu.h
index 8048a90..0ee6896 100644
--- a/include/X11/Xaw/SimpleMenu.h
+++ b/include/X11/Xaw/SimpleMenu.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:43 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/SimpleP.h b/include/X11/Xaw/SimpleP.h
index d48cd13..f2fa3fa 100644
--- a/include/X11/Xaw/SimpleP.h
+++ b/include/X11/Xaw/SimpleP.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.13 2001/12/19 21:37:31 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.12 2001/12/14 19:54:43 dawes Exp $ */
 
 #ifndef _SimpleP_h
 #define _SimpleP_h
diff --git a/include/X11/Xaw/Sme.h b/include/X11/Xaw/Sme.h
index dc9a565..fb87b00 100644
--- a/include/X11/Xaw/Sme.h
+++ b/include/X11/Xaw/Sme.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.6 2001/12/14 19:54:43 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/SmeBSB.h b/include/X11/Xaw/SmeBSB.h
index d337755..094b558 100644
--- a/include/X11/Xaw/SmeBSB.h
+++ b/include/X11/Xaw/SmeBSB.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.7 2001/12/14 19:54:43 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/SmeBSBP.h b/include/X11/Xaw/SmeBSBP.h
index bc3a65a..6b263e7 100644
--- a/include/X11/Xaw/SmeBSBP.h
+++ b/include/X11/Xaw/SmeBSBP.h
@@ -25,7 +25,7 @@ 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.9 2001/12/14 19:54:43 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.8 2001/01/17 19:42:31 dawes Exp $ */
 
 #ifndef _XawSmeBSBP_h
 #define _XawSmeBSBP_h
diff --git a/include/X11/Xaw/SmeLine.h b/include/X11/Xaw/SmeLine.h
index e5d09d3..7c9d4e4 100644
--- a/include/X11/Xaw/SmeLine.h
+++ b/include/X11/Xaw/SmeLine.h
@@ -24,7 +24,7 @@ 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.6 2001/12/14 19:54:43 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/SmeLineP.h b/include/X11/Xaw/SmeLineP.h
index 07f12a7..7102d03 100644
--- a/include/X11/Xaw/SmeLineP.h
+++ b/include/X11/Xaw/SmeLineP.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:43 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.7 2001/01/17 19:42:31 dawes Exp $ */
 
 #ifndef _XawSmeLineP_h
 #define _XawSmeLineP_h
diff --git a/include/X11/Xaw/SmeP.h b/include/X11/Xaw/SmeP.h
index 02b8018..94342ff 100644
--- a/include/X11/Xaw/SmeP.h
+++ b/include/X11/Xaw/SmeP.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.9 2001/12/19 21:37:31 dawes Exp $ */
+/* $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.
diff --git a/include/X11/Xaw/StripCharP.h b/include/X11/Xaw/StripCharP.h
index 062b744..50ed74c 100644
--- a/include/X11/Xaw/StripCharP.h
+++ b/include/X11/Xaw/StripCharP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.8 2001/12/14 19:54:43 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.7 2001/01/17 19:42:32 dawes Exp $ */
 
 #ifndef _XawStripChartP_h
 #define _XawStripChartP_h
diff --git a/include/X11/Xaw/StripChart.h b/include/X11/Xaw/StripChart.h
index b6c2f0f..b6c6f21 100644
--- a/include/X11/Xaw/StripChart.h
+++ b/include/X11/Xaw/StripChart.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.6 2001/12/14 19:54:44 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.5 2001/01/17 19:42:32 dawes Exp $ */
 
 #ifndef _XawStripChart_h
 #define _XawStripChart_h
diff --git a/include/X11/Xaw/Template.c b/include/X11/Xaw/Template.c
index 17180d6..f1e1db1 100644
--- a/include/X11/Xaw/Template.c
+++ b/include/X11/Xaw/Template.c
@@ -25,7 +25,7 @@ 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.9 2001/12/14 19:54:44 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Template.c,v 1.8 2001/08/01 00:44:39 tsi Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
diff --git a/include/X11/Xaw/Template.h b/include/X11/Xaw/Template.h
index ec2df82..5ec0974 100644
--- a/include/X11/Xaw/Template.h
+++ b/include/X11/Xaw/Template.h
@@ -25,7 +25,7 @@ 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.6 2001/12/14 19:54:44 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Template.h,v 1.5 2001/01/17 19:42:32 dawes Exp $ */
 
 #ifndef _Template_h
 #define _Template_h
diff --git a/include/X11/Xaw/TemplateP.h b/include/X11/Xaw/TemplateP.h
index 29e36fb..f3e3d67 100644
--- a/include/X11/Xaw/TemplateP.h
+++ b/include/X11/Xaw/TemplateP.h
@@ -25,7 +25,7 @@ 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.7 2001/12/14 19:54:44 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.6 2001/01/17 19:42:32 dawes Exp $ */
 
 #ifndef _TemplateP_h
 #define _TemplateP_h
diff --git a/include/X11/Xaw/Text.h b/include/X11/Xaw/Text.h
index b04175a..af80ffc 100644
--- a/include/X11/Xaw/Text.h
+++ b/include/X11/Xaw/Text.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Text.h,v 1.15 2001/12/14 19:54:44 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Text.h,v 1.14 2001/01/17 19:42:34 dawes Exp $ */
 
 #ifndef _XawText_h
 #define _XawText_h
diff --git a/include/X11/Xaw/TextP.h b/include/X11/Xaw/TextP.h
index cf11b85..0edbdd2 100644
--- a/include/X11/Xaw/TextP.h
+++ b/include/X11/Xaw/TextP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextP.h,v 3.22 2001/12/19 21:37:31 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextP.h,v 3.21 2001/12/14 19:54:44 dawes Exp $ */
 
 #ifndef _XawTextP_h
 #define _XawTextP_h
diff --git a/include/X11/Xaw/TextSink.h b/include/X11/Xaw/TextSink.h
index b379de9..291b960 100644
--- a/include/X11/Xaw/TextSink.h
+++ b/include/X11/Xaw/TextSink.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.10 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.9 2001/01/17 19:42:35 dawes Exp $ */
 
 #ifndef _XawTextSink_h
 #define _XawTextSink_h
diff --git a/include/X11/Xaw/TextSinkP.h b/include/X11/Xaw/TextSinkP.h
index 122f7da..6cc8733 100644
--- a/include/X11/Xaw/TextSinkP.h
+++ b/include/X11/Xaw/TextSinkP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.12 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.11 2001/01/17 19:42:35 dawes Exp $ */
 
 #ifndef _XawTextSinkP_h
 #define _XawTextSinkP_h
diff --git a/include/X11/Xaw/TextSrc.h b/include/X11/Xaw/TextSrc.h
index c978e73..817132d 100644
--- a/include/X11/Xaw/TextSrc.h
+++ b/include/X11/Xaw/TextSrc.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.13 2002/02/10 02:40:08 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.11 2001/01/17 19:42:35 dawes Exp $ */
 
 #ifndef _XawTextSrc_h
 #define _XawTextSrc_h
diff --git a/include/X11/Xaw/TextSrcP.h b/include/X11/Xaw/TextSrcP.h
index 02f62ae..e26557b 100644
--- a/include/X11/Xaw/TextSrcP.h
+++ b/include/X11/Xaw/TextSrcP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.15 2001/12/19 21:37:31 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.14 2001/12/14 19:54:45 dawes Exp $ */
 
 #ifndef _XawTextSrcP_h
 #define _XawTextSrcP_h
diff --git a/include/X11/Xaw/Tip.h b/include/X11/Xaw/Tip.h
index 5fb56f5..0d7121c 100644
--- a/include/X11/Xaw/Tip.h
+++ b/include/X11/Xaw/Tip.h
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/lib/Xaw/Tip.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XawTip_h
 #define _XawTip_h
diff --git a/include/X11/Xaw/TipP.h b/include/X11/Xaw/TipP.h
index 0c1abc6..397d241 100644
--- a/include/X11/Xaw/TipP.h
+++ b/include/X11/Xaw/TipP.h
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/lib/Xaw/TipP.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XawTipP_h
 #define _XawTipP_h
diff --git a/include/X11/Xaw/Toggle.h b/include/X11/Xaw/Toggle.h
index 68bb742..4858961 100644
--- a/include/X11/Xaw/Toggle.h
+++ b/include/X11/Xaw/Toggle.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.6 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.5 2001/01/17 19:42:35 dawes Exp $ */
 
 /*
  * ToggleP.h - Private definitions for Toggle widget
diff --git a/include/X11/Xaw/ToggleP.h b/include/X11/Xaw/ToggleP.h
index e9afe41..c147737 100644
--- a/include/X11/Xaw/ToggleP.h
+++ b/include/X11/Xaw/ToggleP.h
@@ -25,7 +25,7 @@ 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.8 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.7 2001/01/17 19:42:35 dawes Exp $ */
 
 /* 
  * Author: Chris D. Peterson
diff --git a/include/X11/Xaw/Tree.h b/include/X11/Xaw/Tree.h
index 30697bb..ae0990a 100644
--- a/include/X11/Xaw/Tree.h
+++ b/include/X11/Xaw/Tree.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  * 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.7 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Tree.h,v 1.6 2001/01/17 19:42:35 dawes Exp $ */
 
 
 #ifndef _XawTree_h
diff --git a/include/X11/Xaw/TreeP.h b/include/X11/Xaw/TreeP.h
index 3a09170..00e59c0 100644
--- a/include/X11/Xaw/TreeP.h
+++ b/include/X11/Xaw/TreeP.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  * 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.7 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.6 2001/01/17 19:42:35 dawes Exp $ */
 
 
 #ifndef _XawTreeP_h
diff --git a/include/X11/Xaw/VendorEP.h b/include/X11/Xaw/VendorEP.h
index 30c6fe3..dc85b36 100644
--- a/include/X11/Xaw/VendorEP.h
+++ b/include/X11/Xaw/VendorEP.h
@@ -51,7 +51,7 @@ 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.6 2001/12/14 19:54:45 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.5 2001/01/17 19:42:36 dawes Exp $ */
 
 #ifndef _VendorEP_h
 #define _VendorEP_h
diff --git a/include/X11/Xaw/Viewport.h b/include/X11/Xaw/Viewport.h
index b242ff2..a4b678c 100644
--- a/include/X11/Xaw/Viewport.h
+++ b/include/X11/Xaw/Viewport.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.7 2001/12/14 19:54:46 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.6 2001/01/17 19:42:36 dawes Exp $ */
 
 #ifndef _XawViewport_h
 #define _XawViewport_h
diff --git a/include/X11/Xaw/ViewportP.h b/include/X11/Xaw/ViewportP.h
index 4801885..9de6eae 100644
--- a/include/X11/Xaw/ViewportP.h
+++ b/include/X11/Xaw/ViewportP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.8 2001/12/14 19:54:46 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.7 2001/01/17 19:42:36 dawes Exp $ */
 
 #ifndef _ViewportP_h
 #define _ViewportP_h
diff --git a/include/X11/Xaw/XawImP.h b/include/X11/Xaw/XawImP.h
index 4f70554..e36f505 100644
--- a/include/X11/Xaw/XawImP.h
+++ b/include/X11/Xaw/XawImP.h
@@ -51,7 +51,7 @@ 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.9 2001/12/14 19:54:46 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.8 2001/01/17 19:42:36 dawes Exp $ */
 
 #ifndef _XawImP_h
 #define _XawImP_h
diff --git a/include/X11/Xaw/XawInit.h b/include/X11/Xaw/XawInit.h
index 57c330c..f9c2072 100644
--- a/include/X11/Xaw/XawInit.h
+++ b/include/X11/Xaw/XawInit.h
@@ -1,6 +1,7 @@
 /* $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
@@ -22,12 +23,13 @@ Except as contained in this notice, the name of The Open Group shall not be
 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.13 2001/12/14 19:54:46 dawes Exp $ */
+/* $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.1.4.1.6.1.6.2 2004/04/12 12:20:50 gisburn Exp $ */
 #ifndef _XawInit_h
 #define _XawInit_h
 
-#define XawVendor	"XFree86"
+#define XawVendor	XVENDORNAMESHORT
 
 #ifdef OLDXAW
 #define XawVersion	6700002L
@@ -46,6 +48,17 @@ void XawInitializeWidgetSet(void);
 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 */