diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:38 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:38 +0000 |
| commit | 39c07a5fa73bcbb48d5de8985d5f2540b65e470b (patch) | |
| tree | b4cedeea180b0259ee646fe547975c0ba0c5bc7b | |
| parent | 5aa2c5d2169757ae410f1d13c5279fd4030b72f0 (diff) | |
| download | xorg-lib-libXaw-39c07a5fa73bcbb48d5de8985d5f2540b65e470b.tar.gz | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
120 files changed, 1219 insertions, 124 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 */ diff --git a/man/Xaw.man b/man/Xaw.man index 5f093ad..8803f10 100644 --- a/man/Xaw.man +++ b/man/Xaw.man @@ -24,9 +24,9 @@ .\" dealings in this Software without prior written authorization from the .\" XFree86 Project. .\" -.\" Author: Paulo César Pereira de Andrade +.\" Author: Paulo César Pereira de Andrade .\" -.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.8 2003/05/29 21:48:05 herrb Exp $ +.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.7 2001/11/04 21:16:39 paulo Exp $ .\" .de TQ .br @@ -39,9 +39,10 @@ .SH DESCRIPTION .B Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. This -manual page describes the additions and modifications to the Xaw library -made by XFree86 (Xaw7), as well as some of the common interfaces between -its version and the previous X Consortium release (Xaw6). +release by the X.org Foundation includes additions and modifications +originally made for The XFree86 Project, Inc. This manual page describes +these changes as well as some of the common interfaces between its version +and the previous X Consortium release (Xaw6). .SH ACTIONS All of the \fIXaw\fR widgets now have the additional translations .B call-proc, declare, get-values @@ -580,7 +581,8 @@ Guarino-Reid, Charles Haynes, Rich Hyde, Mary Larson, Joel McCormack, Ron Newman, Jeanne Rich, Terry Weissman, Mike Gancarz, Phil Karlton, Kathleen Langone, Ram Rao, Smokey Wallace, Al Mento, and Jean Diaz. .PP -XFree86's additions and modifications to \fIXaw\fR were written by Paulo +The additions and modifications to \fIXaw\fR which were +originally made for XFree86 were written by Paulo C\('esar Pereira de Andrade. .SH SEE ALSO .I Athena Widget Set - C Language Interface diff --git a/old-doc/Changelog b/old-doc/Changelog index 5a1d674..1781761 100644 --- a/old-doc/Changelog +++ b/old-doc/Changelog @@ -1367,4 +1367,4 @@ xedit.c: -$XFree86: xc/lib/Xaw/Changelog,v 3.32 1999/08/28 09:00:26 dawes Exp $ +$XFree86: xc/lib/Xaw/Changelog,v 3.31 1999/08/15 13:00:31 dawes Exp $ diff --git a/src/Actions.c b/src/Actions.c index 91d411b..2ab7980 100644 --- a/src/Actions.c +++ b/src/Actions.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Actions.c,v 3.18 2004/01/23 03:57:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Actions.c,v 3.17 2003/03/25 04:18:10 dawes Exp $ */ #include <ctype.h> #include <stdio.h> diff --git a/src/AllWidgets.c b/src/AllWidgets.c index a6fc390..a96625b 100644 --- a/src/AllWidgets.c +++ b/src/AllWidgets.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/AllWidgets.c,v 1.4 2001/12/14 19:54:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AllWidgets.c,v 1.3 2001/08/23 21:49:51 tsi Exp $ */ #include <X11/IntrinsicP.h> #include <X11/Xmu/WidgetNode.h> @@ -67,6 +67,7 @@ extern WidgetClass treeWidgetClass; extern WidgetClass vendorShellWidgetClass; extern WidgetClass viewportWidgetClass; extern WidgetClass wmShellWidgetClass; +extern WidgetClass xawPrintShellWidgetClass; XmuWidgetNode XawWidgetArray[] = { { "applicationShell", &applicationShellWidgetClass }, @@ -111,6 +112,7 @@ XmuWidgetNode XawWidgetArray[] = { { "vendorShell", &vendorShellWidgetClass }, { "viewport", &viewportWidgetClass }, { "wmShell", &wmShellWidgetClass }, +{ "printShell", &xawPrintShellWidgetClass }, }; int XawWidgetCount = XtNumber(XawWidgetArray); diff --git a/src/AsciiSink.c b/src/AsciiSink.c index fe812d9..1ec7bb3 100644 --- a/src/AsciiSink.c +++ b/src/AsciiSink.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.28 2002/09/08 02:29:47 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.26 2001/12/14 19:54:38 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index 4e45979..f544ec9 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.34 2002/11/21 16:22:52 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.33 2002/07/04 17:04:20 paulo Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). diff --git a/src/AsciiText.c b/src/AsciiText.c index f197679..897b3fe 100644 --- a/src/AsciiText.c +++ b/src/AsciiText.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.10 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.9 2001/01/17 19:42:25 dawes Exp $ */ /* * AsciiText.c - Source code for AsciiText Widget @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.c,v 1.15 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.c,v 1.14 2001/01/17 19:42:25 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Command.c b/src/Command.c index 489653c..461a754 100644 --- a/src/Command.c +++ b/src/Command.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.c,v 1.17 2003/08/04 10:32:20 eich Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.c,v 1.15tsi Exp $ */ /* * Command.c - Command button widget diff --git a/src/Converters.c b/src/Converters.c index 99ea5aa..11a9aab 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Converters.c,v 3.14 1999/06/20 08:40:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Converters.c,v 3.13 1999/06/06 08:47:54 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/src/Dialog.c b/src/Dialog.c index e2e8315..638ac1a 100644 --- a/src/Dialog.c +++ b/src/Dialog.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.8 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.7 2001/01/17 19:42:26 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/DisplayList.c b/src/DisplayList.c index 7bb9d89..b88e388 100644 --- a/src/DisplayList.c +++ b/src/DisplayList.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.19 2003/05/23 15:51:23 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.18 2003/05/23 14:51:15 tsi Exp $ */ #include <ctype.h> #include <string.h> @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.c,v 1.21 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.c,v 1.20 2001/02/05 22:38:04 paulo Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.c,v 1.8 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.c,v 1.7 2001/01/17 19:42:26 dawes Exp $ */ /* * Grip.c - Grip Widget (Used by Paned Widget) diff --git a/src/Label.c b/src/Label.c index 74f5502..f2882f2 100644 --- a/src/Label.c +++ b/src/Label.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.c,v 1.14 2003/08/04 10:32:20 eich Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.c,v 1.12 2001/01/17 19:42:27 dawes Exp $ */ #include <stdio.h> #include <ctype.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.c,v 1.17 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.c,v 1.16 2001/01/17 19:42:27 dawes Exp $ */ /* * List.c - List widget diff --git a/src/MenuButton.c b/src/MenuButton.c index f21dc90..a30be1a 100644 --- a/src/MenuButton.c +++ b/src/MenuButton.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.10 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.9 2001/10/11 21:17:00 paulo Exp $ */ /* * MenuButton.c - Source code for MenuButton widget. diff --git a/src/MultiSink.c b/src/MultiSink.c index 77b0c9f..513e0f0 100644 --- a/src/MultiSink.c +++ b/src/MultiSink.c @@ -70,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.20 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.19 2001/01/17 19:42:27 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/MultiSrc.c b/src/MultiSrc.c index 102f664..e606eb3 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -27,7 +27,7 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.29 2002/12/06 16:19:57 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.28 2002/11/21 16:22:52 paulo Exp $ */ /* @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xaw/OS.c,v 1.2 1998/12/06 11:24:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/OS.c,v 1.1 1998/12/06 10:44:34 dawes Exp $ */ /* Some OS-dependent utility code */ diff --git a/src/Paned.c b/src/Paned.c index 098e353..b45f2a3 100644 --- a/src/Paned.c +++ b/src/Paned.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.c,v 1.12 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.c,v 1.11 2001/08/23 00:03:19 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/src/Panner.c b/src/Panner.c index d388e06..629d3ce 100644 --- a/src/Panner.c +++ b/src/Panner.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.c,v 3.9 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.c,v 3.8 2001/07/25 15:04:49 dawes Exp $ */ #include <ctype.h> #include <math.h> diff --git a/src/Pixmap.c b/src/Pixmap.c index b6778c2..972262c 100644 --- a/src/Pixmap.c +++ b/src/Pixmap.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.18 2003/03/25 04:18:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.17 2002/05/18 02:05:39 paulo Exp $ */ #include <string.h> #include <stdio.h> diff --git a/src/Porthole.c b/src/Porthole.c index afe8b47..ac86d62 100644 --- a/src/Porthole.c +++ b/src/Porthole.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * This widget is a trivial clipping widget. It is typically used with a * panner or scrollbar to navigate. */ -/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.7 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.6 2001/01/17 19:42:29 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/PrintShell.c b/src/PrintShell.c new file mode 100644 index 0000000..f022783 --- /dev/null +++ b/src/PrintShell.c @@ -0,0 +1,747 @@ +/* $Xorg: PrintShell.c,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. + ** + ****************************************************************************** + *****************************************************************************/ + + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> + +#include <X11/IntrinsicP.h> +#include <X11/StringDefs.h> + +#include "Print.h" +#include "PrintSP.h" + +/* Local prototypes */ +static void class_initialize(void); +static void class_part_initialize(WidgetClass w_class); +static void initialize(Widget request, Widget new_w, ArgList args, Cardinal *num_args); +static void destroy(Widget w); +static Boolean set_values(Widget current, Widget request, Widget new_w, ArgList args, Cardinal *num_args); +static void XawPrintNotify(Widget w, XtPointer client, XEvent *evp, Boolean *cont); +static void XawAttributesNotify(Widget w, XtPointer client, XEvent *evp, Boolean *cont); +static void XawUpdateLayout(Widget w); +static void XawUpdateResources(Widget w, XPContext pcontext); + +#define Offset(field) XtOffsetOf(XawPrintShellRec, print.field) + +#ifdef XAWDEBUG +#define DEBUGOUT(x) XawDebug x ; + +static void +XawDebug(const char *fn, Widget w, const char *fmt, ...) +{ + va_list ap; + + if (w) { + fprintf(stderr, "%s %s: ", + w->core.widget_class->core_class.class_name, XtName(w)); + } else { + fprintf(stderr, "(null widget): "); + } + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); +} +#else +#define DEBUGOUT(x) +#endif /* XAWDEBUG */ + +/* Resources for the PrintShell class */ +static XtResource resources[] = +{ + { + XawNstartJobCallback, XtCCallback, XtRCallback, + sizeof(XtCallbackList), Offset(start_job_callback), + XtRImmediate, (XtPointer)NULL + }, + { + XawNendJobCallback, XtCCallback, XtRCallback, + sizeof(XtCallbackList), Offset(end_job_callback), + XtRImmediate, (XtPointer)NULL + }, + { + XawNdocSetupCallback, XtCCallback, XtRCallback, + sizeof(XtCallbackList), Offset(doc_setup_callback), + XtRImmediate, (XtPointer)NULL + }, + { + XawNpageSetupCallback, XtCCallback, XtRCallback, + sizeof(XtCallbackList), Offset(page_setup_callback), + XtRImmediate, (XtPointer)NULL + }, + { + XawNlayoutMode, XawCLayoutMode, XtREnum, + sizeof(XtEnum), Offset(layoutmode), + XtRImmediate, (XtPointer)XawPrintLAYOUTMODE_PAGESIZE + }, + { + XawNminX, XawCMinX, XtRDimension, + sizeof(Dimension), Offset(min_x), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNminY, XawCMinY, XtRDimension, + sizeof(Dimension), Offset(min_y), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNmaxX, XawCMaxX, XtRDimension, + sizeof(Dimension), Offset(max_x), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNmaxY, XawCMaxY, XtRDimension, + sizeof(Dimension), Offset(max_y), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNcurrDocNumInJob, XawCCurrDocNumInJob, XtRInt, + sizeof(unsigned int), Offset(curr_doc_num_in_job), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNcurrPageNumInDoc, XawCCurrPageNumInDoc, XtRInt, + sizeof(unsigned int), Offset(curr_page_num_in_doc), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNcurrPageNumInJob, XawCCurrPageNumInJob, XtRInt, + sizeof(unsigned int), Offset(curr_page_num_in_job), + XtRImmediate, (XtPointer)NULL /* dynamic */ + }, + { + XawNdefaultPixmapResolution, XawCDefaultPixmapResolution, XtRShort, + sizeof(unsigned short), Offset(default_pixmap_resolution), + XtRImmediate, (XtPointer)0 + }, +}; + +static XtActionsRec actions[] = +{ + { NULL, NULL } +}; + +XawPrintShellClassRec xawPrintShellClassRec = { + /* Core class part */ + { + /* superclass */ (WidgetClass) &applicationShellClassRec, + /* class_name */ "XawPrintShell", + /* widget_size */ sizeof(XawPrintShellRec), + /* class_initialize */ class_initialize, + /* class_part_initialize */ class_part_initialize, + /* class_inited */ False, + /* initialize */ initialize, + /* initialize_hook */ NULL, + /* realize */ XtInheritRealize, + /* actions */ actions, + /* num_actions */ XtNumber(actions), + /* resources */ resources, + /* num_resources */ XtNumber(resources), + /* xrm_class */ NULLQUARK, + /* compress_motion */ False, + /* compress_exposure */ XtExposeCompressSeries, + /* compress_enterleave */ False, + /* visible_interest */ False, + /* destroy */ destroy, + /* resize */ XtInheritResize, + /* expose */ XtInheritExpose, + /* set_values */ set_values, + /* set_values_hook */ NULL, + /* set_values_almost */ XtInheritSetValuesAlmost, + /* get_values_hook */ NULL, + /* accept_focus */ NULL, + /* version */ XtVersion, + /* callback offsets */ NULL, + /* tm_table */ XtInheritTranslations, + /* query_geometry */ XtInheritQueryGeometry, + /* display_accelerator */ NULL, + /* extension */ NULL /* (XtPointer)&_XawPrintShellCoreClassExtRec */ + }, + /* Composite class part */ + { + /* geometry manager */ XtInheritGeometryManager, + /* change_managed */ XtInheritChangeManaged, + /* insert_child */ XtInheritInsertChild, + /* delete_child */ XtInheritDeleteChild, + /* extension */ NULL, + }, + /* Shell class part */ + { + /* extension */ NULL, + }, + /* WM Shell class part */ + { + /* extension */ NULL, + }, + /* VendorShell class part */ + { + /* extension */ NULL, + }, + /* TopLevelShell class part */ + { + /* extension */ NULL, + }, + /* ApplicationShell class part */ + { + /* extension */ NULL, + }, + { + /* ?? */ NULL, + }, +}; + +WidgetClass xawPrintShellWidgetClass = (WidgetClass)&xawPrintShellClassRec; + + +static void +class_initialize(void) +{ +} + + +static void +class_part_initialize(WidgetClass widget_class) +{ +} + +/* + * This is a static table to keep the link between widgets and XPContexts. + * Yeah - this is probably not a very bright idea. Maybe it should also + * contain the Display. + */ +typedef struct { + Widget w; + XPContext c; +} WidgetContext; +static WidgetContext *w_ctxt = NULL; +static int wc_nfields = 0; + +static void +XawStoreWidgetContext(Widget w, XPContext c) +{ + wc_nfields++; + w_ctxt = (WidgetContext *)XtRealloc((XtPointer)w_ctxt, sizeof(WidgetContext) * wc_nfields); + w_ctxt[wc_nfields-1].w = w; + w_ctxt[wc_nfields-1].c = c; +} + +/* FIXME: This is not threadsafe... */ +static Widget +XawPrintContextToWidget(XPContext c) +{ + int i; + + for( i = 0 ; i < wc_nfields ; i++ ) { + if( w_ctxt[i].c == c ) { + return w_ctxt[i].w; + } + } + return NULL; +} + +/* FIXME: This is not threadsafe... */ +static XPContext +XawPrintWidgetToContext(Widget w) +{ + int i; + + for( i = 0 ; i < wc_nfields ; i++ ) { + if (w_ctxt[i].w == w) { + return w_ctxt[i].c; + } + } + return (XPContext)None; +} + +/* FIXME: This is not threadsafe... */ +static void +XawPrintDeleteWidgetContext(Widget w) +{ + int i; + + for( i = 0 ; i < wc_nfields ; i++ ) { + if( w_ctxt[i].w == w ) { + w_ctxt[i].w = NULL; + w_ctxt[i].c = None; + } + } +} + +static void +SelectNotify(Widget w, int *e, XtPointer *s, int n, XtPointer client) +{ + XPContext c = XpGetContext(XtDisplay(w)); + + if (!c) { + XtAppWarning(XtWidgetToApplicationContext(w), + "XawPrintShell: SelectNotify: no print context\n"); + return; + } + + XpSelectInput(XtDisplay(w), c, XPPrintMask|XPAttributeMask); +} + + +static Boolean +DispatchEvent(XEvent *evp) +{ + XPPrintEvent *e = (XPPrintEvent*)evp; + + Widget w = XawPrintContextToWidget(e->context); + + /* Make sure this event is really for this window... */ + if (XFilterEvent(evp, XtWindow(w))) + { + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent *** filter XFilterEvent() matched.\n")); + return True; + } + + /* Only for debugging */ +#ifdef XAWDEBUG + { + int error_base, + event_base; + + if (!XpQueryExtension(XtDisplay(w), &event_base, &error_base)) { + return False; + } + + if (e->type == event_base + XPPrintNotify) { + switch (e->detail) { + case XPStartJobNotify: + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent XPStartJobNotify\n")); + break; + case XPEndJobNotify: + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent XPEndJobNotify\n")); + break; + case XPStartDocNotify: + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent XPStartDocNotify\n")); + break; + case XPStartPageNotify: + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent XPStartPageNotify\n")); + break; + case XPEndPageNotify: + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent XPEndPageNotify\n")); + break; + case XPEndDocNotify: + DEBUGOUT((__FILE__, w, "XawPrintShell-DispatchEvent XPEndDocNotify\n")); + break; + default: + DEBUGOUT((__FILE__, w, "XawPrintShell DispatchEvent\n")); + } + } + } +#endif /* XAWDEBUG */ + + return XtDispatchEventToWidget(w, evp); +} + + +static void +initialize(Widget request, Widget new_w, ArgList args, Cardinal *num_args) +{ + int error_base, + event_base; + XPContext pcontext; + + DEBUGOUT((__FILE__, new_w, "XawPrintShell Initialize\n")); + + if (!XpQueryExtension(XtDisplay(new_w), &event_base, &error_base)) { + DEBUGOUT((__FILE__, new_w, "XawPrintShell initialize: failed!!\n")); + XtAppWarning(XtWidgetToApplicationContext(new_w), + "XawPrintShell: initialize: XpQueryExtension() failed. BAD.\n"); + return; + } + + DEBUGOUT((__FILE__, new_w, "XawPrintShell Initialize event_base %d error_base %d\n", + event_base, error_base)); + + pcontext = XpGetContext(XtDisplay(new_w)); + + if( pcontext == None ) { + XtAppWarning(XtWidgetToApplicationContext(new_w), + "XawPrintShell: initialize: No print content. BAD.\n"); + return; + } + + /* Make sure that the Xt machinery is really using the right screen (assertion) */ + if( XpGetScreenOfContext(XtDisplay(new_w), pcontext) != XtScreen(new_w) ) { + XtAppWarning(XtWidgetToApplicationContext(new_w), + "XawPrintShell: initialize: Widget's screen != print screen. BAD.\n"); + return; + } + + XawStoreWidgetContext(new_w, pcontext); + + XtInsertEventTypeHandler(new_w, + event_base + XPPrintNotify, + (XtPointer)XPPrintMask, + XawPrintNotify, NULL, + XtListTail); + XtInsertEventTypeHandler(new_w, + event_base + XPAttributeNotify, + (XtPointer)XPAttributeMask, + XawAttributesNotify, NULL, + XtListTail); + + XtRegisterExtensionSelector(XtDisplay(new_w), + event_base + XPPrintNotify, + event_base + XPAttributeNotify, + SelectNotify, + NULL); + + XtSetEventDispatcher(XtDisplay(new_w), + event_base + XPPrintNotify, + DispatchEvent); + XtSetEventDispatcher(XtDisplay(new_w), + event_base + XPAttributeNotify, + DispatchEvent); + + PS_LastPageInDoc(new_w) = False; + PS_LastPageInJob(new_w) = False; + + XawUpdateResources(new_w, pcontext); + XawUpdateLayout(new_w); + + DEBUGOUT((__FILE__, new_w, "XawPrintShell Initialize x %d y %d wid %d ht %d\n", + new_w->core.x, + new_w->core.y, + new_w->core.width, + new_w->core.height)); +} + + +static void +destroy(Widget w) +{ + DEBUGOUT((__FILE__, w, "XawPrintShell Destroy\n")); + XawPrintDeleteWidgetContext(w); +} + +static Boolean +set_values(Widget current, Widget request, Widget new_w, + ArgList args, Cardinal *num_args) +{ + DEBUGOUT((__FILE__, new_w, "XawPrintShell SetValues\n")); + return True; +} + +void XawPrintRedisplayWidget(Widget w) +{ + XExposeEvent xev; + Region region; + + xev.type = Expose; + xev.serial = XLastKnownRequestProcessed(XtDisplay(w)); + xev.send_event = False; + xev.display = XtDisplay(w); + xev.window = XtWindowOfObject(w); + xev.x = 0; + xev.y = 0; + xev.width = w->core.width; + xev.height = w->core.height; + xev.count = 0; + + region = XCreateRegion(); + if (!region) + return; + + XtAddExposureToRegion((XEvent*)&xev, region); + + if (w->core.widget_class->core_class.expose) + (*(w->core.widget_class->core_class.expose))(w, (XEvent *)&xev, region); + + XDestroyRegion(region); +} + +/* 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.) + */ +Boolean +XawIsPrintShell(Widget w) +{ + return XtIsSubclass(w, xawPrintShellWidgetClass); +} + + +static void +XawPrintNotify(Widget w, XtPointer client, XEvent *evp, Boolean *cont) +{ + XPPrintEvent *e = (XPPrintEvent *)evp; + XawPrintShellCallbackStruct cbs; + + switch (e->detail) { + case XPStartPageNotify: + DEBUGOUT((__FILE__, w, "XPStartPageNotify\n")); + + /* Re do not have to call |XawPrintRedisplayWidget(w)| here since + * Xprint triggers an expose event anyway + */ + + DEBUGOUT((__FILE__, w, "XpEndPage\n")); + XpEndPage(XtDisplay(w)); + break; + + case XPEndPageNotify: + DEBUGOUT((__FILE__, w, "XPEndPageNotify\n")); + + if (PS_LastPageInDoc(w) || PS_LastPageInJob(w)) { + DEBUGOUT((__FILE__, w, "XpEndDoc\n")); + XpEndDoc(XtDisplay(w)); + } + else { + /* Increment page numbers... */ + PS_CurrPageNumInDoc(w) += 1; + PS_CurrPageNumInJob(w) += 1; + + /* ... do the page setup callback ... */ + cbs.reason = XawCR_PAGE_SETUP; + cbs.event = evp; + cbs.detail = NULL; + cbs.context = XawPrintWidgetToContext(w); + cbs.last_page_in_doc = False; + cbs.last_page_in_job = False; + + if (PS_PageSetupCallback(w)) + XtCallCallbackList(w, PS_PageSetupCallback(w), &cbs); + + PS_LastPageInDoc(w) = cbs.last_page_in_doc; + PS_LastPageInJob(w) = cbs.last_page_in_job; + + /* ... and start the new page */ + DEBUGOUT((__FILE__, w, "XpStartPage\n")); + XpStartPage(XtDisplay(w), XtWindow(w)); + } + break; + + case XPStartDocNotify: + DEBUGOUT((__FILE__, w, "XPStartDocNotify\n")); + + cbs.reason = XawCR_PAGE_SETUP; + cbs.event = evp; + cbs.detail = NULL; + cbs.context = XawPrintWidgetToContext(w); + cbs.last_page_in_doc = False; + cbs.last_page_in_job = False; + + if (PS_PageSetupCallback(w)) + XtCallCallbackList(w, PS_PageSetupCallback(w), &cbs); + + PS_LastPageInDoc(w) = cbs.last_page_in_doc; + PS_LastPageInJob(w) = cbs.last_page_in_job; + + DEBUGOUT((__FILE__, w, "XpStartPage\n")); + XpStartPage(XtDisplay(w), XtWindow(w)); + break; + + case XPEndDocNotify: + DEBUGOUT((__FILE__, w, "XPEndDocNotify\n")); + + /* Start a new document (via XpStartDoc()) if we are not done with the job yet, + * otherwise finish the job (via XpEndJob()) + */ + if (PS_LastPageInJob(w)) { + DEBUGOUT((__FILE__, w, "XpEndJob\n")); + XpEndJob(XtDisplay(w)); + } + else { + PS_CurrDocNumInJob(w) += 1; + PS_CurrPageNumInDoc(w) = 1; + + cbs.reason = XawCR_DOC_SETUP; + cbs.event = evp; + cbs.detail = NULL; + cbs.context = XawPrintWidgetToContext(w); + cbs.last_page_in_doc = False; + cbs.last_page_in_job = False; + + if (PS_DocSetupCallback(w)) + XtCallCallbackList(w, PS_DocSetupCallback(w), &cbs); + + PS_LastPageInDoc(w) = cbs.last_page_in_doc; + PS_LastPageInJob(w) = cbs.last_page_in_job; + + DEBUGOUT((__FILE__, w, "XpStartDoc\n")); + XpStartDoc(XtDisplay(w), XPDocNormal); + } + break; + + case XPStartJobNotify: + DEBUGOUT((__FILE__, w, "XPStartJobNotify\n")); + PS_LastPageInJob(w) = False; + PS_LastPageInDoc(w) = False; + PS_CurrDocNumInJob(w) = 1; + PS_CurrPageNumInDoc(w) = 1; + PS_CurrPageNumInJob(w) = 1; + + cbs.reason = XawCR_START_JOB; + cbs.event = evp; + cbs.detail = NULL; + cbs.context = XawPrintWidgetToContext(w); + cbs.last_page_in_doc = False; + cbs.last_page_in_job = False; + + if (PS_StartJobCallback(w)) + XtCallCallbackList(w, PS_StartJobCallback(w), &cbs); + + PS_LastPageInDoc(w) = cbs.last_page_in_doc; + PS_LastPageInJob(w) = cbs.last_page_in_job; + + /* Start a document (which will trigger the first page in + * |XPStartDocNotify| above) */ + if (PS_LastPageInDoc(w) || PS_LastPageInJob(w)) { + DEBUGOUT((__FILE__, w, "XpEndJob\n")); + XpEndJob(XtDisplay(w)); + } + else + { + cbs.reason = XawCR_DOC_SETUP; + cbs.event = evp; + cbs.detail = NULL; + cbs.context = XawPrintWidgetToContext(w); + cbs.last_page_in_doc = False; + cbs.last_page_in_job = False; + + if (PS_DocSetupCallback(w)) + XtCallCallbackList(w, PS_DocSetupCallback(w), &cbs); + + PS_LastPageInDoc(w) = cbs.last_page_in_doc; + PS_LastPageInJob(w) = cbs.last_page_in_job; + + DEBUGOUT((__FILE__, w, "XpStartDoc\n")); + XpStartDoc(XtDisplay(w), XPDocNormal); + } + break; + + case XPEndJobNotify: + DEBUGOUT((__FILE__, w, "XPEndJobNotify\n")); + cbs.reason = XawCR_END_JOB; + cbs.event = evp; + cbs.detail = NULL; + cbs.context = None; + cbs.last_page_in_doc = True; + cbs.last_page_in_job = True; + + if (PS_EndJobCallback(w)) + XtCallCallbackList(w, PS_EndJobCallback(w), &cbs); + break; + + default: + DEBUGOUT((__FILE__, w, "XawPrintNotify(default)\n")); + break; + } +} + +static void +XawUpdateResources(Widget w, XPContext pcontext) +{ + XawPrintShellWidget print_shell = (XawPrintShellWidget)w; + String string_resolution; + XRectangle drawable_paper_area; + + string_resolution = XpGetOneAttribute(XtDisplay(w), pcontext, XPDocAttr, "default-printer-resolution"); + if (!string_resolution) { + XtAppWarning(XtWidgetToApplicationContext(w), + "XawPrintShell: XawUpdateResources: Could not get 'default-printer-resolution' XPDocAttr\n"); + } + print_shell->print.print_resolution = atol(string_resolution); + XFree(string_resolution); + + if (print_shell->print.print_resolution == 0) { + XtAppWarning(XtWidgetToApplicationContext(w), + "XawPrintShell: XawUpdateResources: Resolution '0' invalid\n"); + } + + /* Get the paper size... */ + XpGetPageDimensions(XtDisplay(w), pcontext, + &print_shell->print.page_width, &print_shell->print.page_height, + &drawable_paper_area); + /* ... and store it in the widget */ + print_shell->print.min_x = drawable_paper_area.x; + print_shell->print.min_y = drawable_paper_area.y; + print_shell->print.max_x = drawable_paper_area.x + drawable_paper_area.width; + print_shell->print.max_y = drawable_paper_area.y + drawable_paper_area.height; +} + +static void +XawUpdateLayout(Widget w) +{ + XawPrintShellWidget print_shell = (XawPrintShellWidget)w; + + switch( print_shell->print.layoutmode ) + { + case XawPrintLAYOUTMODE_NONE: + break; + case XawPrintLAYOUTMODE_PAGESIZE: + XtResizeWidget(w, + print_shell->print.page_width, + print_shell->print.page_height, + w->core.border_width); + break; + case XawPrintLAYOUTMODE_DRAWABLEAREA: + XtConfigureWidget(w, + print_shell->print.min_x, + print_shell->print.min_y, + print_shell->print.max_x - print_shell->print.min_x, + print_shell->print.max_y - print_shell->print.min_y, + w->core.border_width); + break; + default: + XtAppWarning(XtWidgetToApplicationContext(w), + "XawPrintShell: XawUpdateResources: Invalid layout mode\n"); + break; + } +} + + +/* Update widget attributes+properties when the we receive + * "Xp attribute change"-events (e.g. paper (size/orientation/etc.) + * changed etc.) */ +static void +XawAttributesNotify(Widget w, + XtPointer client, + XEvent *evp, + Boolean *cont) +{ + XawPrintShellWidget print_shell = (XawPrintShellWidget)w; + XPAttributeEvent *xpevp = (XPAttributeEvent *)evp; + + XawUpdateResources(w, xpevp->context); + XawUpdateLayout(w); +} + + + diff --git a/src/Private.h b/src/Private.h index 5bdf73c..a76207a 100644 --- a/src/Private.h +++ b/src/Private.h @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Private.h,v 3.10 1999/06/06 08:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Private.h,v 3.9 1999/05/16 10:12:48 dawes Exp $ */ #ifndef _XawPrivate_h #define _XawPrivate_h diff --git a/src/Repeater.c b/src/Repeater.c index 6c89a1e..c6169ee 100644 --- a/src/Repeater.c +++ b/src/Repeater.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * * This widget is used for press-and-hold style buttons. */ -/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.7 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.6 2001/01/17 19:42:29 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Scrollbar.c b/src/Scrollbar.c index b56a2f8..2d55922 100644 --- a/src/Scrollbar.c +++ b/src/Scrollbar.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.13 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.12 2001/01/17 19:42:29 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Simple.c b/src/Simple.c index bee0d14..db1fc88 100644 --- a/src/Simple.c +++ b/src/Simple.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.c,v 1.17 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.c,v 1.16 2001/09/29 04:36:02 paulo Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/src/SimpleMenu.c b/src/SimpleMenu.c index 037696c..8f61c74 100644 --- a/src/SimpleMenu.c +++ b/src/SimpleMenu.c @@ -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/SimpleMenu.c,v 3.22 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.21 2001/03/23 23:59:15 paulo Exp $ */ /* * SimpleMenu.c - Source code file for SimpleMenu widget. @@ -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.c,v 1.7 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.c,v 1.6 2001/01/17 19:42:31 dawes Exp $ */ /* * Date: September 26, 1989 diff --git a/src/SmeBSB.c b/src/SmeBSB.c index aac727d..e360c3f 100644 --- a/src/SmeBSB.c +++ b/src/SmeBSB.c @@ -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/SmeBSB.c,v 1.12 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.11 2001/01/17 19:42:31 dawes Exp $ */ /* * SmeBSB.c - Source code file for BSB Menu Entry object. diff --git a/src/SmeLine.c b/src/SmeLine.c index 68a995f..c3b39c8 100644 --- a/src/SmeLine.c +++ b/src/SmeLine.c @@ -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/SmeLine.c,v 1.8 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.7 2001/01/17 19:42:31 dawes Exp $ */ /* * Sme.c - Source code for the generic menu entry diff --git a/src/StripChart.c b/src/StripChart.c index dd2bba4..25a84d7 100644 --- a/src/StripChart.c +++ b/src/StripChart.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.8 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> @@ -74,7 +74,7 @@ SOFTWARE. * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.54 2003/12/22 17:48:04 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.53tsi Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/src/TextAction.c b/src/TextAction.c index ee64ba2..dc6d81d 100644 --- a/src/TextAction.c +++ b/src/TextAction.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/TextAction.c,v 3.47 2003/05/27 22:26:36 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.46tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/src/TextPop.c b/src/TextPop.c index 3e8ef1f..b99ac8a 100644 --- a/src/TextPop.c +++ b/src/TextPop.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.21 2003/10/23 21:33:54 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.20tsi Exp $ */ /* * This file is broken up into three sections one dealing with diff --git a/src/TextSink.c b/src/TextSink.c index 4ea0dab..a9e111e 100644 --- a/src/TextSink.c +++ b/src/TextSink.c @@ -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/TextSink.c,v 1.22 2004/01/23 03:57:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.21 2002/06/03 21:39:24 paulo Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/src/TextSrc.c b/src/TextSrc.c index cc004ed..5aa8994 100644 --- a/src/TextSrc.c +++ b/src/TextSrc.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.34 2002/09/22 07:09:05 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.33 2002/09/08 02:29:47 paulo Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/src/TextTr.c b/src/TextTr.c index 16f717c..c918ee6 100644 --- a/src/TextTr.c +++ b/src/TextTr.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/TextTr.c,v 3.16 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.15 2001/01/17 19:42:35 dawes Exp $ */ /* INTERNATIONALIZATION: @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tip.c,v 1.4 1999/07/11 08:49:16 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Toggle.c b/src/Toggle.c index 06b2254..2ec2b11 100644 --- a/src/Toggle.c +++ b/src/Toggle.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/Toggle.c,v 1.9 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.8 2001/08/23 00:03:20 dawes Exp $ */ /* * Author: Chris D. Peterson @@ -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.c,v 1.10 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.c,v 1.9 2001/01/17 19:42:35 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Vendor.c b/src/Vendor.c index b2fbd33..7012f52 100644 --- a/src/Vendor.c +++ b/src/Vendor.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.9 2002/05/31 18:45:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.8 2001/12/14 19:54:45 dawes Exp $ */ /* * This is a copy of Xt/Vendor.c with an additional ClassInitialize @@ -111,11 +111,13 @@ static XtResource resources[] = { * ***************************************************************************/ -#ifdef __UNIXOS2__ +#if defined(__UNIXOS2__) || defined(__CYGWIN__) /* to fix the EditRes problem because of wrong linker semantics */ extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */ extern VendorShellClassRec _XawVendorShellClassRec; extern void _XawFixupVendorShell(); + +#if defined(__UNIXOS2__) unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) { switch (flag) { @@ -130,6 +132,25 @@ unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) return 0; } } +#endif + +#if defined(__CYGWIN__) +int __stdcall +DllMain(unsigned long mod_handle, unsigned long flag, void *routine) +{ + switch (flag) + { + case 1: /* DLL_PROCESS_ATTACH - process attach */ + vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec); + _XawFixupVendorShell(); + break; + case 0: /* DLL_PROCESS_DETACH - process detach */ + break; + } + return 1; +} +#endif + #define vendorShellClassRec _XawVendorShellClassRec #endif @@ -337,7 +358,7 @@ XawVendorShellClassPartInit(WidgetClass cclass) } } -#if defined(__osf__) || defined(__UNIXOS2__) +#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__) /* stupid OSF/1 shared libraries have the wrong semantics */ /* symbols do not get resolved external to the shared library */ void _XawFixupVendorShell() diff --git a/src/Viewport.c b/src/Viewport.c index eafc00c..5cdb8a5 100644 --- a/src/Viewport.c +++ b/src/Viewport.c @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.11 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.10 2001/08/23 00:03:20 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/XawI18n.c b/src/XawI18n.c index 5d600ad..0657fbb 100644 --- a/src/XawI18n.c +++ b/src/XawI18n.c @@ -53,7 +53,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/XawI18n.c,v 1.8 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.7 2001/01/17 19:42:36 dawes Exp $ */ #include <X11/IntrinsicP.h> #include "XawI18n.h" diff --git a/src/XawI18n.h b/src/XawI18n.h index 9b34a7a..e5f35d6 100644 --- a/src/XawI18n.h +++ b/src/XawI18n.h @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/lib/Xaw/XawI18n.h,v 1.1.4.2.4.1 2004/03/04 17:46:50 eich Exp $ */ /* $Xorg: XawI18n.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /************************************************************ @@ -25,7 +26,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/XawI18n.h,v 3.15 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.14 2001/12/14 19:54:46 dawes Exp $ */ #ifdef HAS_WCTYPE_H #include <wctype.h> diff --git a/src/XawIm.c b/src/XawIm.c index 9581d04..69c2f99 100644 --- a/src/XawIm.c +++ b/src/XawIm.c @@ -52,7 +52,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/XawIm.c,v 1.15 2003/05/27 22:26:38 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.14tsi Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/XawInit.c b/src/XawInit.c index 211f014..589ba13 100644 --- a/src/XawInit.c +++ b/src/XawInit.c @@ -2,6 +2,7 @@ * $Xorg: XawInit.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1989, 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 @@ -32,11 +33,13 @@ in this Software without prior written authorization from The Open Group. * call this routine from their ClassInitialize procs (this routine may be * used as the class init proc). */ -/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.10 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.9 2001/01/17 19:42:36 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Vendor.h> #include <X11/Xaw/XawInit.h> +#include <X11/IntrinsicP.h> +#include <X11/StringDefs.h> #include "Private.h" void @@ -53,3 +56,42 @@ XawInitializeWidgetSet(void) XtInitializeWidgetClass(vendorShellWidgetClass); } } + +/* XawOpenApplication() - mainly identical to XtOpenApplication() but + * takes a |Display *| and |Screen *| as arguments, too... */ +Widget XawOpenApplication(XtAppContext *app_context_return, + Display *dpy, + Screen *screen, + String application_name, + String application_class, + WidgetClass widget_class, + int *argc, + String *argv) +{ + Widget toplevel; + Cardinal n; + Arg args[2]; + + XtToolkitInitialize(); + *app_context_return = XtCreateApplicationContext(); + if( *app_context_return == NULL ) + return NULL; + + XtDisplayInitialize(*app_context_return, dpy, + application_name, application_class, + NULL, 0, + argc, argv); + + n = 0; + if (screen) { + XtSetArg(args[n], XtNscreen, screen); n++; + } + toplevel = XtAppCreateShell(application_name, + application_class, + widget_class, + dpy, + args, n); + + return toplevel; +} + diff --git a/src/sharedlib.c b/src/sharedlib.c index c93e964..8220a69 100644 --- a/src/sharedlib.c +++ b/src/sharedlib.c @@ -59,6 +59,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xaw/TreeP.h> #include <X11/VendorP.h> #include <X11/Xaw/ViewportP.h> +#include <X11/Xaw/PrintSP.h> extern AsciiSinkClassRec asciiSinkClassRec; WidgetClass asciiSinkObjectClass = (WidgetClass)&asciiSinkClassRec; @@ -168,4 +169,7 @@ WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec; extern ViewportClassRec viewportClassRec; WidgetClass viewportWidgetClass = (WidgetClass)&viewportClassRec; +extern XawPrintShellClassRec xawPrintShellClassRec; +WidgetClass xawPrintShellWidgetClass = (WidgetClass) &xawPrintShellClassRec; + #endif /* SUNSHLIB */ |