[Xorg-commit] xc/programs/xterm button.c,1.1.4.2,1.1.4.3 input.c,1.1.4.3,1.1.4.4 xutf8.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	button.c input.c xutf8.c 
Log Message:
Xutf8->XFree86utf8

Index: button.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xterm/button.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- button.c	26 Nov 2003 22:49:13 -0000	1.1.4.2
+++ button.c	8 Dec 2003 16:42:31 -0000	1.1.4.3
@@ -1369,9 +1369,9 @@
 	    *type == XA_STRING ||
 	    *type == XA_COMPOUND_TEXT(XtDisplay(w))) {
 	    GettingSelection(dpy, *type, line, *length);
-	    if (Xutf8TextPropertyToTextList(dpy, &text_prop,
-					    &text_list,
-					    &text_list_count) < 0) {
+	    if (XFree86utf8TextPropertyToTextList(dpy, &text_prop,
+						  &text_list,
+						  &text_list_count) < 0) {
 		TRACE(("Conversion failed\n"));
 		text_list = NULL;
 	    }
@@ -2488,25 +2488,25 @@
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
-				    Xutf8TextListToTextProperty,
+				    XFree86utf8TextListToTextProperty,
 				    XStringStyle);
     } else if (screen->wide_chars && *target == XA_UTF8_STRING(d)) {
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
-				    Xutf8TextListToTextProperty,
-				    XUTF8StringStyle);
+				    XFree86utf8TextListToTextProperty,
+				    XFree86Utf8StringStyle);
     } else if (screen->wide_chars && *target == XA_TEXT(d)) {
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
-				    Xutf8TextListToTextProperty,
+				    XFree86utf8TextListToTextProperty,
 				    XStdICCTextStyle);
     } else if (screen->wide_chars && *target == XA_COMPOUND_TEXT(d)) {
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
-				    Xutf8TextListToTextProperty,
+				    XFree86utf8TextListToTextProperty,
 				    XCompoundTextStyle);
     }
 #endif
@@ -2542,7 +2542,7 @@
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
 				    XmbTextListToTextProperty,
-				    XUTF8StringStyle);
+				    XFree86Utf8StringStyle);
     }
 #endif
     else if (*target == XA_LIST_LENGTH(d)) {

Index: input.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xterm/input.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
--- input.c	6 Dec 2003 13:24:30 -0000	1.1.4.3
+++ input.c	8 Dec 2003 16:42:31 -0000	1.1.4.4
@@ -364,9 +364,9 @@
 	Status status_return;
 #if OPT_WIDE_CHARS
 	if (screen->utf8_mode)
-	    nbytes = Xutf8LookupString(screen->xic, event,
-				       strbuf, sizeof(strbuf),
-				       &keysym, &status_return);
+	    nbytes = XFree86utf8LookupString(screen->xic, event,
+					     strbuf, sizeof(strbuf),
+				 	     &keysym, &status_return);
 	else
 #endif
 	    nbytes = XmbLookupString(screen->xic, event,

Index: xutf8.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xterm/xutf8.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- xutf8.c	14 Nov 2003 16:49:24 -0000	1.1
+++ xutf8.c	8 Dec 2003 16:42:31 -0000	1.1.4.1
@@ -177,10 +177,10 @@
 }
 
 int
-Xutf8TextPropertyToTextList(Display * dpy,
-			    const XTextProperty * tp,
-			    char ***list_return,
-			    int *count_return)
+XFree86utf8TextPropertyToTextList(Display * dpy,
+				  const XTextProperty * tp,
+				  char ***list_return,
+				  int *count_return)
 {
     int utf8;
     char **list;
@@ -249,11 +249,11 @@
 }
 
 int
-Xutf8TextListToTextProperty(Display * dpy,
-			    char **list,
-			    int count,
-			    XICCEncodingStyle style,
-			    XTextProperty * text_prop)
+XFree86utf8TextListToTextProperty(Display * dpy,
+				  char **list,
+				  int count,
+				  XICCEncodingStyle style,
+				  XTextProperty * text_prop)
 {
     XTextProperty proto;
     unsigned int nbytes;
@@ -321,12 +321,12 @@
 }
 
 int
-Xutf8LookupString(XIC ic GCC_UNUSED,
-		  register XKeyEvent * ev,
-		  char *buffer,
-		  int nbytes,
-		  KeySym * keysym_return,
-		  Status * status_return)
+XFree86utf8LookupString(XIC ic GCC_UNUSED,
+			register XKeyEvent * ev,
+			char *buffer,
+			int nbytes,
+			KeySym * keysym_return,
+			Status * status_return)
 {
     int rc;
     KeySym keysym;