XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_901xf86-4_3_99_16

10 files changed, 45 insertions, 27 deletions

diff --git a/man/Xaw.man b/man/Xaw.man
index 6d179d3..5f093ad 100644
--- a/man/Xaw.man
+++ b/man/Xaw.man
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Paulo César Pereira de Andrade
 .\"
-.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.7 2001/11/04 21:16:39 paulo Exp $
+.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.8 2003/05/29 21:48:05 herrb Exp $
 .\"
 .de TQ
 .br
@@ -60,7 +60,7 @@ or \fI*\fP; or a constant name, including \fImine\fP (event->xany.window
 and \fIfalse\fP (0).
 .PP
 \fBArguments\fP are self-explanatory; when starting with a \fI$\fP they name
-a variable, otherise, they indicate a resource name.
+a variable, otherwise, they indicate a resource name.
 .TP 8
 .B call-proc \fP(\fIboolean-expression\fP, \fIprocedure-name\fP)
 This action allows the evaluation of a boolean expression in the first
@@ -293,7 +293,7 @@ respectively.  Example:
 .B image \fP{pixmap-spec},xs,ys,[xe,ye]
 This function is implemented as a way to quickly compose complex
 decorations in widgets.  \fIPixmap-spec\fP is as defined in the
-\fBPIXMAPS\fP section below. \fIxs\fP and \fIys\fP are the coodinates from
+\fBPIXMAPS\fP section below. \fIxs\fP and \fIys\fP are the coordinates from
 where to start copying the pixmap; \fIxe\fP and \fIye\fP are optional (they
 default to xs + pixmap.width and ys + pixmap.height, respectively).  If the
 pixmap has a mask, the copy is masked accordingly.  Example:
@@ -516,10 +516,10 @@ an alphanumeric character will automatically end at this column.
 .B scrollVertical (\fPClass\fB Scroll)
 These resources control the placement of scrollbars on the left and bottom
 edges of the Text widget.  They accept the values \fIXawtextScrollAlways\fP
-and \fIXawtextScrollNever\fP.  A converter is registerd for this resource
+and \fIXawtextScrollNever\fP.  A converter is registered for this resource
 that will convert the following strings: \fIalways\fP and \fInever\fP.  The
 value \fIXawtextScrollWhenNeeded\fP (and \fIwhenNeeded\fP, recognized by
-the converter), is accepted for backwards compatibilty with resource
+the converter), is accepted for backwards compatibility with resource
 specifications written for the Xaw6 Text widget, but ignored (effectively
 treated as \fIXawtextScrollNever\fP).
 .SH TEXT SOURCE OBJECT
diff --git a/src/Actions.c b/src/Actions.c
index 8e51063..f675fb4 100644
--- a/src/Actions.c
+++ b/src/Actions.c
@@ -25,7 +25,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Actions.c,v 3.16 2001/10/30 04:56:38 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/Actions.c,v 3.17 2003/03/25 04:18:10 dawes Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -41,6 +41,10 @@
 #include <X11/Xfuncs.h>
 #include "Private.h"
 
+#ifdef __UNIXOS2__
+static char dummy;
+#endif
+
 #ifndef OLDXAW
 
 /*
diff --git a/src/Command.c b/src/Command.c
index 1bb46c2..489653c 100644
--- a/src/Command.c
+++ b/src/Command.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Command.c,v 1.15 2002/07/04 17:04:20 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/Command.c,v 1.17 2003/08/04 10:32:20 eich Exp $ */
 
 /*
  * Command.c - Command button widget
@@ -249,6 +249,8 @@ XawCommandInitialize(Widget request, Widget cnew,
     CommandWidget cbw = (CommandWidget)cnew;
     int shape_event_base, shape_error_base;
 
+    if (!cbw->label.font) XtError("Aborting: no font found\n");
+    
     if (cbw->command.shape_style != XawShapeRectangle &&
 	!XShapeQueryExtension(XtDisplay(cnew), &shape_event_base,
 			      &shape_error_base))
@@ -430,7 +432,7 @@ PaintCommandWidget(Widget w, XEvent *event, Region region, Bool change)
 {
     CommandWidget cbw = (CommandWidget)w;
     Bool very_thick;
-    GC norm_gc, rev_gc;
+    GC rev_gc;
    
     very_thick = cbw->command.highlight_thickness
 		 > Min(XtWidth(cbw), XtHeight(cbw)) / 2;
@@ -445,11 +447,9 @@ PaintCommandWidget(Widget w, XEvent *event, Region region, Bool change)
      */
 
     if (cbw->command.highlighted != HighlightNone) {
-	norm_gc = cbw->command.inverse_GC;
 	rev_gc = cbw->command.normal_GC;
     }
     else {
-	norm_gc = cbw->command.normal_GC;
 	rev_gc = cbw->command.inverse_GC;
     }
 
diff --git a/src/DisplayList.c b/src/DisplayList.c
index 559095d..7bb9d89 100644
--- a/src/DisplayList.c
+++ b/src/DisplayList.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.16 2000/09/26 15:56:54 tsi Exp $ */
+/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.19 2003/05/23 15:51:23 tsi Exp $ */
 
 #include <ctype.h>
 #include <string.h>
@@ -41,6 +41,10 @@
 #include <X11/Xmu/SysUtil.h>
 #include "Private.h"
 
+#ifdef __UNIXOS2__
+static char dummy;
+#endif
+
 #ifndef OLDXAW
 
 /*
@@ -608,7 +612,7 @@ Dl1Point(Widget w, XtPointer args, XtPointer data, int id)
       xpad = XtX(w) + XtBorderWidth(w);
       ypad = XtY(w) + XtBorderWidth(w);
       x += xpad;
-      x += xpad;
+      y += ypad;
       display = XtDisplayOfObject(w);
       window = XtWindowOfObject(w);
     }
@@ -1188,7 +1192,7 @@ DlString(Widget w, XtPointer args, XtPointer data, Bool image)
       xpad = XtX(w) + XtBorderWidth(w);
       ypad = XtY(w) + XtBorderWidth(w);
       x += xpad;
-      x += xpad;
+      y += ypad;
       display = XtDisplayOfObject(w);
       window = XtWindowOfObject(w);
     }
diff --git a/src/Label.c b/src/Label.c
index b5004d6..74f5502 100644
--- a/src/Label.c
+++ b/src/Label.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Label.c,v 1.13 2001/12/14 19:54:40 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Label.c,v 1.14 2003/08/04 10:32:20 eich Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
@@ -526,6 +526,8 @@ XawLabelInitialize(Widget request, Widget cnew,
 {
     LabelWidget lw = (LabelWidget)cnew;
 
+    if (!lw->label.font) XtError("Aborting: no font found\n");
+    
     if (lw->label.label == NULL) 
 	lw->label.label = XtNewString(lw->core.name);
     else
diff --git a/src/Pixmap.c b/src/Pixmap.c
index feb0fc2..b6778c2 100644
--- a/src/Pixmap.c
+++ b/src/Pixmap.c
@@ -25,7 +25,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.17 2002/05/18 02:05:39 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.18 2003/03/25 04:18:10 dawes Exp $ */
 
 #include <string.h>
 #include <stdio.h>
@@ -37,6 +37,10 @@
 #include <X11/xpm.h>
 #include "Private.h"
 
+#ifdef __UNIXOS2__
+static char dummy;
+#endif
+
 #ifndef OLDXAW
 
 /*
diff --git a/src/Text.c b/src/Text.c
index cb66afd..000f9d8 100644
--- a/src/Text.c
+++ b/src/Text.c
@@ -74,7 +74,7 @@ SOFTWARE.
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Text.c,v 3.52 2002/11/03 20:10:25 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/Text.c,v 3.53 2003/10/02 13:29:38 eich Exp $ */
 
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
@@ -923,7 +923,7 @@ XawTextInitialize(Widget request, Widget cnew,
     ctx->text.file_insert = NULL;
     ctx->text.search = NULL;
     ctx->text.update = XmuNewScanline(0, 0, 0);
-    ctx->text.gc = DefaultGCOfScreen(XtScreen(ctx));
+    ctx->text.gc = XtGetGC(cnew, 0, 0);
     ctx->text.hasfocus = False;
     ctx->text.margin = ctx->text.r_margin; /* Strucure copy */
     ctx->text.left_margin = ctx->text.r_margin.left;
@@ -3619,6 +3619,7 @@ XawTextDestroy(Widget w)
     XtFree((char *)ctx->text.lt.info);
     XtFree((char *)ctx->text.search);
     XmuDestroyScanline(ctx->text.update);
+    XtReleaseGC((Widget)ctx, ctx->text.gc);
 }
 
 /*
diff --git a/src/TextAction.c b/src/TextAction.c
index 2fd34de..ee64ba2 100644
--- a/src/TextAction.c
+++ b/src/TextAction.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.46 2002/03/20 05:06:23 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.47 2003/05/27 22:26:36 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -2499,7 +2499,9 @@ static int
 InsertNewLineAndBackupInternal(TextWidget ctx)
 {
     int count, error = XawEditDone, mult = MULT(ctx);
+#ifndef OLDXAW
     XawTextPosition position;
+#endif
     XawTextBlock text;
     char buf[32];
 
@@ -2526,8 +2528,10 @@ InsertNewLineAndBackupInternal(TextWidget ctx)
 	    text.ptr[count] = XawLF;
     }
 
+#ifndef OLDXAW
     position = SrcScan(ctx->text.source, ctx->text.insertPos,
 		       XawstEOL, XawsdLeft, 1, False);
+#endif
     if (_XawTextReplace(ctx, ctx->text.insertPos, ctx->text.insertPos, &text)) {
 	XBell( XtDisplay(ctx), 50);
 	error = XawEditError;
diff --git a/src/TextPop.c b/src/TextPop.c
index df877c4..3e8ef1f 100644
--- a/src/TextPop.c
+++ b/src/TextPop.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.20 2001/12/14 19:54:44 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.21 2003/10/23 21:33:54 tsi Exp $ */
 
 /*
  * This file is broken up into three sections one dealing with
@@ -866,7 +866,7 @@ DoSearch(struct SearchAndReplace *search)
 #endif /* OLDXAW */
     }
   
-    dir = (XawTextScanDirection)
+    dir = (XawTextScanDirection)(unsigned long)
       ((XPointer)XawToggleGetCurrent(search->left_toggle) - R_OFFSET);
 
     pos = XawTextSearch(tw, dir, &text);
@@ -1021,8 +1021,8 @@ Replace(struct SearchAndReplace *search, Bool once_only, Bool show_current)
     else
 	replace.length = strlen(replace.ptr);
     
-    dir = (XawTextScanDirection)
-      XawToggleGetCurrent(search->left_toggle) - R_OFFSET;
+    dir = (XawTextScanDirection)(unsigned long)
+      ((XPointer)XawToggleGetCurrent(search->left_toggle) - R_OFFSET);
 
     redisplay = !once_only || (once_only && !show_current);
     ipos = XawTextGetInsertionPoint(tw);
diff --git a/src/XawIm.c b/src/XawIm.c
index 49a4115..9581d04 100644
--- a/src/XawIm.c
+++ b/src/XawIm.c
@@ -52,7 +52,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.14 2001/12/14 19:54:46 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.15 2003/05/27 22:26:38 tsi Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -714,7 +714,7 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height)
 {
     XRectangle		pe_area, st_area;
     XVaNestedList	pe_attr = NULL, st_attr = NULL;
-    int			ic_cnt = 0, pe_cnt = 0, st_cnt = 0;
+    int			ic_cnt = 0;
     XRectangle		*pe_area_needed = NULL, *st_area_needed = NULL;
     XPointer		ic_a[5];
 
@@ -739,7 +739,7 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height)
 	    return;
 	}
 	pe_attr = st_attr = NULL;
-	ic_cnt = pe_cnt = st_cnt = 0;
+	ic_cnt = 0;
 	if (p->input_style & XIMStatusArea) {
 	    st_area.height = st_area_needed->height;
 	    st_area.x = 0;
@@ -1582,10 +1582,9 @@ _XawImGetImAreaHeight(Widget w)
 void
 _XawImCallVendorShellExtResize(Widget w)
 {
-    XawVendorShellExtPart	*ve;
     VendorShellWidget		vw;
 
-    if ((vw = SearchVendorShell(w)) && (ve = GetExtPart(vw))) {
+    if ((vw = SearchVendorShell(w)) && GetExtPart(vw)) {
 	XawVendorShellExtResize((Widget)vw);
     }
 }