[Xorg-commit] xc/lib/Xaw Actions.c,1.1.4.1,1.1.4.2 Text.c,1.1.4.3,1.1.4.4 TextSink.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/Xaw
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/Xaw

Modified Files:
      Tag: XORG-CURRENT
	Actions.c Text.c TextSink.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Actions.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Actions.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Actions.c	26 Nov 2003 22:48:39 -0000	1.1.4.1
+++ b/Actions.c	23 Feb 2004 21:34:22 -0000	1.1.4.2
@@ -25,7 +25,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Actions.c,v 3.17 2003/03/25 04:18:10 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Actions.c,v 3.18 2004/01/23 03:57:58 dawes Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -651,7 +651,7 @@
   unsigned int size, idx;
 
   size = XmuSnprintf(msg, sizeof(msg), "%s(): bad number of parameters.\n\t(",
-		     action_name, action_name);
+		     action_name);
 
   idx = 0;
   while (idx < *num_params - 1 && size < sizeof(msg))

Index: Text.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Text.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Text.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
+++ b/Text.c	23 Feb 2004 21:34:22 -0000	1.1.4.4
@@ -74,7 +74,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Text.c,v 3.53 2003/10/02 13:29:38 eich Exp $ */
+/* $XFree86: xc/lib/Xaw/Text.c,v 3.54 2003/12/22 17:48:04 tsi Exp $ */
 
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
@@ -171,7 +171,9 @@
 				      XrmValue*, XrmValue*, XtPointer*);
 static void DestroyHScrollBar(TextWidget);
 static void DestroyVScrollBar(TextWidget);
+#ifndef OLDXAW
 static void DisplayText(Widget, XawTextPosition, XawTextPosition);
+#endif
 static void OldDisplayText(Widget, XawTextPosition, XawTextPosition);
 static void DisplayTextWindow(Widget);
 static void DoCopyArea(TextWidget, int, int, unsigned int, unsigned int,
@@ -2743,11 +2745,11 @@
     }
 }
 
+#ifndef OLDXAW
 /*ARGSUSED*/
 static void
 DisplayText(Widget w, XawTextPosition left, XawTextPosition right)
 {
-#ifndef OLDXAW
     static XmuSegment segment;
     static XmuScanline next;
     static XmuScanline scanline = {0, &segment, &next};
@@ -2817,8 +2819,8 @@
 	    XmuAreaOr(paint_list->clip, &area);
 	}
     }
-#endif
 }
+#endif
 
 /*
  * This routine implements multi-click selection in a hardwired manner.

Index: TextSink.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/TextSink.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/TextSink.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ b/TextSink.c	23 Feb 2004 21:34:22 -0000	1.1.4.2
@@ -24,7 +24,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.21 2002/06/03 21:39:24 paulo Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.22 2004/01/23 03:57:58 dawes Exp $ */
 
 /*
  * Author:  Chris Peterson, MIT X Consortium.
@@ -1330,7 +1330,7 @@
     else
 	xlfd = null;
 
-    XmuSnprintf(identifier, sizeof(identifier), "%08x%08x%s%s%d%d%d%d%s",
+    XmuSnprintf(identifier, sizeof(identifier), "%08lx%08lx%s%s%d%d%d%d%s",
 		property->mask, property->xlfd_mask,
 		foreground, background,
 		(result->mask & XAW_TPROP_UNDERLINE) != 0,