diff options
Diffstat (limited to 'xc/lib/Xaw')
116 files changed, 428 insertions, 296 deletions
diff --git a/xc/lib/Xaw/AllWidgets.c b/xc/lib/Xaw/AllWidgets.c index 2fcf96670..1ccc4d730 100644 --- a/xc/lib/Xaw/AllWidgets.c +++ b/xc/lib/Xaw/AllWidgets.c @@ -1,4 +1,4 @@ -/* $TOG: AllWidgets.c /main/9 1998/02/06 12:43:49 kaleb $ */ +/* $Xorg: AllWidgets.c,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ /* diff --git a/xc/lib/Xaw/AllWidgets.h b/xc/lib/Xaw/AllWidgets.h index 7e33c640c..d5e1b2759 100644 --- a/xc/lib/Xaw/AllWidgets.h +++ b/xc/lib/Xaw/AllWidgets.h @@ -1,5 +1,5 @@ /* - * $TOG: AllWidgets.h /main/4 1998/02/06 12:43:57 kaleb $ + * $Xorg: AllWidgets.h,v 1.4 2000/08/17 19:45:30 cpqbld Exp $ * Copyright 1990, 1998 The Open Group @@ -23,6 +23,8 @@ in this Software without prior written authorization from The Open Group. #ifndef _XawAllWidgets_h #define _XawAllWidgets_h +#include <X11/Xmu/WidgetNode.h> + /* * This file matches the generated AllWidgets.c */ diff --git a/xc/lib/Xaw/AsciiSink.c b/xc/lib/Xaw/AsciiSink.c index a872fe4a6..ae61dcd99 100644 --- a/xc/lib/Xaw/AsciiSink.c +++ b/xc/lib/Xaw/AsciiSink.c @@ -1,4 +1,4 @@ -/* $TOG: AsciiSink.c /main/63 1998/02/06 12:44:08 kaleb $ */ +/* $Xorg: AsciiSink.c,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.22 2000/09/26 15:56:53 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.23 2001/01/17 19:42:24 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/AsciiSink.h b/xc/lib/Xaw/AsciiSink.h index a25282063..4fc0bd7af 100644 --- a/xc/lib/Xaw/AsciiSink.h +++ b/xc/lib/Xaw/AsciiSink.h @@ -1,5 +1,5 @@ /* - * $TOG: AsciiSink.h /main/10 1998/02/06 12:44:13 kaleb $ + * $Xorg: AsciiSink.h,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ /*********************************************************** @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.4 1998/10/03 08:41:59 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/xc/lib/Xaw/AsciiSinkP.h b/xc/lib/Xaw/AsciiSinkP.h index 7bb45bd73..9c8d8efa9 100644 --- a/xc/lib/Xaw/AsciiSinkP.h +++ b/xc/lib/Xaw/AsciiSinkP.h @@ -1,5 +1,5 @@ /* -* $TOG: AsciiSinkP.h /main/5 1998/02/06 12:44:02 kaleb $ +* $Xorg: AsciiSinkP.h,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.8 1999/06/20 08:40:55 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/xc/lib/Xaw/AsciiSrc.c b/xc/lib/Xaw/AsciiSrc.c index 097d0555f..674d41989 100644 --- a/xc/lib/Xaw/AsciiSrc.c +++ b/xc/lib/Xaw/AsciiSrc.c @@ -1,4 +1,4 @@ -/* $TOG: AsciiSrc.c /main/69 1998/05/14 14:55:34 kaleb $ */ +/* $Xorg: AsciiSrc.c,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ /* @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.25 2000/11/28 17:25:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.27 2001/01/26 22:35:23 herrb Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). @@ -1456,7 +1456,7 @@ InitStringOrFile(AsciiSrcObject src, Bool newString) open_mode = O_WRONLY | O_CREAT | O_EXCL; fdopen_mode = "w"; } - else + else { /* O_NOFOLLOW is a FreeBSD & Linux extension */ #ifdef O_NOFOLLOW open_mode = O_RDWR | O_NOFOLLOW; @@ -1464,6 +1464,7 @@ InitStringOrFile(AsciiSrcObject src, Bool newString) open_mode = O_RDWR; /* unsafe; subject to race conditions */ #endif /* O_NOFOLLOW */ fdopen_mode = "r+"; + } break; default: XtErrorMsg("badMode", "asciiSourceCreate", "XawError", diff --git a/xc/lib/Xaw/AsciiSrc.h b/xc/lib/Xaw/AsciiSrc.h index e4d11e60f..611c500ba 100644 --- a/xc/lib/Xaw/AsciiSrc.h +++ b/xc/lib/Xaw/AsciiSrc.h @@ -1,4 +1,4 @@ -/* $TOG: AsciiSrc.h /main/17 1998/02/11 14:53:05 kaleb $ */ +/* $Xorg: AsciiSrc.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ /* @@ -21,7 +21,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.6 1999/05/09 10:51:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/AsciiSrcP.h b/xc/lib/Xaw/AsciiSrcP.h index 4513eb4b5..2749875d5 100644 --- a/xc/lib/Xaw/AsciiSrcP.h +++ b/xc/lib/Xaw/AsciiSrcP.h @@ -1,5 +1,5 @@ /* -* $TOG: AsciiSrcP.h /main/13 1998/06/24 11:53:13 kaleb $ +* $Xorg: AsciiSrcP.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.7 1999/06/20 08:40:57 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/xc/lib/Xaw/AsciiText.c b/xc/lib/Xaw/AsciiText.c index f4d6d52bb..76ca7db7d 100644 --- a/xc/lib/Xaw/AsciiText.c +++ b/xc/lib/Xaw/AsciiText.c @@ -1,4 +1,4 @@ -/* $TOG: AsciiText.c /main/49 1998/02/11 14:53:14 kaleb $ */ +/* $Xorg: AsciiText.c,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ /* @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.8 1999/06/13 13:47:15 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 diff --git a/xc/lib/Xaw/AsciiText.h b/xc/lib/Xaw/AsciiText.h index 3772b0f10..4001a5c2d 100644 --- a/xc/lib/Xaw/AsciiText.h +++ b/xc/lib/Xaw/AsciiText.h @@ -1,5 +1,5 @@ /* - * $TOG: AsciiText.h /main/20 1998/02/11 14:53:18 kaleb $ + * $Xorg: AsciiText.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ /*********************************************************** @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.4 1998/10/03 08:42:01 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/xc/lib/Xaw/AsciiTextP.h b/xc/lib/Xaw/AsciiTextP.h index 806dfe640..ef24deab2 100644 --- a/xc/lib/Xaw/AsciiTextP.h +++ b/xc/lib/Xaw/AsciiTextP.h @@ -1,5 +1,5 @@ /* - * $TOG: AsciiTextP.h /main/19 1998/02/11 14:53:10 kaleb $ + * $Xorg: AsciiTextP.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ /*********************************************************** @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.7 1999/06/20 08:40:57 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/xc/lib/Xaw/Box.c b/xc/lib/Xaw/Box.c index 1ff4c1734..75932ca35 100644 --- a/xc/lib/Xaw/Box.c +++ b/xc/lib/Xaw/Box.c @@ -1,4 +1,4 @@ -/* $TOG: Box.c /main/50 1998/02/06 12:44:59 kaleb $ */ +/* $Xorg: Box.c,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.c,v 1.13 1999/06/06 08:47:53 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/xc/lib/Xaw/Box.h b/xc/lib/Xaw/Box.h index baaf140c6..6eb7b680e 100644 --- a/xc/lib/Xaw/Box.h +++ b/xc/lib/Xaw/Box.h @@ -1,5 +1,5 @@ /* -* $TOG: Box.h /main/23 1998/02/06 12:45:05 kaleb $ +* $Xorg: Box.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.h,v 1.6 1999/06/06 08:47:53 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/xc/lib/Xaw/BoxP.h b/xc/lib/Xaw/BoxP.h index 479b71237..8ee3136f9 100644 --- a/xc/lib/Xaw/BoxP.h +++ b/xc/lib/Xaw/BoxP.h @@ -1,5 +1,5 @@ /* -* $TOG: BoxP.h /main/19 1998/02/06 12:44:53 kaleb $ +* $Xorg: BoxP.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.9 1999/06/20 08:40:57 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/xc/lib/Xaw/Cardinals.h b/xc/lib/Xaw/Cardinals.h index 91dd87683..be31c2e1d 100644 --- a/xc/lib/Xaw/Cardinals.h +++ b/xc/lib/Xaw/Cardinals.h @@ -1,4 +1,4 @@ -/* $TOG: Cardinals.h /main/7 1998/02/06 12:45:10 kaleb $ */ +/* $Xorg: Cardinals.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group diff --git a/xc/lib/Xaw/Command.c b/xc/lib/Xaw/Command.c index c29d1e89f..d4aff11c2 100644 --- a/xc/lib/Xaw/Command.c +++ b/xc/lib/Xaw/Command.c @@ -1,4 +1,4 @@ -/* $TOG: Command.c /main/80 1998/02/06 12:45:20 kaleb $ */ +/* $Xorg: Command.c,v 1.4 2000/08/17 19:45:31 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.c,v 1.11 1999/06/13 13:47:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.c,v 1.12 2001/01/17 19:42:26 dawes Exp $ */ /* * Command.c - Command button widget diff --git a/xc/lib/Xaw/Command.h b/xc/lib/Xaw/Command.h index 38d417914..2b7c2bb5c 100644 --- a/xc/lib/Xaw/Command.h +++ b/xc/lib/Xaw/Command.h @@ -1,4 +1,4 @@ -/* $TOG: Command.h /main/30 1998/02/06 12:45:25 kaleb $ */ +/* $Xorg: Command.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.h,v 1.4 1998/10/03 08:42:03 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/xc/lib/Xaw/CommandP.h b/xc/lib/Xaw/CommandP.h index 516b86146..b92b39f16 100644 --- a/xc/lib/Xaw/CommandP.h +++ b/xc/lib/Xaw/CommandP.h @@ -1,5 +1,5 @@ /* -* $TOG: CommandP.h /main/28 1998/02/06 12:45:15 kaleb $ +* $Xorg: CommandP.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.6 1999/06/20 08:40:58 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/xc/lib/Xaw/Dialog.c b/xc/lib/Xaw/Dialog.c index aabd161bd..7eec21241 100644 --- a/xc/lib/Xaw/Dialog.c +++ b/xc/lib/Xaw/Dialog.c @@ -1,4 +1,4 @@ -/* $TOG: Dialog.c /main/49 1998/02/06 12:45:36 kaleb $ */ +/* $Xorg: Dialog.c,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.6 2000/06/13 23:15:48 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/xc/lib/Xaw/Dialog.h b/xc/lib/Xaw/Dialog.h index 4a5863b86..0d2dff730 100644 --- a/xc/lib/Xaw/Dialog.h +++ b/xc/lib/Xaw/Dialog.h @@ -1,4 +1,4 @@ -/* $TOG: Dialog.h /main/29 1998/02/06 12:45:41 kaleb $ */ +/* $Xorg: Dialog.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.4 1998/10/03 08:42:04 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/xc/lib/Xaw/DialogP.h b/xc/lib/Xaw/DialogP.h index 3e4054ba0..f18f26057 100644 --- a/xc/lib/Xaw/DialogP.h +++ b/xc/lib/Xaw/DialogP.h @@ -1,4 +1,4 @@ -/* $TOG: DialogP.h /main/14 1998/02/06 12:45:30 kaleb $ */ +/* $Xorg: DialogP.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.7 1999/06/20 08:40:59 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/xc/lib/Xaw/Form.c b/xc/lib/Xaw/Form.c index 863d2e845..619c08ade 100644 --- a/xc/lib/Xaw/Form.c +++ b/xc/lib/Xaw/Form.c @@ -1,4 +1,4 @@ -/* $TOG: Form.c /main/54 1998/05/14 14:55:45 kaleb $ */ +/* $Xorg: Form.c,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -43,7 +43,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.c,v 1.18 2000/10/26 17:57:49 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> @@ -582,6 +582,11 @@ Layout(FormWidget fw, unsigned int width, unsigned int height, always_resize_children = ChangeFormGeometry((Widget)fw, False, maxx, maxy, NULL, NULL); +#ifdef OLDXAW + fw->form.old_width = fw->core.width; + fw->form.old_height = fw->core.height; +#endif + if (force_relayout) ret_val = True; else @@ -656,7 +661,6 @@ ResizeChildren(Widget w) static void LayoutChild(Widget w) { - FormWidget fw = (FormWidget)XtParent(w); FormConstraints form = (FormConstraints)w->core.constraints; Widget ref; @@ -684,22 +688,16 @@ LayoutChild(Widget w) form->form.new_y = form->form.dy; if ((ref = form->form.horiz_base) != NULL) { FormConstraints ref_form = (FormConstraints)ref->core.constraints; - Dimension width; LayoutChild(ref); - width = fw->form.old_width ? - ref_form->form.virtual_width : XtWidth(ref); - form->form.new_x += ref_form->form.new_x + width + + form->form.new_x += ref_form->form.new_x + XtWidth(ref) + (XtBorderWidth(ref) << 1); } if ((ref = form->form.vert_base) != NULL) { FormConstraints ref_form = (FormConstraints)ref->core.constraints; - Dimension height; LayoutChild(ref); - height = fw->form.old_height ? - ref_form->form.virtual_height : XtHeight(ref); - form->form.new_y += ref_form->form.new_y + height + + form->form.new_y += ref_form->form.new_y + XtHeight(ref) + (XtBorderWidth(ref) << 1); } @@ -891,8 +889,6 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request, * The window will be updated when no_refigure is set back * to False */ - form->form.virtual_width = XtWidth(w); - form->form.virtual_height = XtHeight(w); form->form.deferred_resize = True; ret_val = XtGeometryDone; } @@ -902,6 +898,8 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request, /* * Resets everything. */ + fw->form.old_width = XtWidth(fw); + fw->form.old_height = XtHeight(fw); for (childP = children; childP - children < num_children; childP++) { Widget nw = *childP; @@ -916,8 +914,6 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request, nform->form.virtual_height = XtHeight(nw); } } - fw->form.old_width = XtWidth(fw); - fw->form.old_height = XtHeight(fw); } else { XtWidth(w) = old_width; @@ -1022,23 +1018,21 @@ XawFormChangeManaged(Widget w) (*((FormWidgetClass)w->core.widget_class)->form_class.layout) (fw, XtWidth(w), XtHeight(w), True); - if (!fw->form.old_width || !fw->form.old_height) { - fw->form.old_width = XtWidth(w); - fw->form.old_height = XtHeight(w); - for (children = childP = fw->composite.children; - childP - children < num_children; - childP++) { - child = *childP; - if (!XtIsManaged(child)) - continue; - form = (FormConstraints)child->core.constraints; + fw->form.old_width = XtWidth(w); + fw->form.old_height = XtHeight(w); + for (children = childP = fw->composite.children; + childP - children < num_children; + childP++) { + child = *childP; + if (!XtIsManaged(child)) + continue; + form = (FormConstraints)child->core.constraints; #ifndef OLDXAW - form->form.virtual_x = XtX(child); - form->form.virtual_y = XtY(child); + form->form.virtual_x = XtX(child); + form->form.virtual_y = XtY(child); #endif - form->form.virtual_width = XtWidth(child); - form->form.virtual_height = XtHeight(child); - } + form->form.virtual_width = XtWidth(child); + form->form.virtual_height = XtHeight(child); } } diff --git a/xc/lib/Xaw/Form.h b/xc/lib/Xaw/Form.h index 56dfbb30e..fcad058ed 100644 --- a/xc/lib/Xaw/Form.h +++ b/xc/lib/Xaw/Form.h @@ -1,4 +1,4 @@ -/* $TOG: Form.h /main/31 1998/02/06 12:45:58 kaleb $ */ +/* $Xorg: Form.h,v 1.4 2000/08/17 19:45:32 cpqbld Exp $ */ /*********************************************************** @@ -43,12 +43,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.h,v 1.7 1999/06/06 08:47:56 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 -#include <X11/Constraint.h> +#include <X11/Intrinsic.h> /* Resources: diff --git a/xc/lib/Xaw/FormP.h b/xc/lib/Xaw/FormP.h index 8134ce5c1..c06fe3bb3 100644 --- a/xc/lib/Xaw/FormP.h +++ b/xc/lib/Xaw/FormP.h @@ -1,4 +1,4 @@ -/* $TOG: FormP.h /main/23 1998/02/06 12:45:46 kaleb $ */ +/* $Xorg: FormP.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/FormP.h,v 1.11 1999/06/20 08:41:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/FormP.h,v 1.12 2001/01/17 19:42:26 dawes Exp $ */ /* Form widget private definitions */ diff --git a/xc/lib/Xaw/Grip.c b/xc/lib/Xaw/Grip.c index c8ac68c3d..d66eeee1f 100644 --- a/xc/lib/Xaw/Grip.c +++ b/xc/lib/Xaw/Grip.c @@ -1,4 +1,4 @@ -/* $TOG: Grip.c /main/34 1998/02/06 12:46:09 kaleb $ */ +/* $Xorg: Grip.c,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.c,v 1.6 1999/06/06 08:47:57 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/xc/lib/Xaw/Grip.h b/xc/lib/Xaw/Grip.h index fe861ac7d..125c455c4 100644 --- a/xc/lib/Xaw/Grip.h +++ b/xc/lib/Xaw/Grip.h @@ -1,4 +1,4 @@ -/* $TOG: Grip.h /main/20 1998/02/06 12:46:14 kaleb $ */ +/* $Xorg: Grip.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.h,v 1.5 1999/06/06 08:47:57 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/xc/lib/Xaw/GripP.h b/xc/lib/Xaw/GripP.h index ac2d82c27..2dce6312a 100644 --- a/xc/lib/Xaw/GripP.h +++ b/xc/lib/Xaw/GripP.h @@ -1,5 +1,5 @@ /* -* $TOG: GripP.h /main/16 1998/02/06 12:46:03 kaleb $ +* $Xorg: GripP.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/GripP.h,v 1.6 1999/06/20 08:41:01 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/xc/lib/Xaw/Imakefile b/xc/lib/Xaw/Imakefile index 73df2c7cb..ac90b1687 100644 --- a/xc/lib/Xaw/Imakefile +++ b/xc/lib/Xaw/Imakefile @@ -1,5 +1,10 @@ -XCOMM $XConsortium: Imakefile /main/87 1996/09/28 16:43:34 rws $ -XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.9 2000/05/18 16:29:52 dawes Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ + + + + +XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.10 2001/01/17 19:42:27 dawes Exp $ + #define DoNormalLib NormalLibXaw #define DoSharedLib SharedLibXaw #define DoExtraLib SharedLibXaw diff --git a/xc/lib/Xaw/Label.c b/xc/lib/Xaw/Label.c index b62fa46ad..5ab12a78a 100644 --- a/xc/lib/Xaw/Label.c +++ b/xc/lib/Xaw/Label.c @@ -1,4 +1,4 @@ -/* $TOG: Label.c /main/98 1998/02/06 12:46:24 kaleb $ */ +/* $Xorg: Label.c,v 1.4 2000/08/17 19:45:33 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.c,v 1.11 1999/06/27 14:07:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.c,v 1.12 2001/01/17 19:42:27 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/Xaw/Label.h b/xc/lib/Xaw/Label.h index 649d39b9a..c9503817e 100644 --- a/xc/lib/Xaw/Label.h +++ b/xc/lib/Xaw/Label.h @@ -1,4 +1,4 @@ -/* $TOG: Label.h /main/35 1998/02/06 12:46:30 kaleb $ */ +/* $Xorg: Label.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.h,v 1.5 1998/10/03 08:42:06 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/xc/lib/Xaw/LabelP.h b/xc/lib/Xaw/LabelP.h index 55b20ac6f..dd8740851 100644 --- a/xc/lib/Xaw/LabelP.h +++ b/xc/lib/Xaw/LabelP.h @@ -1,5 +1,5 @@ /* -* $TOG: LabelP.h /main/30 1998/02/06 12:46:19 kaleb $ +* $Xorg: LabelP.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.6 1999/06/20 08:41:02 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/xc/lib/Xaw/List.c b/xc/lib/Xaw/List.c index 41876abff..c09daad23 100644 --- a/xc/lib/Xaw/List.c +++ b/xc/lib/Xaw/List.c @@ -1,4 +1,4 @@ -/* $TOG: List.c /main/38 1998/02/11 14:53:23 kaleb $ */ +/* $Xorg: List.c,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.15 2000/04/04 22:36:42 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/xc/lib/Xaw/List.h b/xc/lib/Xaw/List.h index 3c695a18e..db5933b23 100644 --- a/xc/lib/Xaw/List.h +++ b/xc/lib/Xaw/List.h @@ -1,4 +1,4 @@ -/* $TOG: List.h /main/21 1998/02/11 14:53:28 kaleb $ */ +/* $Xorg: List.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.6 2000/02/25 18:27:58 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/xc/lib/Xaw/ListP.h b/xc/lib/Xaw/ListP.h index ad68726ac..a08beb3df 100644 --- a/xc/lib/Xaw/ListP.h +++ b/xc/lib/Xaw/ListP.h @@ -1,4 +1,4 @@ -/* $TOG: ListP.h /main/13 1998/02/06 12:46:36 kaleb $ */ +/* $Xorg: ListP.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.7 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ListP.h,v 1.8 2001/01/17 19:42:27 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/MenuButtoP.h b/xc/lib/Xaw/MenuButtoP.h index 7110fa0c9..814c6dde1 100644 --- a/xc/lib/Xaw/MenuButtoP.h +++ b/xc/lib/Xaw/MenuButtoP.h @@ -1,4 +1,4 @@ -/* $TOG: MenuButtoP.h /main/10 1998/02/11 14:53:41 kaleb $ +/* $Xorg: MenuButtoP.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ * Copyright 1989,1998 The Open Group @@ -18,7 +18,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.6 1999/06/20 08:41:02 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/xc/lib/Xaw/MenuButton.c b/xc/lib/Xaw/MenuButton.c index 361667333..958ac4319 100644 --- a/xc/lib/Xaw/MenuButton.c +++ b/xc/lib/Xaw/MenuButton.c @@ -1,4 +1,4 @@ -/* $TOG: MenuButton.c /main/24 1998/06/24 11:53:20 kaleb $ */ +/* $Xorg: MenuButton.c,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.7 1999/06/06 08:47:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.8 2001/01/17 19:42:27 dawes Exp $ */ /* * MenuButton.c - Source code for MenuButton widget. diff --git a/xc/lib/Xaw/MenuButton.h b/xc/lib/Xaw/MenuButton.h index b7ff60cef..4a18808c5 100644 --- a/xc/lib/Xaw/MenuButton.h +++ b/xc/lib/Xaw/MenuButton.h @@ -1,5 +1,5 @@ /* - * $TOG: MenuButton.h /main/11 1998/02/11 14:53:37 kaleb $ + * $Xorg: MenuButton.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.4 1998/10/03 08:42:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xaw/MultiSink.c b/xc/lib/Xaw/MultiSink.c index 1b6ec5d17..ca02408df 100644 --- a/xc/lib/Xaw/MultiSink.c +++ b/xc/lib/Xaw/MultiSink.c @@ -1,4 +1,4 @@ -/* $TOG: MultiSink.c /main/7 1998/02/06 12:47:13 kaleb $ */ +/* $Xorg: MultiSink.c,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -66,7 +66,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.18 2000/09/26 15:56:54 tsi 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/xc/lib/Xaw/MultiSink.h b/xc/lib/Xaw/MultiSink.h index 679329fde..934bca8aa 100644 --- a/xc/lib/Xaw/MultiSink.h +++ b/xc/lib/Xaw/MultiSink.h @@ -1,4 +1,4 @@ -/* $TOG: MultiSink.h /main/3 1998/02/06 12:47:18 kaleb $ */ +/* $Xorg: MultiSink.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -66,7 +66,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.4 1998/10/03 08:42:09 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/xc/lib/Xaw/MultiSinkP.h b/xc/lib/Xaw/MultiSinkP.h index 436aeccf4..bad467036 100644 --- a/xc/lib/Xaw/MultiSinkP.h +++ b/xc/lib/Xaw/MultiSinkP.h @@ -1,4 +1,4 @@ -/* $TOG: MultiSinkP.h /main/3 1998/02/06 12:47:08 kaleb $ */ +/* $Xorg: MultiSinkP.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -67,7 +67,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.7 1999/06/20 08:41:02 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/xc/lib/Xaw/MultiSrc.c b/xc/lib/Xaw/MultiSrc.c index b917e671c..efc844b0d 100644 --- a/xc/lib/Xaw/MultiSrc.c +++ b/xc/lib/Xaw/MultiSrc.c @@ -1,4 +1,4 @@ -/* $TOG: MultiSrc.c /main/12 1998/05/14 14:55:50 kaleb $ */ +/* $Xorg: MultiSrc.c,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -27,7 +27,7 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19 1999/07/19 13:36:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.21 2001/01/26 22:45:59 herrb Exp $ */ /* @@ -67,6 +67,10 @@ in this Software without prior written authorization from The Open Group. #include "XawI18n.h" #include "Private.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + #define MAGIC_VALUE ((XawTextPosition)-1) #define streq(a, b) (strcmp((a), (b)) == 0) @@ -1158,7 +1162,9 @@ StorePiecesInString(MultiSrcObject src) static FILE * InitStringOrFile(MultiSrcObject src, Bool newString) { - char *open_mode = NULL; + mode_t open_mode; + const char *fdopen_mode = NULL; + int fd; FILE *file; char fileName[TMPSIZ]; Display *d = XtDisplayOfObject((Widget)src); @@ -1208,7 +1214,8 @@ InitStringOrFile(MultiSrcObject src, Bool newString) XtErrorMsg("NoFile", "multiSourceCreate", "XawError", "Creating a read only disk widget and no file specified.", NULL, 0); - open_mode = "r"; + open_mode = O_RDONLY; + fdopen_mode = "r"; break; case XawtextAppend: case XawtextEdit: @@ -1218,10 +1225,18 @@ InitStringOrFile(MultiSrcObject src, Bool newString) (void)tmpnam((char *)src->multi_src.string); src->multi_src.is_tempfile = True; - open_mode = "w"; + open_mode = O_WRONLY | O_CREAT | O_EXCL; + fdopen_mode = "w"; + } + else { +/* O_NOFOLLOW is a BSD & Linux extension */ +#ifdef O_NOFOLLOW + open_mode = O_RDWR | O_NOFOLLOW; +#else + open_mode = O_RDWR; /* unsafe; subject to race conditions */ +#endif + fdopen_mode = "r+"; } - else - open_mode = "r+"; break; default: XtErrorMsg("badMode", "multiSourceCreate", "XawError", @@ -1243,12 +1258,14 @@ InitStringOrFile(MultiSrcObject src, Bool newString) } if (!src->multi_src.is_tempfile) { - if ((file = fopen((char *)src->multi_src.string, open_mode)) != NULL) { - (void)fseek(file, 0, 2); - src->multi_src.length = ftell(file); - return file; + if ((fd = open((char *)src->multi_src.string, open_mode, 0666)) != 0) { + if ((file = fdopen(fd, fdopen_mode)) != NULL) { + (void)fseek(file, 0, SEEK_END); + src->multi_src.length = (XawTextPosition)ftell(file); + return(file); + } } - else { + { String params[2]; Cardinal num_params = 2; @@ -1258,7 +1275,7 @@ InitStringOrFile(MultiSrcObject src, Bool newString) "openError", "multiSourceCreate", "XawWarning", "Cannot open file %s; %s", params, &num_params); } - } + } src->multi_src.length = 0; return (NULL); } diff --git a/xc/lib/Xaw/MultiSrc.h b/xc/lib/Xaw/MultiSrc.h index 586c06d50..9d9538c0b 100644 --- a/xc/lib/Xaw/MultiSrc.h +++ b/xc/lib/Xaw/MultiSrc.h @@ -1,4 +1,4 @@ -/* $TOG: MultiSrc.h /main/3 1998/02/06 12:47:36 kaleb $ */ +/* $Xorg: MultiSrc.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -45,7 +45,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.5 1999/05/09 10:51:39 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/xc/lib/Xaw/MultiSrcP.h b/xc/lib/Xaw/MultiSrcP.h index 71e58c0bb..f54ad66b2 100644 --- a/xc/lib/Xaw/MultiSrcP.h +++ b/xc/lib/Xaw/MultiSrcP.h @@ -1,4 +1,4 @@ -/* $TOG: MultiSrcP.h /main/5 1998/06/24 11:53:25 kaleb $ */ +/* $Xorg: MultiSrcP.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -67,7 +67,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.7 1999/06/20 08:41:03 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/xc/lib/Xaw/Paned.c b/xc/lib/Xaw/Paned.c index 6fb6bb52b..25b69f165 100644 --- a/xc/lib/Xaw/Paned.c +++ b/xc/lib/Xaw/Paned.c @@ -1,4 +1,4 @@ -/* $TOG: Paned.c /main/29 1998/02/11 14:53:59 kaleb $ */ +/* $Xorg: Paned.c,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.c,v 1.9 1999/06/06 08:48:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.c,v 1.10 2001/01/17 19:42:28 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/xc/lib/Xaw/Paned.h b/xc/lib/Xaw/Paned.h index aa6763b5e..7f3c08818 100644 --- a/xc/lib/Xaw/Paned.h +++ b/xc/lib/Xaw/Paned.h @@ -1,5 +1,5 @@ /* -* $TOG: Paned.h /main/17 1998/02/11 14:54:05 kaleb $ +* $Xorg: Paned.h,v 1.4 2000/08/17 19:45:35 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.h,v 1.5 1999/05/03 12:15:42 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. @@ -62,7 +62,7 @@ SOFTWARE. #ifndef _XawPaned_h #define _XawPaned_h -#include <X11/Constraint.h> +#include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> /* RESOURCES: diff --git a/xc/lib/Xaw/PanedP.h b/xc/lib/Xaw/PanedP.h index 9a4ea3236..ae044a8fb 100644 --- a/xc/lib/Xaw/PanedP.h +++ b/xc/lib/Xaw/PanedP.h @@ -1,6 +1,6 @@ /*********************************************************** - $TOG: PanedP.h /main/8 1998/02/11 14:53:55 kaleb $ + $Xorg: PanedP.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ Copyright 1987, 1988, 1998 The Open Group @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.6 1999/06/20 08:41:04 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/xc/lib/Xaw/Panner.c b/xc/lib/Xaw/Panner.c index 6be4ac896..9e8d6967d 100644 --- a/xc/lib/Xaw/Panner.c +++ b/xc/lib/Xaw/Panner.c @@ -1,5 +1,5 @@ /* - * $TOG: Panner.c /main/54 1998/02/11 14:54:13 kaleb $ + * $Xorg: Panner.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -22,7 +22,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.5 1999/06/06 08:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.c,v 3.6 2001/01/17 19:42:28 dawes Exp $ */ #include <ctype.h> #include <math.h> diff --git a/xc/lib/Xaw/Panner.h b/xc/lib/Xaw/Panner.h index 5af7ca759..de1b77965 100644 --- a/xc/lib/Xaw/Panner.h +++ b/xc/lib/Xaw/Panner.h @@ -1,5 +1,5 @@ /* - * $TOG: Panner.h /main/24 1998/02/11 14:54:19 kaleb $ + * $Xorg: Panner.h,v 1.4 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -21,11 +21,12 @@ 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.4 1998/10/03 08:42:14 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 +#include <X11/Intrinsic.h> #include <X11/Xaw/Reports.h> /***************************************************************************** diff --git a/xc/lib/Xaw/PannerP.h b/xc/lib/Xaw/PannerP.h index 50951e88d..838c650cd 100644 --- a/xc/lib/Xaw/PannerP.h +++ b/xc/lib/Xaw/PannerP.h @@ -1,5 +1,5 @@ /* - * $TOG: PannerP.h /main/21 1998/02/11 14:54:09 kaleb $ + * $Xorg: PannerP.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -21,7 +21,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.6 1999/06/20 08:41:04 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/xc/lib/Xaw/Pixmap.c b/xc/lib/Xaw/Pixmap.c index f64bf87af..4793e90f9 100644 --- a/xc/lib/Xaw/Pixmap.c +++ b/xc/lib/Xaw/Pixmap.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.15 2000/09/26 15:56:54 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.16 2001/01/30 15:03:34 paulo Exp $ */ #include <string.h> #include <stdio.h> @@ -437,7 +437,7 @@ _XawFindCache(XawCache *xaw, cache = (XawCache **)bsearch(screen, xaw->elems, xaw->num_elems, sizeof(XtPointer), bcmp_long); - if (!cache) + if (!cache || !(*cache)->num_elems) return (NULL); if (flags == FIND_SCREEN) return (*cache); @@ -446,7 +446,7 @@ _XawFindCache(XawCache *xaw, cache = (XawCache **)bsearch((void *)colormap, (*cache)->elems, (*cache)->num_elems, sizeof(XtPointer), bcmp_long); - if (!cache) + if (!cache || !(*cache)->num_elems) return (NULL); if (flags == FIND_COLORMAP) return (*cache); @@ -456,7 +456,7 @@ _XawFindCache(XawCache *xaw, (*cache)->num_elems, sizeof(XtPointer), bcmp_long); - if (!cache) + if (!cache || !(*cache)->num_elems) return (NULL); return (*cache); } diff --git a/xc/lib/Xaw/Porthole.c b/xc/lib/Xaw/Porthole.c index 02a4307dd..099fcf351 100644 --- a/xc/lib/Xaw/Porthole.c +++ b/xc/lib/Xaw/Porthole.c @@ -1,5 +1,5 @@ /* - * $TOG: Porthole.c /main/18 1998/02/11 14:54:27 kaleb $ + * $Xorg: Porthole.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -24,7 +24,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.5 1999/06/06 08:48:06 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/xc/lib/Xaw/Porthole.h b/xc/lib/Xaw/Porthole.h index fb929145b..b4becadfc 100644 --- a/xc/lib/Xaw/Porthole.h +++ b/xc/lib/Xaw/Porthole.h @@ -1,5 +1,5 @@ /* - * $TOG: Porthole.h /main/4 1998/02/11 14:54:31 kaleb $ + * $Xorg: Porthole.h,v 1.4 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1990, 1998 The Open Group @@ -21,11 +21,12 @@ 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.4 1998/10/03 08:42:15 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 +#include <X11/Intrinsic.h> #include <X11/Xaw/Reports.h> /***************************************************************************** diff --git a/xc/lib/Xaw/PortholeP.h b/xc/lib/Xaw/PortholeP.h index a6dabd82c..6684b0e25 100644 --- a/xc/lib/Xaw/PortholeP.h +++ b/xc/lib/Xaw/PortholeP.h @@ -1,5 +1,5 @@ /* - * $TOG: PortholeP.h /main/5 1998/02/11 14:54:23 kaleb $ + * $Xorg: PortholeP.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -21,7 +21,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.6 1999/06/20 08:41:04 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/xc/lib/Xaw/Repeater.c b/xc/lib/Xaw/Repeater.c index f8fc16cdc..cf25034eb 100644 --- a/xc/lib/Xaw/Repeater.c +++ b/xc/lib/Xaw/Repeater.c @@ -1,5 +1,5 @@ /* - * $TOG: Repeater.c /main/13 1998/02/11 14:54:39 kaleb $ + * $Xorg: Repeater.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -23,7 +23,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.5 1999/06/06 08:48:07 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/xc/lib/Xaw/Repeater.h b/xc/lib/Xaw/Repeater.h index e2cf08f2d..f7d2a05dc 100644 --- a/xc/lib/Xaw/Repeater.h +++ b/xc/lib/Xaw/Repeater.h @@ -1,5 +1,5 @@ /* - * $TOG: Repeater.h /main/6 1998/02/11 14:54:43 kaleb $ + * $Xorg: Repeater.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -21,7 +21,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.4 1998/10/03 08:42:16 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/xc/lib/Xaw/RepeaterP.h b/xc/lib/Xaw/RepeaterP.h index 4fcbb51a7..a656322d5 100644 --- a/xc/lib/Xaw/RepeaterP.h +++ b/xc/lib/Xaw/RepeaterP.h @@ -1,5 +1,5 @@ /* - * $TOG: RepeaterP.h /main/6 1998/02/11 14:54:35 kaleb $ + * $Xorg: RepeaterP.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -21,7 +21,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.6 1999/06/20 08:41:05 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/xc/lib/Xaw/Reports.h b/xc/lib/Xaw/Reports.h index 2c652d69c..e56edb117 100644 --- a/xc/lib/Xaw/Reports.h +++ b/xc/lib/Xaw/Reports.h @@ -1,5 +1,5 @@ /* - * $TOG: Reports.h /main/5 1998/02/06 12:48:45 kaleb $ + * $Xorg: Reports.h,v 1.4 2000/08/17 19:45:36 cpqbld Exp $ * Copyright 1990, 1998 The Open Group @@ -23,6 +23,8 @@ in this Software without prior written authorization from The Open Group. #ifndef _Xaw_Reports_h #define _Xaw_Reports_h +#include <X11/Intrinsic.h> + /* * XawPannerReport - this structure is used by the reportCallback of the * Panner, Porthole, Viewport, and Scrollbar widgets to report its position. diff --git a/xc/lib/Xaw/Scrollbar.c b/xc/lib/Xaw/Scrollbar.c index 834c8bf0b..3399e6672 100644 --- a/xc/lib/Xaw/Scrollbar.c +++ b/xc/lib/Xaw/Scrollbar.c @@ -1,4 +1,4 @@ -/* $TOG: Scrollbar.c /main/73 1998/02/06 12:48:56 kaleb $ */ +/* $Xorg: Scrollbar.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.11 2000/09/26 15:56:54 tsi 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/xc/lib/Xaw/Scrollbar.h b/xc/lib/Xaw/Scrollbar.h index b67f2fde7..ba3a630bd 100644 --- a/xc/lib/Xaw/Scrollbar.h +++ b/xc/lib/Xaw/Scrollbar.h @@ -1,4 +1,4 @@ -/* $TOG: Scrollbar.h /main/9 1998/02/06 12:49:02 kaleb $ */ +/* $Xorg: Scrollbar.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ /*********************************************************** @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.5 1999/05/03 12:15: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/xc/lib/Xaw/ScrollbarP.h b/xc/lib/Xaw/ScrollbarP.h index 45a34d618..1c552498a 100644 --- a/xc/lib/Xaw/ScrollbarP.h +++ b/xc/lib/Xaw/ScrollbarP.h @@ -1,5 +1,5 @@ /* - * $TOG: ScrollbarP.h /main/4 1998/02/06 12:48:51 kaleb $ + * $Xorg: ScrollbarP.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.6 1999/06/20 08:41:05 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/xc/lib/Xaw/Simple.c b/xc/lib/Xaw/Simple.c index 66cfa55e0..d813c34ca 100644 --- a/xc/lib/Xaw/Simple.c +++ b/xc/lib/Xaw/Simple.c @@ -1,4 +1,4 @@ -/* $TOG: Simple.c /main/38 1998/06/24 11:53:29 kaleb $ */ +/* $Xorg: Simple.c,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ /*********************************************************** @@ -43,7 +43,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.c,v 1.14 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.c,v 1.15 2001/01/17 19:42:29 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/Simple.h b/xc/lib/Xaw/Simple.h index 6c1794170..cddf967a9 100644 --- a/xc/lib/Xaw/Simple.h +++ b/xc/lib/Xaw/Simple.h @@ -1,4 +1,4 @@ -/* $TOG: Simple.h /main/15 1998/02/06 12:49:39 kaleb $ */ +/* $Xorg: Simple.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.h,v 1.7 1999/06/27 14:07:34 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/xc/lib/Xaw/SimpleMenP.h b/xc/lib/Xaw/SimpleMenP.h index 058e91952..c867f8397 100644 --- a/xc/lib/Xaw/SimpleMenP.h +++ b/xc/lib/Xaw/SimpleMenP.h @@ -1,5 +1,5 @@ /* - * $TOG: SimpleMenP.h /main/16 1998/02/11 14:54:47 kaleb $ + * $Xorg: SimpleMenP.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -20,7 +20,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.11 1999/06/20 08:41:05 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/xc/lib/Xaw/SimpleMenu.c b/xc/lib/Xaw/SimpleMenu.c index 500b210bb..a92743719 100644 --- a/xc/lib/Xaw/SimpleMenu.c +++ b/xc/lib/Xaw/SimpleMenu.c @@ -1,4 +1,4 @@ -/* $TOG: SimpleMenu.c /main/47 1998/06/24 11:53:33 kaleb $ */ +/* $Xorg: SimpleMenu.c,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -20,7 +20,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.19 1999/07/11 08:49:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.20 2001/01/17 19:42:30 dawes Exp $ */ /* * SimpleMenu.c - Source code file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleMenu.h b/xc/lib/Xaw/SimpleMenu.h index cf8979ef6..284282619 100644 --- a/xc/lib/Xaw/SimpleMenu.h +++ b/xc/lib/Xaw/SimpleMenu.h @@ -1,5 +1,5 @@ /* - * $TOG: SimpleMenu.h /main/24 1998/02/11 14:54:57 kaleb $ + * $Xorg: SimpleMenu.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -21,7 +21,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.6 1999/06/13 13:47:21 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/xc/lib/Xaw/SimpleP.h b/xc/lib/Xaw/SimpleP.h index 9b6a8c86b..2d9f9b34c 100644 --- a/xc/lib/Xaw/SimpleP.h +++ b/xc/lib/Xaw/SimpleP.h @@ -1,6 +1,6 @@ /*********************************************************** - $TOG: SimpleP.h /main/13 1998/02/06 12:49:30 kaleb $ + $Xorg: SimpleP.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ Copyright 1987, 1988, 1994, 1998 The Open Group @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.10 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.11 2001/01/17 19:42:30 dawes Exp $ */ #ifndef _SimpleP_h #define _SimpleP_h diff --git a/xc/lib/Xaw/Sme.c b/xc/lib/Xaw/Sme.c index 118957268..02dd05e2e 100644 --- a/xc/lib/Xaw/Sme.c +++ b/xc/lib/Xaw/Sme.c @@ -1,4 +1,4 @@ -/* $TOG: Sme.c /main/14 1998/02/11 14:55:31 kaleb $ */ +/* $Xorg: Sme.c,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.5 1999/06/06 08:48:10 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/xc/lib/Xaw/Sme.h b/xc/lib/Xaw/Sme.h index c592742dd..d529c16fe 100644 --- a/xc/lib/Xaw/Sme.h +++ b/xc/lib/Xaw/Sme.h @@ -1,5 +1,5 @@ /* - * $TOG: Sme.h /main/8 1998/02/11 14:55:35 kaleb $ + * $Xorg: Sme.h,v 1.4 2000/08/17 19:45:38 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.4 1998/10/03 08:42:20 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. @@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _Sme_h #define _Sme_h +#include <X11/Intrinsic.h> #include <X11/RectObj.h> /* Resources: diff --git a/xc/lib/Xaw/SmeBSB.c b/xc/lib/Xaw/SmeBSB.c index f8c65a2df..5df2b1609 100644 --- a/xc/lib/Xaw/SmeBSB.c +++ b/xc/lib/Xaw/SmeBSB.c @@ -1,4 +1,4 @@ -/* $TOG: SmeBSB.c /main/23 1998/06/24 11:53:39 kaleb $ */ +/* $Xorg: SmeBSB.c,v 1.4 2000/08/17 19:45:38 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -20,7 +20,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.10 1999/06/06 08:48:11 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/xc/lib/Xaw/SmeBSB.h b/xc/lib/Xaw/SmeBSB.h index 886258085..68f10f5cc 100644 --- a/xc/lib/Xaw/SmeBSB.h +++ b/xc/lib/Xaw/SmeBSB.h @@ -1,5 +1,5 @@ /* - * $TOG: SmeBSB.h /main/9 1998/02/11 14:55:10 kaleb $ + * $Xorg: SmeBSB.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.5 1999/04/25 10:01:26 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/xc/lib/Xaw/SmeBSBP.h b/xc/lib/Xaw/SmeBSBP.h index aa2de9f23..e51b6025c 100644 --- a/xc/lib/Xaw/SmeBSBP.h +++ b/xc/lib/Xaw/SmeBSBP.h @@ -1,5 +1,5 @@ /* - * $TOG: SmeBSBP.h /main/10 1998/02/11 14:55:01 kaleb $ + * $Xorg: SmeBSBP.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -21,7 +21,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.7 1999/06/20 08:41:07 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/xc/lib/Xaw/SmeLine.c b/xc/lib/Xaw/SmeLine.c index bc7578082..cb86dc0ab 100644 --- a/xc/lib/Xaw/SmeLine.c +++ b/xc/lib/Xaw/SmeLine.c @@ -1,4 +1,4 @@ -/* $TOG: SmeLine.c /main/17 1998/02/11 14:55:18 kaleb $ */ +/* $Xorg: SmeLine.c,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -21,7 +21,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.6 1999/06/06 08:48:11 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/xc/lib/Xaw/SmeLine.h b/xc/lib/Xaw/SmeLine.h index 10d411c80..ae53d9baa 100644 --- a/xc/lib/Xaw/SmeLine.h +++ b/xc/lib/Xaw/SmeLine.h @@ -1,5 +1,5 @@ /* - * $TOG: SmeLine.h /main/6 1998/02/11 14:55:23 kaleb $ + * $Xorg: SmeLine.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -20,7 +20,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.4 1998/10/03 08:42:21 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/xc/lib/Xaw/SmeLineP.h b/xc/lib/Xaw/SmeLineP.h index 50e89768a..90811035e 100644 --- a/xc/lib/Xaw/SmeLineP.h +++ b/xc/lib/Xaw/SmeLineP.h @@ -1,5 +1,5 @@ /* - * $TOG: SmeLineP.h /main/6 1998/02/11 14:55:14 kaleb $ + * $Xorg: SmeLineP.h,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -21,7 +21,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.6 1999/06/20 08:41:07 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/xc/lib/Xaw/SmeP.h b/xc/lib/Xaw/SmeP.h index 798a8f26a..6306a075c 100644 --- a/xc/lib/Xaw/SmeP.h +++ b/xc/lib/Xaw/SmeP.h @@ -1,5 +1,5 @@ /* - * $TOG: SmeP.h /main/8 1998/02/11 14:55:27 kaleb $ + * $Xorg: SmeP.h,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ /* * This is the private header file for the Athena Sme object. diff --git a/xc/lib/Xaw/StripCharP.h b/xc/lib/Xaw/StripCharP.h index 4aec11ce2..31c2cac22 100644 --- a/xc/lib/Xaw/StripCharP.h +++ b/xc/lib/Xaw/StripCharP.h @@ -1,5 +1,5 @@ /* -* $TOG: StripCharP.h /main/6 1998/02/06 12:50:31 kaleb $ +* $Xorg: StripCharP.h,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.6 1999/06/20 08:41:08 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/xc/lib/Xaw/StripChart.c b/xc/lib/Xaw/StripChart.c index cee988f44..1d4fa8c21 100644 --- a/xc/lib/Xaw/StripChart.c +++ b/xc/lib/Xaw/StripChart.c @@ -1,4 +1,4 @@ -/* $TOG: StripChart.c /main/26 1998/02/06 12:50:36 kaleb $ */ +/* $Xorg: StripChart.c,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.6 1999/06/06 08:48:12 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> diff --git a/xc/lib/Xaw/StripChart.h b/xc/lib/Xaw/StripChart.h index 531c43852..afd60485f 100644 --- a/xc/lib/Xaw/StripChart.h +++ b/xc/lib/Xaw/StripChart.h @@ -1,4 +1,4 @@ -/* $TOG: StripChart.h /main/7 1998/02/06 12:50:41 kaleb $ */ +/* $Xorg: StripChart.h,v 1.4 2000/08/17 19:45:39 cpqbld Exp $ */ /*********************************************************** @@ -42,12 +42,20 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.4 1998/10/03 08:42:23 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 -/* Resources: +#include <X11/Intrinsic.h> + +/*********************************************************************** + * + * StripChart Widget + * + ***********************************************************************/ + +/* StripChart resources: Name Class RepType Default Value ---- ----- ------- ------------- diff --git a/xc/lib/Xaw/Template.c b/xc/lib/Xaw/Template.c index 82fcb9f83..97bce11ac 100644 --- a/xc/lib/Xaw/Template.c +++ b/xc/lib/Xaw/Template.c @@ -1,4 +1,4 @@ -/* $TOG: Template.c /main/6 1998/02/06 12:50:51 kaleb $ */ +/* $Xorg: Template.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ /* @@ -21,7 +21,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.6 1999/06/06 08:48:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.c,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Template.h b/xc/lib/Xaw/Template.h index 3b5281a16..c728d1b8f 100644 --- a/xc/lib/Xaw/Template.h +++ b/xc/lib/Xaw/Template.h @@ -1,4 +1,4 @@ -/* $TOG: Template.h /main/7 1998/02/06 12:50:56 kaleb $ */ +/* $Xorg: Template.h,v 1.4 2000/08/17 19:45:40 cpqbld Exp $ */ /* @@ -21,11 +21,19 @@ 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.4 1998/10/03 08:42:23 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 +#include <X11/Intrinsic.h> + +/**************************************************************** + * + * Template widget + * + ****************************************************************/ + /* Resources: Name Class RepType Default Value diff --git a/xc/lib/Xaw/TemplateP.h b/xc/lib/Xaw/TemplateP.h index 8c900ac31..c27874f0f 100644 --- a/xc/lib/Xaw/TemplateP.h +++ b/xc/lib/Xaw/TemplateP.h @@ -1,4 +1,4 @@ -/* $TOG: TemplateP.h /main/8 1998/02/06 12:50:46 kaleb $ */ +/* $Xorg: TemplateP.h,v 1.4 2000/08/17 19:45:40 cpqbld Exp $ */ /* @@ -21,7 +21,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.5 1999/06/06 08:48:13 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 @@ -54,7 +54,11 @@ typedef struct { typedef struct _TemplateRec { CorePart core; +#if defined(__cplusplus) || defined(c_plusplus) + TemplatePart c_template; +#else TemplatePart template; +#endif } TemplateRec; #endif /* _TemplateP_h */ diff --git a/xc/lib/Xaw/Text.c b/xc/lib/Xaw/Text.c index b2d11ed17..dc5b1819a 100644 --- a/xc/lib/Xaw/Text.c +++ b/xc/lib/Xaw/Text.c @@ -1,4 +1,4 @@ -/* $TOG: Text.c /main/201 1998/06/24 11:53:44 kaleb $ */ +/* $Xorg: Text.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ /*********************************************************** @@ -70,7 +70,7 @@ SOFTWARE. * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.40 2000/12/07 20:26:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.42 2001/01/30 21:54:33 paulo Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> @@ -805,6 +805,7 @@ CreateVScrollBar(TextWidget ctx) XtRealizeWidget(vbar); XtMapWidget(vbar); } + XtSetKeyboardFocus(vbar, (Widget)ctx); } /* @@ -863,6 +864,7 @@ CreateHScrollBar(TextWidget ctx) XtRealizeWidget(hbar); XtMapWidget(hbar); } + XtSetKeyboardFocus(hbar, (Widget)ctx); } /* diff --git a/xc/lib/Xaw/Text.h b/xc/lib/Xaw/Text.h index 7bb3ff0fc..785a12f64 100644 --- a/xc/lib/Xaw/Text.h +++ b/xc/lib/Xaw/Text.h @@ -1,4 +1,4 @@ -/* $TOG: Text.h /main/46 1998/02/06 12:52:13 kaleb $ */ +/* $Xorg: Text.h,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Text.h,v 1.13 1999/08/15 13:00:34 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/xc/lib/Xaw/TextAction.c b/xc/lib/Xaw/TextAction.c index 9a041ff3c..a2ae600c1 100644 --- a/xc/lib/Xaw/TextAction.c +++ b/xc/lib/Xaw/TextAction.c @@ -1,4 +1,4 @@ -/* $TOG: TextAction.c /main/55 1998/02/06 12:51:01 kaleb $ */ +/* $Xorg: TextAction.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ /* @@ -21,7 +21,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.35 2000/12/07 20:26:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.39 2001/02/01 19:15:19 paulo Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -2835,12 +2835,23 @@ RedrawDisplay(Widget w, XEvent *event, String *p, Cardinal *n) EndAction((TextWidget)w); } +/* This is kind of a hack, but, only one text widget can have focus at + * a time on one display. There is a problem in the implementation of the + * text widget, the scrollbars can not be adressed via editres, since they + * are not children of a subclass of composite. + * The focus variable is required to make sure only one text window will + * show a block cursor at one time. + */ +struct _focus { Display *display; Widget widget; }; +static struct _focus *focus; +static Cardinal num_focus; /*ARGSUSED*/ static void TextFocusIn(Widget w, XEvent *event, String *p, Cardinal *n) { TextWidget ctx = (TextWidget)w; Bool display_caret = ctx->text.display_caret; + int i; if (event->xfocus.detail == NotifyPointer) return; @@ -2853,6 +2864,25 @@ TextFocusIn(Widget w, XEvent *event, String *p, Cardinal *n) ctx->text.hasfocus = TRUE; if (display_caret) EndAction(ctx); + + for (i = 0; i < num_focus; i++) + if (focus[i].display == XtDisplay(w)) + break; + if (i >= num_focus) { + focus = (struct _focus*) + XtRealloc((XtPointer)focus, sizeof(struct _focus) * (num_focus + 1)); + i = num_focus; + focus[i].widget = w; + focus[i].display = XtDisplay(w); + num_focus++; + } + if (focus[i].widget != w) { + Widget old = focus[i].widget; + + focus[i].widget = w; + if (old != NULL) + TextFocusOut(old, event, p, n); + } } /*ARGSUSED*/ @@ -2861,8 +2891,24 @@ TextFocusOut(Widget w, XEvent *event, String *p, Cardinal *n) { TextWidget ctx = (TextWidget)w; Bool display_caret = ctx->text.display_caret; + Widget shell; + Window window; + int i, revert; + + shell = w; + while (shell) { + if (XtIsShell(shell)) + break; + shell = XtParent(shell); + } - if (event->xfocus.detail == NotifyPointer) + for (i = 0; i < num_focus; i++) + if (focus[i].display == XtDisplay(w)) + break; + XGetInputFocus(XtDisplay(w), &window, &revert); + if ((XtWindow(shell) == window && + (i < num_focus && focus[i].widget == w)) + || event->xfocus.detail == NotifyPointer) return; /* Let the input method know focus has left.*/ @@ -3110,6 +3156,8 @@ InsertChar(Widget w, XEvent *event, String *p, Cardinal *n) FD_ZERO(&fds); FD_SET(ConnectionNumber(XtDisplay(w)), &fds); (void)select(FD_SETSIZE, &fds, NULL, NULL, &tmval); + if (tmval.tv_usec != 500000) + usleep(40000); StartAction(ctx, NULL); #ifndef OLDXAW @@ -3342,8 +3390,9 @@ Numeric(Widget w, XEvent *event, String *params, Cardinal *num_params) return; } else { - mult = mult * 10 + params[0][0] - '0'; - ctx->text.mult = ctx->text.mult * 10 + params[0][0] - '0'; + mult = mult * 10 + (params[0][0] - '0') * (mult < 0 ? -1 : 1); + ctx->text.mult = ctx->text.mult * 10 + (params[0][0] - '0') * + (mult < 0 ? -1 : 1); } if (mult != ctx->text.mult || mult >= 32767) { /* checks for overflow */ XBell(XtDisplay(w), 0); diff --git a/xc/lib/Xaw/TextP.h b/xc/lib/Xaw/TextP.h index 3b9e32d30..0023a43ac 100644 --- a/xc/lib/Xaw/TextP.h +++ b/xc/lib/Xaw/TextP.h @@ -1,5 +1,5 @@ /* -* $TOG: TextP.h /main/55 1998/02/06 12:51:17 kaleb $ +* $Xorg: TextP.h,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextP.h,v 3.18 1999/06/20 08:41:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextP.h,v 3.19 2001/01/17 19:42:34 dawes Exp $ */ #ifndef _XawTextP_h #define _XawTextP_h diff --git a/xc/lib/Xaw/TextPop.c b/xc/lib/Xaw/TextPop.c index ec49be14e..9c53f377b 100644 --- a/xc/lib/Xaw/TextPop.c +++ b/xc/lib/Xaw/TextPop.c @@ -1,4 +1,4 @@ -/* $TOG: TextPop.c /main/34 1998/06/24 11:53:54 kaleb $ */ +/* $Xorg: TextPop.c,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ */ /* @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16 2000/05/18 16:29:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.18 2001/02/05 22:38:05 paulo Exp $ */ /* * This file is broken up into three sections one dealing with @@ -837,7 +837,7 @@ AddSearchChildren(Widget form, char *ptr, Widget tw) static Bool DoSearch(struct SearchAndReplace *search) { - char msg[BUFSIZ]; + char msg[37]; Widget tw = XtParent(search->search_popup); XawTextPosition pos; XawTextScanDirection dir; @@ -875,11 +875,27 @@ DoSearch(struct SearchAndReplace *search) GetString to get a tame version */ if (pos == XawTextSearchError) { - (void)XmuSnprintf(msg, sizeof(msg), - "Could not find string ``%s''.", - GetString(search->search_text)); + char *ptr; + int len; + + ptr = GetString(search->search_text); + len = strlen(ptr); + (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr); + + ptr = strchr(msg, '\n'); + if (ptr != NULL || sizeof(msg) - 1 < len) { + if (ptr != NULL) + len = ptr - msg + 4; + else + len = strlen(msg); + + if (len < 4) + strcpy(msg, "..."); + else + strcpy(msg + len - 4, "..."); + } XawTextUnsetSelection(tw); - SetSearchLabels(search, msg, "", True); + SetSearchLabels(search, "Could not find string", msg, True); return (False); } @@ -1019,15 +1035,26 @@ Replace(struct SearchAndReplace *search, Bool once_only, Bool show_current) if (new_pos == XawTextSearchError) { if (count == 0) { - char msg[BUFSIZ]; - - /* The Raw string in find.ptr may be WC I can't use here, - so I call GetString to get a tame version */ - - (void)XmuSnprintf(msg, sizeof(msg), - "Error: Could not find string ``%s''", - GetString(search->search_text)); - SetSearchLabels(search, msg, "", True); + char msg[37]; + char *ptr; + int len; + + ptr = GetString(search->search_text); + len = strlen(ptr); + (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr); + ptr = strchr(msg, '\n'); + if (ptr != NULL || sizeof(msg) - 1 < len) { + if (ptr != NULL) + len = ptr - msg + 4; + else + len = strlen(msg); + + if (len < 4) + strcpy(msg, "..."); + else + strcpy(msg + len - 4, "..."); + } + SetSearchLabels(search, "Could not find string", msg, True); if (redisplay) { XawTextSetInsertionPoint(tw, ipos); @@ -1047,7 +1074,7 @@ Replace(struct SearchAndReplace *search, Bool once_only, Bool show_current) XawTextGetSelectionPos(tw, &pos, &end_pos); if (search->selection_changed) { - SetSearchLabels(search, "Selection has been modified, aborting.", + SetSearchLabels(search, "Selection modified, aborting.", "", True); if (redisplay) { XawTextSetInsertionPoint(tw, ipos); @@ -1067,11 +1094,7 @@ Replace(struct SearchAndReplace *search, Bool once_only, Bool show_current) } if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { - char msg[BUFSIZ]; - - (void)XmuSnprintf(msg, sizeof(msg), - "'%s' with '%s'", find.ptr, replace.ptr); - SetSearchLabels(search, "Error while replacing", msg, True); + SetSearchLabels(search, "Error while replacing.", "", True); if (redisplay) { XawTextSetInsertionPoint(tw, ipos); XawTextEnableRedisplay(tw); diff --git a/xc/lib/Xaw/TextSink.c b/xc/lib/Xaw/TextSink.c index 205b04ee0..69cc61aaf 100644 --- a/xc/lib/Xaw/TextSink.c +++ b/xc/lib/Xaw/TextSink.c @@ -1,4 +1,4 @@ -/* $TOG: TextSink.c /main/21 1998/02/11 14:55:39 kaleb $ */ +/* $Xorg: TextSink.c,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -20,7 +20,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.17 2000/10/02 02:32:12 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.18 2001/01/17 19:42:34 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/xc/lib/Xaw/TextSink.h b/xc/lib/Xaw/TextSink.h index 13d026697..0e1f57a7e 100644 --- a/xc/lib/Xaw/TextSink.h +++ b/xc/lib/Xaw/TextSink.h @@ -1,5 +1,5 @@ /* - * $TOG: TextSink.h /main/11 1998/02/06 12:51:33 kaleb $ + * $Xorg: TextSink.h,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ */ /*********************************************************** @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.8 1999/08/15 13:00:36 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/xc/lib/Xaw/TextSinkP.h b/xc/lib/Xaw/TextSinkP.h index e409721e7..03fc48cc1 100644 --- a/xc/lib/Xaw/TextSinkP.h +++ b/xc/lib/Xaw/TextSinkP.h @@ -1,5 +1,5 @@ /* -* $TOG: TextSinkP.h /main/7 1998/02/06 12:51:22 kaleb $ +* $Xorg: TextSinkP.h,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.10 1999/09/06 13:02:17 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/xc/lib/Xaw/TextSrc.c b/xc/lib/Xaw/TextSrc.c index 35a079250..2ed775ee2 100644 --- a/xc/lib/Xaw/TextSrc.c +++ b/xc/lib/Xaw/TextSrc.c @@ -1,4 +1,4 @@ -/* $TOG: TextSrc.c /main/21 1998/05/25 08:17:30 kaleb $ */ +/* $Xorg: TextSrc.c,v 1.4 2000/08/17 19:45:41 cpqbld Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.25 2000/09/26 15:56:55 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.27 2001/01/30 15:03:34 paulo Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. @@ -1022,9 +1022,9 @@ XawTextSourceReplace(Widget w, XawTextPosition left, XtFree((XtPointer)entity); if (entity == anchor->entities) { if ((anchor->entities = enext) == NULL) { + eprev = NULL; anchor = XawTextSourceRemoveAnchor(w, anchor); entity = anchor ? anchor->entities : NULL; - eprev = NULL; } else eprev = entity = enext; @@ -1053,6 +1053,7 @@ XawTextSourceReplace(Widget w, XawTextPosition left, XtFree((XtPointer)entity); anchor->cache = NULL; if (entity == anchor->entities) { + eprev = NULL; if ((anchor->entities = enext) == NULL) { if (i == 0) ++i; @@ -1069,7 +1070,6 @@ XawTextSourceReplace(Widget w, XawTextPosition left, break; } anchor = src->textSrc.anchors[i]; - eprev = NULL; entity = anchor->entities; continue; } diff --git a/xc/lib/Xaw/TextSrc.h b/xc/lib/Xaw/TextSrc.h index 26955e934..d14a530bb 100644 --- a/xc/lib/Xaw/TextSrc.h +++ b/xc/lib/Xaw/TextSrc.h @@ -1,5 +1,5 @@ /* - * $TOG: TextSrc.h /main/12 1998/02/06 12:51:49 kaleb $ + * $Xorg: TextSrc.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ /*********************************************************** @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.10 1999/08/15 13:00:38 dawes 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/xc/lib/Xaw/TextSrcP.h b/xc/lib/Xaw/TextSrcP.h index 25ddb1163..ce5c8a4b7 100644 --- a/xc/lib/Xaw/TextSrcP.h +++ b/xc/lib/Xaw/TextSrcP.h @@ -1,5 +1,5 @@ /* -* $TOG: TextSrcP.h /main/21 1998/02/06 12:51:38 kaleb $ +* $Xorg: TextSrcP.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.12 1999/09/27 06:29:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.13 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTextSrcP_h #define _XawTextSrcP_h diff --git a/xc/lib/Xaw/TextTr.c b/xc/lib/Xaw/TextTr.c index c7adda2af..3690766bf 100644 --- a/xc/lib/Xaw/TextTr.c +++ b/xc/lib/Xaw/TextTr.c @@ -1,4 +1,4 @@ -/* $TOG: TextTr.c /main/21 1998/02/06 12:51:54 kaleb $ */ +/* $Xorg: TextTr.c,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ /* @@ -21,7 +21,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.14 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.15 2001/01/17 19:42:35 dawes Exp $ */ /* INTERNATIONALIZATION: diff --git a/xc/lib/Xaw/Toggle.c b/xc/lib/Xaw/Toggle.c index 9f3de2d98..aa9b2eae9 100644 --- a/xc/lib/Xaw/Toggle.c +++ b/xc/lib/Xaw/Toggle.c @@ -1,4 +1,4 @@ -/* $TOG: Toggle.c /main/30 1998/02/11 14:55:52 kaleb $ */ +/* $Xorg: Toggle.c,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ /* @@ -21,7 +21,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.6 1999/06/06 08:48:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.7 2001/01/17 19:42:35 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/xc/lib/Xaw/Toggle.h b/xc/lib/Xaw/Toggle.h index 3ef138646..06ee88815 100644 --- a/xc/lib/Xaw/Toggle.h +++ b/xc/lib/Xaw/Toggle.h @@ -1,5 +1,5 @@ /* - * $TOG: Toggle.h /main/18 1998/02/11 14:55:57 kaleb $ + * $Xorg: Toggle.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -19,7 +19,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.4 1998/10/03 08:42:29 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/xc/lib/Xaw/ToggleP.h b/xc/lib/Xaw/ToggleP.h index 1cc564bc7..96e2b69a9 100644 --- a/xc/lib/Xaw/ToggleP.h +++ b/xc/lib/Xaw/ToggleP.h @@ -1,4 +1,4 @@ -/* $TOG: ToggleP.h /main/11 1998/02/11 14:55:48 kaleb $ */ +/* $Xorg: ToggleP.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ /* @@ -21,7 +21,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.6 1999/06/20 08:41:11 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/xc/lib/Xaw/Tree.c b/xc/lib/Xaw/Tree.c index 4a9b0ecd4..3be11bb6d 100644 --- a/xc/lib/Xaw/Tree.c +++ b/xc/lib/Xaw/Tree.c @@ -1,5 +1,5 @@ /* - * $TOG: Tree.c /main/47 1998/02/11 14:56:05 kaleb $ + * $Xorg: Tree.c,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -44,7 +44,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.8 1999/07/04 06:38:27 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/xc/lib/Xaw/Tree.h b/xc/lib/Xaw/Tree.h index 5071cfa78..789779821 100644 --- a/xc/lib/Xaw/Tree.h +++ b/xc/lib/Xaw/Tree.h @@ -1,5 +1,5 @@ /* - * $TOG: Tree.h /main/15 1998/02/11 14:56:11 kaleb $ + * $Xorg: Tree.h,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -44,7 +44,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.5 1999/06/06 08:48:20 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/xc/lib/Xaw/TreeP.h b/xc/lib/Xaw/TreeP.h index 3e8b14d7a..0093a709b 100644 --- a/xc/lib/Xaw/TreeP.h +++ b/xc/lib/Xaw/TreeP.h @@ -1,5 +1,5 @@ /* - * $TOG: TreeP.h /main/16 1998/02/11 14:56:01 kaleb $ + * $Xorg: TreeP.h,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ * Copyright 1990, 1998 The Open Group @@ -44,7 +44,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.5 1999/06/20 08:41:12 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/xc/lib/Xaw/Vendor.c b/xc/lib/Xaw/Vendor.c index 96d753568..db6b99054 100644 --- a/xc/lib/Xaw/Vendor.c +++ b/xc/lib/Xaw/Vendor.c @@ -1,4 +1,4 @@ -/* $TOG: Vendor.c /main/28 1998/02/06 12:52:56 kaleb $ */ +/* $Xorg: Vendor.c,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.6 1999/03/21 07:34:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.7 2001/01/17 19:42:35 dawes Exp $ */ /* * This is a copy of Xt/Vendor.c with an additional ClassInitialize diff --git a/xc/lib/Xaw/VendorEP.h b/xc/lib/Xaw/VendorEP.h index 309162c16..3e2bd1b17 100644 --- a/xc/lib/Xaw/VendorEP.h +++ b/xc/lib/Xaw/VendorEP.h @@ -1,4 +1,4 @@ -/* $TOG: VendorEP.h /main/3 1998/02/06 12:52:50 kaleb $ */ +/* $Xorg: VendorEP.h,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -47,7 +47,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.4 1999/06/20 08:41:12 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/xc/lib/Xaw/Viewport.c b/xc/lib/Xaw/Viewport.c index 4c3c6adc7..92cd6a2c2 100644 --- a/xc/lib/Xaw/Viewport.c +++ b/xc/lib/Xaw/Viewport.c @@ -1,4 +1,4 @@ -/* $TOG: Viewport.c /main/72 1998/02/06 12:53:07 kaleb $ */ +/* $Xorg: Viewport.c,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.8 2000/09/26 15:56:55 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.9 2001/01/17 19:42:36 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Viewport.h b/xc/lib/Xaw/Viewport.h index c01e456bf..e0c08be0a 100644 --- a/xc/lib/Xaw/Viewport.h +++ b/xc/lib/Xaw/Viewport.h @@ -1,4 +1,4 @@ -/* $TOG: Viewport.h /main/24 1998/02/06 12:53:14 kaleb $ */ +/* $Xorg: Viewport.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ /************************************************************ @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.5 1999/05/03 12:15:47 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/xc/lib/Xaw/ViewportP.h b/xc/lib/Xaw/ViewportP.h index c138822d6..0be977dac 100644 --- a/xc/lib/Xaw/ViewportP.h +++ b/xc/lib/Xaw/ViewportP.h @@ -1,5 +1,5 @@ /* - * $TOG: ViewportP.h /main/15 1998/02/06 12:53:02 kaleb $ + * $Xorg: ViewportP.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ * Private declarations for ViewportWidgetClass */ @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.6 1999/06/20 08:41:12 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/xc/lib/Xaw/Xaw-def.cpp b/xc/lib/Xaw/Xaw-def.cpp index cbb5f3c7b..ea3de9a4a 100644 --- a/xc/lib/Xaw/Xaw-def.cpp +++ b/xc/lib/Xaw/Xaw-def.cpp @@ -131,4 +131,4 @@ EXPORTS XawViewportSetLocation XawWidgetArray XawWidgetCount -/* $TOG: Xaw-def.cpp /main/1 1997/09/16 10:04:41 kaleb $ */ +/* $Xorg: Xaw-def.cpp,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ diff --git a/xc/lib/Xaw/Xaw.man b/xc/lib/Xaw/Xaw.man index ff21215f8..96a154b7b 100644 --- a/xc/lib/Xaw/Xaw.man +++ b/xc/lib/Xaw/Xaw.man @@ -26,14 +26,14 @@ .\" .\" Author: Paulo César Pereira de Andrade .\" -.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.4 1999/06/27 14:07:35 dawes Exp $ +.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.5 2001/01/27 18:20:39 dawes Exp $ .\" .de TQ .br .ns .TP \\$1 .. -.TH XAW 3 "Version 3.9" "XFree86" +.TH XAW 3 __vendorversion__ .SH NAME XAW \- X Athena Widgets diff --git a/xc/lib/Xaw/XawI18n.c b/xc/lib/Xaw/XawI18n.c index 5fdd0a3c5..0965c4934 100644 --- a/xc/lib/Xaw/XawI18n.c +++ b/xc/lib/Xaw/XawI18n.c @@ -1,4 +1,4 @@ -/* $TOG: XawI18n.c /main/7 1998/02/06 12:53:18 kaleb $ */ +/* $Xorg: XawI18n.c,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ /* Copyright 1991 NCR Corporation - Dayton, Ohio, USA */ @@ -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/XawI18n.c,v 1.6 1999/07/19 13:36:04 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/xc/lib/Xaw/XawI18n.h b/xc/lib/Xaw/XawI18n.h index d5ae88722..ef7d55638 100644 --- a/xc/lib/Xaw/XawI18n.h +++ b/xc/lib/Xaw/XawI18n.h @@ -1,4 +1,4 @@ -/* $TOG: XawI18n.h /main/13 1998/02/06 12:53:23 kaleb $ */ +/* $Xorg: XawI18n.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ /************************************************************ @@ -21,7 +21,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.10 1999/12/27 00:39:23 robin Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.11 2001/01/17 19:42:36 dawes Exp $ */ #ifdef HAS_WCTYPE_H #include <wctype.h> diff --git a/xc/lib/Xaw/XawIm.c b/xc/lib/Xaw/XawIm.c index 2f38dc577..44da26c0c 100644 --- a/xc/lib/Xaw/XawIm.c +++ b/xc/lib/Xaw/XawIm.c @@ -1,4 +1,4 @@ -/* $TOG: XawIm.c /main/12 1998/04/21 07:40:26 kaleb $ */ +/* $Xorg: XawIm.c,v 1.4 2000/08/17 19:45:44 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -48,7 +48,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.11 2000/09/05 19:51:16 mvojkovi Exp $ */ +/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.12 2001/01/17 19:42:36 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/XawImP.h b/xc/lib/Xaw/XawImP.h index ae6901cc6..53b295fee 100644 --- a/xc/lib/Xaw/XawImP.h +++ b/xc/lib/Xaw/XawImP.h @@ -1,4 +1,4 @@ -/* $TOG: XawImP.h /main/8 1998/04/21 09:44:31 kaleb $ */ +/* $Xorg: XawImP.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -47,7 +47,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.7 1999/03/14 11:17:41 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/xc/lib/Xaw/XawInit.c b/xc/lib/Xaw/XawInit.c index 7b8a55251..816113876 100644 --- a/xc/lib/Xaw/XawInit.c +++ b/xc/lib/Xaw/XawInit.c @@ -1,5 +1,5 @@ /* - * $TOG: XawInit.c /main/4 1998/02/06 12:53:40 kaleb $ + * $Xorg: XawInit.c,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ * Copyright 1989, 1998 The Open Group @@ -28,7 +28,7 @@ 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.8 1999/06/06 08:48:22 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> diff --git a/xc/lib/Xaw/XawInit.h b/xc/lib/Xaw/XawInit.h index b58996a47..cf49b8588 100644 --- a/xc/lib/Xaw/XawInit.h +++ b/xc/lib/Xaw/XawInit.h @@ -1,4 +1,4 @@ -/* $TOG: XawInit.h /main/7 1998/02/06 12:53:44 kaleb $ +/* $Xorg: XawInit.h,v 1.4 2000/08/17 19:45:44 cpqbld Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -18,7 +18,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/XawInit.h,v 1.11 1999/08/28 09:00:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.12 2001/01/17 19:42:36 dawes Exp $ */ #ifndef _XawInit_h #define _XawInit_h @@ -33,6 +33,8 @@ in this Software without prior written authorization from The Open Group. typedef struct _XawDL XawDisplayList; #endif /* OLDXAW */ +#include <X11/Xfuncproto.h> + _XFUNCPROTOBEGIN void XawInitializeWidgetSet(void); diff --git a/xc/lib/Xaw/jump_funcs b/xc/lib/Xaw/jump_funcs index df6d0e529..d53aad255 100644 --- a/xc/lib/Xaw/jump_funcs +++ b/xc/lib/Xaw/jump_funcs @@ -1,5 +1,9 @@ -# $XConsortium: jump_funcs,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_funcs,v 3.2 1996/02/12 11:11:15 dawes Exp $ +# $Xorg: jump_funcs,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ +# +# +# +# +# $XFree86: xc/lib/Xaw/jump_funcs,v 3.3 2001/01/17 19:42:36 dawes Exp $ # 00000000 T _XawAsciiSourceFreeString libXaw AsciiSrc 00000000 T _XawAsciiSave libXaw AsciiSrc diff --git a/xc/lib/Xaw/jump_ignore b/xc/lib/Xaw/jump_ignore index 253b63da1..0c07b494c 100644 --- a/xc/lib/Xaw/jump_ignore +++ b/xc/lib/Xaw/jump_ignore @@ -1,3 +1,7 @@ -# $XConsortium: jump_ignore,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_ignore,v 3.1 1995/01/28 15:43:32 dawes Exp $ +# $Xorg: jump_ignore,v 1.3 2000/08/17 19:45:45 cpqbld Exp $ +# +# +# +# +# $XFree86: xc/lib/Xaw/jump_ignore,v 3.2 2001/01/17 19:42:36 dawes Exp $ # jump_ignore diff --git a/xc/lib/Xaw/jump_vars b/xc/lib/Xaw/jump_vars index 2edecda2e..aa37d41ae 100644 --- a/xc/lib/Xaw/jump_vars +++ b/xc/lib/Xaw/jump_vars @@ -1,5 +1,9 @@ -# $XConsortium: jump_vars,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_vars,v 3.1 1995/01/28 15:43:33 dawes Exp $ +# $Xorg: jump_vars,v 1.3 2000/08/17 19:45:45 cpqbld Exp $ +# +# +# +# +# $XFree86: xc/lib/Xaw/jump_vars,v 3.2 2001/01/17 19:42:36 dawes Exp $ # 00001400 D _XawWidgetArray libXaw AllWidgets 00000004 D _XawWidgetCount libXaw AllWidgets diff --git a/xc/lib/Xaw/sharedlib.c b/xc/lib/Xaw/sharedlib.c index 2e83e6f19..3353adc3b 100644 --- a/xc/lib/Xaw/sharedlib.c +++ b/xc/lib/Xaw/sharedlib.c @@ -1,4 +1,4 @@ -/* $TOG: sharedlib.c /main/7 1998/02/06 12:49:07 kaleb $ */ +/* $Xorg: sharedlib.c,v 1.3 2000/08/17 19:45:45 cpqbld Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group |