Mon Dec 8 18:42:41 EET 2003

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	ICWrap.c Ximint.h XlcPubI.h XlcPublic.h Xlcint.h Xlib.h 
	XomGeneric.h Xutil.h imConv.c imDefIc.c imDefIm.c imDefLkup.c 
	imLcIc.c imLcIm.c imLcLkup.c imLcPrs.c imThaiIc.c imThaiIm.c 
	lcDefConv.c lcEuc.c lcGenConv.c lcInit.c lcJis.c lcPrTxt.c 
	lcPublic.c lcSjis.c lcStd.c lcTxtPr.c lcUTF8.c lcUTF8Load.c 
	lcWrap.c omDefault.c omGeneric.c omImText.c omText.c 
	omTextEsc.c omTextExt.c omTextPer.c omXChar.c utf8WMProps.c 
	utf8Wrap.c 
Log Message:
Xutf8->XFree86utf8

Index: ICWrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ICWrap.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

--- ICWrap.c	26 Nov 2003 22:48:35 -0000	1.1.4.2
+++ ICWrap.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -391,7 +391,7 @@
 }
 
 char *
-Xutf8ResetIC(ic)
+XFree86utf8ResetIC(ic)
     XIC ic;
 {
     if (ic->core.im) {
@@ -434,7 +434,7 @@
 }
 
 int
-Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
+XFree86utf8LookupString(ic, ev, buffer, nbytes, keysym, status)
     XIC ic;
     register XKeyEvent *ev;
     char *buffer;

Index: Ximint.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Ximint.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- Ximint.h	29 Nov 2003 13:39:50 -0000	1.1.4.3
+++ Ximint.h	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -705,7 +705,7 @@
     Status	*state
 );
 
-extern int	_XimProtoUtf8LookupString(
+extern int	_XFree86imProtoUtf8LookupString(
     XIC		 xic,
     XKeyEvent	*ev,
     char	*buffer,
@@ -764,7 +764,7 @@
     XComposeStatus	*status
 );
 
-extern int	_XimLookupUTF8Text(
+extern int	_XFree86imLookupUtf8Text(
     Xic			 ic,
     XKeyEvent		*event,
     char		*buffer,
@@ -915,7 +915,7 @@
     Status		*status
 );
 
-extern int _XimLocalUtf8LookupString(
+extern int _XFree86imLocalUtf8LookupString(
     XIC			 ic,
     XKeyEvent		*ev,
     char		*buffer,

Index: XlcPubI.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XlcPubI.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- XlcPubI.h	29 Nov 2003 14:12:07 -0000	1.1.4.3
+++ XlcPubI.h	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -156,7 +156,7 @@
     int*		count_ret
 );
 
-extern int _Xutf8TextPropertyToTextList(
+extern int _XFree86utf8TextPropertyToTextList(
     XLCd		lcd,
     Display*		dpy,
     const XTextProperty* text_prop,
@@ -182,7 +182,7 @@
     XTextProperty*	/* text_prop */
 );
 
-extern int _Xutf8TextListToTextProperty(
+extern int _XFree86utf8TextListToTextProperty(
     XLCd		/* lcd */,
     Display*		/* dpy */,
     char**		/* list */,
@@ -240,12 +240,12 @@
 #endif
 
 extern int
-_Xmbstoutf8(
+_XFree86mbstoutf8(
     char *ustr,
     const char *str,
     int len);
 extern int
-_Xlcmbstoutf8(
+_XFree86lcmbstoutf8(
     XLCd lcd,
     char *ustr,
     const char *str,
@@ -287,7 +287,7 @@
 
 
 extern XPointer
-_Utf8GetConvByName(
+_XFree86utf8GetConvByName(
     const char *name);
 
 _XFUNCPROTOEND

Index: XlcPublic.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XlcPublic.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- XlcPublic.h	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ XlcPublic.h	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -206,7 +206,7 @@
 #define XlcNWideChar 		"wideChar"
 #define XlcNCompoundText 	"compoundText"
 #define XlcNString 		"string"
-#define XlcNUtf8String 		"utf8String"
+#define XFree86lcNUtf8String 	"utf8String"
 #define XlcNCharSet 		"charSet"
 #define XlcNCTCharSet 		"CTcharSet"
 #define XlcNFontCharSet		"FontCharSet"

Index: Xlcint.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Xlcint.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- Xlcint.h	29 Nov 2003 13:39:50 -0000	1.1.4.3
+++ Xlcint.h	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -903,12 +903,12 @@
 );
 
 /* Registers UTF-8 converters for a non-UTF-8 locale. */
-extern void _XlcAddUtf8Converters(
+extern void _XFree86lcAddUtf8Converters(
     XLCd		lcd
 );
 
 /* Registers UTF-8 converters for a UTF-8 locale. */
-extern void _XlcAddUtf8LocaleConverters(
+extern void _XFree86lcAddUtf8LocaleConverters(
     XLCd		lcd
 );
 
@@ -925,7 +925,7 @@
 
 /* The UTF-8 locale loader. Suitable for UTF-8 encoding.
    Uses an XLC_LOCALE configuration file. */
-extern XLCd _XlcUtf8Loader(
+extern XLCd _XFree86lcUtf8Loader(
     const char*		name
 );
 

Index: Xlib.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Xlib.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- Xlib.h	29 Nov 2003 13:56:20 -0000	1.1.4.4
+++ Xlib.h	8 Dec 2003 16:42:30 -0000	1.1.4.5
@@ -3649,7 +3649,7 @@
     int			/* num_wchars */
 );
 
-extern int Xutf8TextEscapement(
+extern int XFree86utf8TextEscapement(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */
@@ -3671,7 +3671,7 @@
     XRectangle*		/* overall_logical_return */
 );
 
-extern int Xutf8TextExtents(
+extern int XFree86utf8TextExtents(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */,
@@ -3703,7 +3703,7 @@
     XRectangle*		/* overall_logical_return */
 );
 
-extern Status Xutf8TextPerCharExtents(
+extern Status XFree86utf8TextPerCharExtents(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */,
@@ -3735,7 +3735,7 @@
     int			/* nitems */
 );
 
-extern void Xutf8DrawText(
+extern void XFree86utf8DrawText(
     Display*		/* display */,
     Drawable		/* d */,
     GC			/* gc */,
@@ -3767,7 +3767,7 @@
     int			/* num_wchars */
 );
 
-extern void Xutf8DrawString(
+extern void XFree86utf8DrawString(
     Display*		/* display */,
     Drawable		/* d */,
     XFontSet		/* font_set */,
@@ -3800,7 +3800,7 @@
     int			/* num_wchars */
 );
 
-extern void Xutf8DrawImageString(
+extern void XFree86utf8DrawImageString(
     Display*		/* display */,
     Drawable		/* d */,
     XFontSet		/* font_set */,
@@ -3862,7 +3862,7 @@
     XIC /* ic */
 );
 
-extern char *Xutf8ResetIC(
+extern char *XFree86utf8ResetIC(
     XIC /* ic */
 );
 
@@ -3901,7 +3901,7 @@
     Status*		/* status_return */
 );
 
-extern int Xutf8LookupString(
+extern int XFree86utf8LookupString(
     XIC			/* ic */,
     XKeyPressedEvent*	/* event */,
     char*		/* buffer_return */,

Index: XomGeneric.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XomGeneric.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- XomGeneric.h	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ XomGeneric.h	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -61,7 +61,7 @@
 typedef enum {
     XOMMultiByte,
     XOMWideChar,
-    XOMUtf8String
+    XFree86OMUtf8String
 } XOMTextType;
 
 typedef struct _FontDataRec {
@@ -178,7 +178,7 @@
 extern int
 _XwcDefaultTextEscapement(XOC oc, _Xconst wchar_t *text, int length);
 extern int
-_Xutf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length);
+_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length);
 extern int
 _XmbDefaultTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
@@ -186,7 +186,7 @@
 _XwcDefaultTextExtents(XOC oc, _Xconst wchar_t *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_Xutf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
+_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern Status
 _XmbDefaultTextPerCharExtents(
@@ -203,7 +203,7 @@
     XRectangle *overall_ink,
     XRectangle *overall_logical);
 extern Status
-_Xutf8DefaultTextPerCharExtents(
+_XFree86utf8DefaultTextPerCharExtents(
     XOC oc, _Xconst char *text, int length,
     XRectangle *ink_buf, XRectangle *logical_buf,
     int buf_size, int *num_chars,
@@ -216,8 +216,8 @@
 _XwcDefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
     _Xconst wchar_t *text, int length);
 extern int
-_Xutf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-    _Xconst char *text, int length);
+_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 extern void
 _XmbDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
     int y, _Xconst char *text, int length);
@@ -225,8 +225,8 @@
 _XwcDefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
     int y, _Xconst wchar_t *text, int length);
 extern void
-_Xutf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-    int y, _Xconst char *text, int length);
+_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 
 extern int
 _XmbGenericTextEscapement(XOC oc, _Xconst char *text, int length);
@@ -234,23 +234,23 @@
 _XmbGenericTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_Xutf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-    _Xconst char *text, int length);
+_XFree86utf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 extern void
-_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-    int y, _Xconst char *text, int length);
+_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+    int x, int y, _Xconst char *text, int length);
 extern Status
-_Xutf8GenericTextPerCharExtents(
+_XFree86utf8GenericTextPerCharExtents(
     XOC oc, _Xconst char *text, int length,
     XRectangle *ink_buf, XRectangle *logical_buf,
     int buf_size, int *num_chars,
     XRectangle *overall_ink,
     XRectangle *overall_logical);
 extern int
-_Xutf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
+_XFree86utf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_Xutf8GenericTextEscapement(XOC oc, _Xconst char *text, int length);
+_XFree86utf8GenericTextEscapement(XOC oc, _Xconst char *text, int length);
 extern void
 _XwcGenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
     int y, _Xconst wchar_t *text, int length);

Index: Xutil.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Xutil.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- Xutil.h	29 Nov 2003 13:31:57 -0000	1.1.4.3
+++ Xutil.h	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -170,7 +170,7 @@
     XTextStyle,			/* text in owner's encoding (current locale)*/
     XStdICCTextStyle,		/* STRING, else COMPOUND_TEXT */
     /* The following is an XFree86 extension, introduced in November 2000 */
-    XUTF8StringStyle		/* UTF8_STRING */
+    XFree86Utf8StringStyle	/* UTF8_STRING */
 } XICCEncodingStyle;
 
 typedef struct {
@@ -672,7 +672,7 @@
     XClassHint*		/* class_hints */
 );
 
-extern void Xutf8SetWMProperties(
+extern void XFree86utf8SetWMProperties(
     Display*		/* display */,
     Window		/* w */,
     _Xconst char*	/* window_name */,
@@ -744,7 +744,7 @@
     XTextProperty*	text_prop_return
 );
 
-extern int Xutf8TextListToTextProperty(
+extern int XFree86utf8TextListToTextProperty(
     Display*		display,
     char**		list,
     int			count,
@@ -776,7 +776,7 @@
     int*		count_return
 );
 
-extern int Xutf8TextPropertyToTextList(
+extern int XFree86utf8TextPropertyToTextList(
     Display*		display,
     const XTextProperty* text_prop,
     char***		list_return,

Index: imConv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imConv.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
--- imConv.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ imConv.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -84,12 +84,12 @@
 _XimGetLocaleCode (
     _Xconst char*	encoding_name)
 {
-    XPointer cvt = _Utf8GetConvByName(encoding_name);
+    XPointer cvt = _XFree86utf8GetConvByName(encoding_name);
     if (!cvt && encoding_name) {
        int i;
        for (i = 0; i < num_substitute; i++)
            if (!strcmp(encoding_name, SubstTable[i].encoding_name))
-               return _Utf8GetConvByName(SubstTable[i].charset_name);
+               return _XFree86utf8GetConvByName(SubstTable[i].charset_name);
     }
     return cvt;
 }
@@ -298,7 +298,7 @@
 }
 
 int
-_XimLookupUTF8Text(ic, event, buffer, nbytes, keysym, status)
+_XFree86imLookupUtf8Text(ic, event, buffer, nbytes, keysym, status)
     Xic			 ic;
     XKeyEvent*		event;
     char*		buffer;

Index: imDefIc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imDefIc.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
--- imDefIc.c	30 Nov 2003 16:47:13 -0000	1.1.4.3
+++ imDefIc.c	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -1212,7 +1212,7 @@
 }
 
 Private char *
-_XimCommitedUtf8String(
+_XFree86imCommitedUtf8String(
     Xim			 im,
     Xic			 ic,
     XPointer		 buf)
@@ -1262,10 +1262,10 @@
 }
 
 Private char *
-_XimProtoUtf8Reset(
+_XFree86imProtoUtf8Reset(
     XIC		 xic)
 {
-    return _XimProtoReset(xic, _XimCommitedUtf8String);
+    return _XimProtoReset(xic, _XFree86imCommitedUtf8String);
 }
 
 Private XICMethodsRec ic_methods = {
@@ -1276,10 +1276,10 @@
     _XimProtoGetICValues,	/* get_values */
     _XimProtoMbReset,		/* mb_reset */
     _XimProtoWcReset,		/* wc_reset */
-    _XimProtoUtf8Reset,		/* utf8_reset */
+    _XFree86imProtoUtf8Reset,	/* utf8_reset */
     _XimProtoMbLookupString,	/* mb_lookup_string */
     _XimProtoWcLookupString,	/* wc_lookup_string */
-    _XimProtoUtf8LookupString	/* utf8_lookup_string */
+    _XFree86imProtoUtf8LookupString	/* utf8_lookup_string */
 };
 
 Private Bool

Index: imDefIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imDefIm.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
--- imDefIm.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ imDefIm.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -1587,7 +1587,7 @@
 				 XlcNCompoundText, lcd, XlcNWideChar)))
 	    return False;
 	if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNUtf8String)))
+				 XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 	    return False;
     }
 
@@ -1602,7 +1602,7 @@
 				 XlcNCompoundText, lcd, XlcNWideChar)))
 		    return False;
 		if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XlcNUtf8String)))
+				 XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 		    return False;
 		break;
 	    } else {
@@ -1634,7 +1634,7 @@
 	return False;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
 	return False;
     private->cstoutf8_conv = conv;
 
@@ -1642,7 +1642,7 @@
 	return False;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
 	return False;
     private->ucstoutf8_conv = conv;
 

Index: imDefLkup.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imDefLkup.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
--- imDefLkup.c	29 Nov 2003 14:16:38 -0000	1.1.4.3
+++ imDefLkup.c	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -1105,7 +1105,7 @@
 }
 
 Public int
-_XimProtoUtf8LookupString(
+_XFree86imProtoUtf8LookupString(
     XIC			 xic,
     XKeyEvent		*ev,
     char		*buffer,
@@ -1145,7 +1145,7 @@
 	_XimUnregCommitInfo(ic);
 
     } else if (ev->type == KeyPress) {
-	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
+	ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
 	if (ret > 0) {
            if (ret > bytes)
                *state = XBufferOverflow;

Index: imLcIc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcIc.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
--- imLcIc.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ imLcIc.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -125,7 +125,7 @@
     _XimLocalMbReset,		/* utf8_reset */
     _XimLocalMbLookupString,	/* mb_lookup_string */
     _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XimLocalUtf8LookupString	/* utf8_lookup_string */
+    _XFree86imLocalUtf8LookupString	/* utf8_lookup_string */
 };
 
 Public XIC

Index: imLcIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcIm.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
--- imLcIm.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ imLcIm.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -298,7 +298,7 @@
 	goto Open_Error;
     private->ctow_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ctoutf8_conv = conv;
 
@@ -310,7 +310,7 @@
 	goto Open_Error;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->cstoutf8_conv = conv;
 
@@ -318,7 +318,7 @@
 	goto Open_Error;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ucstoutf8_conv = conv;
 

Index: imLcLkup.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcLkup.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
--- imLcLkup.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ imLcLkup.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -161,7 +161,7 @@
 }
 
 Public int
-_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
+_XFree86imLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
     XIC		  xic;
     XKeyEvent	 *ev;
     char	 *buffer;
@@ -199,7 +199,7 @@
 	}
 	return (ret);
     } else { /* Throughed Event */
-	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
+	ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
 	if(ret > 0) {
 	    if (ret > bytes) {
 		if (status) *status = XBufferOverflow;

Index: imLcPrs.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcPrs.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
--- imLcPrs.c	29 Nov 2003 13:47:01 -0000	1.1.4.3
+++ imLcPrs.c	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -47,7 +47,7 @@
     int		len
 );
 
-extern int _Xmbstoutf8(
+extern int _XFree86mbstoUtf8(
     char	*ustr,
     const char	*str,
     int		len
@@ -584,7 +584,7 @@
     }
     memcpy((char *)rhs_string_wc, (char *)local_wc_buf, (l + 1) * sizeof(wchar_t) );
 
-    l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
+    l = _XFree86mbstoUtf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
     if (l == LOCAL_UTF8_BUFSIZE - 1) {
 	local_wc_buf[l] = '\0';
     }

Index: imThaiIc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imThaiIc.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
--- imThaiIc.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ imThaiIc.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -138,7 +138,7 @@
     _XimThaiMbReset,		/* utf8_reset */
     _XimLocalMbLookupString,	/* mb_lookup_string */
     _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XimLocalUtf8LookupString	/* utf8_lookup_string */
+    _XFree86imLocalUtf8LookupString	/* utf8_lookup_string */
 };
 
 XIC

Index: imThaiIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imThaiIm.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
--- imThaiIm.c	17 Nov 2003 19:03:40 -0000	1.1.4.1
+++ imThaiIm.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -106,7 +106,7 @@
 	goto Open_Error;
     private->ctow_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ctoutf8_conv = conv;
 
@@ -118,7 +118,7 @@
 	goto Open_Error;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->cstoutf8_conv = conv;
 
@@ -126,7 +126,7 @@
 	goto Open_Error;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
 	goto Open_Error;
     private->ucstoutf8_conv = conv;
 

Index: lcDefConv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcDefConv.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
--- lcDefConv.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ lcDefConv.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -784,7 +784,7 @@
     _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
     _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcEuc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcEuc.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
--- lcEuc.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ lcEuc.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -1488,7 +1488,7 @@
     _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcGenConv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcGenConv.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
--- lcGenConv.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ lcGenConv.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -3142,7 +3142,7 @@
     }
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcInit.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcInit.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
--- lcInit.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ lcInit.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -116,7 +116,7 @@
 #endif
 
 #ifdef USE_UTF8_LOADER
-    _XlcAddLoader(_XlcUtf8Loader, XlcHead);
+    _XlcAddLoader(_XFree86lcUtf8Loader, XlcHead);
 #endif
 
 #ifdef USE_EUC_LOADER
@@ -155,7 +155,7 @@
 #endif
 
 #ifdef USE_UTF8_LOADER
-    _XlcRemoveLoader(_XlcUtf8Loader);
+    _XlcRemoveLoader(_XFree86lcUtf8Loader);
 #endif
 
 #ifdef USE_EUC_LOADER

Index: lcJis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcJis.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
--- lcJis.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ lcJis.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -934,7 +934,7 @@
     }
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcPrTxt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcPrTxt.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
--- lcPrTxt.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ lcPrTxt.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -139,7 +139,7 @@
     if (encoding == XA_STRING)
 	from_type = XlcNString;
     else if (encoding == XInternAtom(dpy, "UTF8_STRING", False))
-	from_type = XlcNUtf8String;
+	from_type = XFree86lcNUtf8String;
     else if (encoding == XInternAtom(dpy, "COMPOUND_TEXT", False))
 	from_type = XlcNCompoundText;
     else if (encoding == XInternAtom(dpy, XLC_PUBLIC(lcd, encoding_name), False))
@@ -150,7 +150,7 @@
     if (is_wide_char) {
 	buf_len = (text_prop->nitems + 1) * sizeof(wchar_t);;
     } else {
-	if (strcmp(to_type, XlcNUtf8String) == 0)
+	if (strcmp(to_type, XFree86lcNUtf8String) == 0)
 	    buf_len = text_prop->nitems * 6 + 1;
 	else
 	    buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1;
@@ -162,7 +162,7 @@
     to_left = buf_len;
 
     /* can be XlcNMultiByte to XlcNMultiByte,
-       or XlcNUtf8String to XlcNUtf8String */
+       or XFree86lcNUtf8String to XFree86lcNUtf8String */
     if (!strcmp(from_type, to_type)) {
         do_strcpy = True;
     } else {
@@ -265,14 +265,14 @@
 }
 
 int
-_Xutf8TextPropertyToTextList(
+_XFree86utf8TextPropertyToTextList(
     XLCd lcd,
     Display *dpy,
     const XTextProperty *text_prop,
     char ***list_ret,
     int *count_ret)
 {
-    return _XTextPropertyToTextList(lcd, dpy, text_prop, XlcNUtf8String,
+    return _XTextPropertyToTextList(lcd, dpy, text_prop, XFree86lcNUtf8String,
 				    (XPointer **) list_ret, count_ret);
 }
 

Index: lcPublic.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcPublic.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
--- lcPublic.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ lcPublic.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -50,10 +50,10 @@
 	_XrmDefaultInitParseInfo,
 	_XmbTextPropertyToTextList,
 	_XwcTextPropertyToTextList,
-	_Xutf8TextPropertyToTextList,
+	_XFree86utf8TextPropertyToTextList,
 	_XmbTextListToTextProperty,
 	_XwcTextListToTextProperty,
-	_Xutf8TextListToTextProperty,
+	_XFree86utf8TextListToTextProperty,
 	_XwcFreeStringList,
 	default_string,
 	NULL,

Index: lcSjis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcSjis.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
--- lcSjis.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ lcSjis.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -1556,7 +1556,7 @@
     _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
 #endif
 
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcStd.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcStd.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
--- lcStd.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ lcStd.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -319,7 +319,7 @@
 
 
 int
-_Xlcmbstoutf8(
+_XFree86lcmbstoUtf8(
     XLCd lcd,
     char *ustr,
     const char *str,
@@ -335,7 +335,7 @@
 	    return -1;
     }
 
-    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String);
+    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XFree86lcNUtf8String);
     if (conv == NULL)
 	return -1;
 
@@ -358,10 +358,10 @@
 }
 
 int
-_Xmbstoutf8(
+_XFree86mbstoUtf8(
     char *ustr,
     const char *str,
     int len)
 {
-    return _Xlcmbstoutf8((XLCd) NULL, ustr, str, len);
+    return _XFree86lcmbstoUtf8((XLCd) NULL, ustr, str, len);
 }

Index: lcTxtPr.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcTxtPr.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
--- lcTxtPr.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ lcTxtPr.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -97,9 +97,9 @@
 	    encoding = XA_STRING;
 	    to_type = XlcNString;
 	    break;
-	case XUTF8StringStyle:
+	case XFree86Utf8StringStyle:
 	    encoding = XInternAtom(dpy, "UTF8_STRING", False);
-	    to_type = XlcNUtf8String;
+	    to_type = XFree86lcNUtf8String;
 	    break;
 	case XCompoundTextStyle:
 	    encoding = XInternAtom(dpy, "COMPOUND_TEXT", False);
@@ -240,7 +240,7 @@
 }
 
 int
-_Xutf8TextListToTextProperty(
+_XFree86utf8TextListToTextProperty(
     XLCd lcd,
     Display *dpy,
     char **list,
@@ -248,6 +248,6 @@
     XICCEncodingStyle style,
     XTextProperty *text_prop)
 {
-    return _XTextListToTextProperty(lcd, dpy, XlcNUtf8String, (XPointer) list,
-				    count, style, text_prop);
+    return _XTextListToTextProperty(lcd, dpy, XFree86lcNUtf8String, 
+		    		    (XPointer) list, count, style, text_prop);
 }

Index: lcUTF8.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcUTF8.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
--- lcUTF8.c	26 Nov 2003 22:48:36 -0000	1.1.4.1
+++ lcUTF8.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -371,8 +371,7 @@
 	    init_all_charsets();					\
     } while (0)
 
-/* from XlcNCharSet to XlcNUtf8String */
-
+/* from XlcNCharSet to XFree86lcNUtf8String */ 
 static int
 cstoutf8(
     XlcConv conv,
@@ -464,7 +463,7 @@
     return create_conv(from_lcd, &methods_cstoutf8);
 }
 
-/* from XlcNUtf8String to XlcNCharSet */
+/* from XFree86lcNUtf8String to XlcNCharSet */
 
 static XlcConv
 create_tocs_conv(
@@ -678,7 +677,7 @@
     return create_tocs_conv(from_lcd, &methods_utf8tocs);
 }
 
-/* from XlcNUtf8String to XlcNChar */
+/* from XFree86lcNUtf8String to XlcNChar */
 
 static int
 utf8tocs1(
@@ -782,7 +781,7 @@
     return create_tocs_conv(from_lcd, &methods_utf8tocs1);
 }
 
-/* from XlcNUtf8String to XlcNString */
+/* from XFree86lcNUtf8String to XlcNString */
 
 static int
 utf8tostr(
@@ -858,7 +857,7 @@
     return create_conv(from_lcd, &methods_utf8tostr);
 }
 
-/* from XlcNString to XlcNUtf8String */
+/* from XlcNString to XFree86lcNUtf8String */
 
 static int
 strtoutf8(
@@ -918,7 +917,7 @@
 /* Support for the input methods. */
 
 XPointer
-_Utf8GetConvByName(
+_XFree86utf8GetConvByName(
     const char *name)
 {
     XrmQuark xrm_name;
@@ -1056,7 +1055,7 @@
     return create_ucstocs_conv(from_lcd, &methods_ucstocs1);
 }
 
-/* from XlcNUcsChar to XlcNUtf8String, needed for input methods */
+/* from XlcNUcsChar to XFree86lcNUtf8String, needed for input methods */
 
 static int
 ucstoutf8(
@@ -1119,16 +1118,16 @@
 
 /* Registers UTF-8 converters for a non-UTF-8 locale. */
 void
-_XlcAddUtf8Converters(
+_XFree86lcAddUtf8Converters(
     XLCd lcd)
 {
-    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String, open_cstoutf8);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNCharSet, open_utf8tocs);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNChar, open_utf8tocs1);
-    _XlcSetConverter(lcd, XlcNString, lcd, XlcNUtf8String, open_strtoutf8);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNString, open_utf8tostr);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String, open_cstoutf8);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNCharSet, open_utf8tocs);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNChar, open_utf8tocs1);
+    _XlcSetConverter(lcd, XlcNString, lcd, XFree86lcNUtf8String, open_strtoutf8);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNString, open_utf8tostr);
     _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XlcNChar, open_ucstocs1);
-    _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XlcNUtf8String, open_ucstoutf8);
+    _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XFree86lcNUtf8String, open_ucstoutf8);
 }
 
 /***************************************************************************/
@@ -1756,7 +1755,7 @@
 		if (!strcmp(preferred[k]->name, name))
 		    break;
 	    if (k < 0) {
-                /* For fonts "ISO10646-1" means not utf8 but ucs2.*/
+                /* For fonts "ISO10646-1" means ucs2, not utf8.*/
                 if (!strcmp("ISO10646-1", name)) {
                     preferred[num++] = &all_charsets[ucs2_conv_index];
                     continue;
@@ -1802,7 +1801,7 @@
 /* Registers UTF-8 converters for a UTF-8 locale. */
 
 void
-_XlcAddUtf8LocaleConverters(
+_XFree86lcAddUtf8LocaleConverters(
     XLCd lcd)
 {
     /* Register elementary converters. */
@@ -1827,8 +1826,8 @@
 
     _XlcSetConverter(lcd, XlcNString, lcd, XlcNMultiByte, open_strtoutf8);
     _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString, open_utf8tostr);
-    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNMultiByte, open_identity);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String, open_identity);
+    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNMultiByte, open_identity);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XFree86lcNUtf8String, open_identity);
 
     /* Register converters for XlcNFontCharSet */
     _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNFontCharSet, open_utf8tofcs);

Index: lcUTF8Load.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcUTF8Load.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- lcUTF8Load.c	14 Nov 2003 16:48:47 -0000	1.1
+++ lcUTF8Load.c	8 Dec 2003 16:42:30 -0000	1.1.4.1
@@ -38,7 +38,7 @@
 #include "XlcGeneric.h"
 
 XLCd
-_XlcUtf8Loader(
+_XFree86lcUtf8Loader(
     const char *name)
 {
     XLCd lcd;
@@ -54,8 +54,8 @@
 	return (XLCd) NULL;
     }
 
-    _XlcAddUtf8LocaleConverters(lcd);
-    _XlcAddUtf8Converters(lcd);
+    _XFree86lcAddUtf8LocaleConverters(lcd);
+    _XFree86lcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcWrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcWrap.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
--- lcWrap.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ lcWrap.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -406,7 +406,7 @@
 }
 
 int
-Xutf8TextPropertyToTextList(
+XFree86utf8TextPropertyToTextList(
     Display *dpy,
     const XTextProperty *text_prop,
     char ***list_ret,
@@ -456,7 +456,7 @@
 }
 
 int
-Xutf8TextListToTextProperty(
+XFree86utf8TextListToTextProperty(
     Display *dpy,
     char **list,
     int count,

Index: omDefault.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omDefault.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
--- omDefault.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omDefault.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -73,7 +73,7 @@
     XlcConv conv;
     int to_left, ret;
 
-    conv = _XomInitConverter(oc, XOMUtf8String);
+    conv = _XomInitConverter(oc, XFree86OMUtf8String);
     if (conv == NULL)
 	return False;
 
@@ -116,7 +116,7 @@
 }
 
 int
-_Xutf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
+_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -190,8 +190,9 @@
 }
 
 int
-_Xutf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
-			 XRectangle *overall_ink, XRectangle *overall_logical)
+_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
+			       XRectangle *overall_ink, 
+			       XRectangle *overall_logical)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -313,11 +314,12 @@
 }
 
 Status
-_Xutf8DefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
-				XRectangle *ink_buf, XRectangle *logical_buf,
-				int buf_size, int *num_chars,
-				XRectangle *overall_ink,
-				XRectangle *overall_logical)
+_XFree86utf8DefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
+				      XRectangle *ink_buf, 
+				      XRectangle *logical_buf,
+				      int buf_size, int *num_chars,
+				      XRectangle *overall_ink,
+				      XRectangle *overall_logical)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -378,8 +380,8 @@
 }
 
 int
-_Xutf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-			_Xconst char *text, int length)
+_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+			      int x, int y, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -429,8 +431,8 @@
 }
 
 void
-_Xutf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			     int y, _Xconst char *text, int length)
+_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+				   int x, int y, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);

Index: omGeneric.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omGeneric.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
--- omGeneric.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omGeneric.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -66,26 +66,26 @@
 
 #if 0
 extern int _XmbDefaultTextEscapement(), _XwcDefaultTextEscapement(),
-	   _Xutf8DefaultTextEscapement();
+	   _XFree86utf8DefaultTextEscapement();
 extern int _XmbDefaultTextExtents(), _XwcDefaultTextExtents(),
-	   _Xutf8DefaultTextExtents();
+	   _XFree86utf8DefaultTextExtents();
 extern Status _XmbDefaultTextPerCharExtents(), _XwcDefaultTextPerCharExtents(),
-	      _Xutf8DefaultTextPerCharExtents();
+	      _XFree86utf8DefaultTextPerCharExtents();
 extern int _XmbDefaultDrawString(), _XwcDefaultDrawString(),
-	   _Xutf8DefaultDrawString();
+	   _XFree86utf8DefaultDrawString();
 extern void _XmbDefaultDrawImageString(), _XwcDefaultDrawImageString(),
-	    _Xutf8DefaultDrawImageString();
+	    _XFree86utf8DefaultDrawImageString();
 
 extern int _XmbGenericTextEscapement(), _XwcGenericTextEscapement(),
-	   _Xutf8GenericTextEscapement();
+	   _XFree86utf8GenericTextEscapement();
 extern int _XmbGenericTextExtents(), _XwcGenericTextExtents(),
-	   _Xutf8GenericTextExtents();
+	   _XFree86utf8GenericTextExtents();
 extern Status _XmbGenericTextPerCharExtents(), _XwcGenericTextPerCharExtents(),
-	      _Xutf8GenericTextPerCharExtents();
+	      _XFree86utf8GenericTextPerCharExtents();
 extern int _XmbGenericDrawString(), _XwcGenericDrawString(),
-	   _Xutf8GenericDrawString();
+	   _XFree86utf8GenericDrawString();
 extern void _XmbGenericDrawImageString(), _XwcGenericDrawImageString(),
-	    _Xutf8GenericDrawImageString();
+	    _XFree86utf8GenericDrawImageString();
 
 extern void _XlcDbg_printValue (const char *str, char **value, int num);
 #endif
@@ -1583,11 +1583,11 @@
     _XwcDefaultTextPerCharExtents,
     _XwcDefaultDrawString,
     _XwcDefaultDrawImageString,
-    _Xutf8DefaultTextEscapement,
-    _Xutf8DefaultTextExtents,
-    _Xutf8DefaultTextPerCharExtents,
-    _Xutf8DefaultDrawString,
-    _Xutf8DefaultDrawImageString
+    _XFree86utf8DefaultTextEscapement,
+    _XFree86utf8DefaultTextExtents,
+    _XFree86utf8DefaultTextPerCharExtents,
+    _XFree86utf8DefaultDrawString,
+    _XFree86utf8DefaultDrawImageString
 };
 
 static XOCMethodsRec oc_generic_methods = {
@@ -1604,11 +1604,11 @@
     _XwcGenericTextPerCharExtents,
     _XwcGenericDrawString,
     _XwcGenericDrawImageString,
-    _Xutf8GenericTextEscapement,
-    _Xutf8GenericTextExtents,
-    _Xutf8GenericTextPerCharExtents,
-    _Xutf8GenericDrawString,
-    _Xutf8GenericDrawImageString
+    _XFree86utf8GenericTextEscapement,
+    _XFree86utf8GenericTextExtents,
+    _XFree86utf8GenericTextPerCharExtents,
+    _XFree86utf8GenericDrawString,
+    _XFree86utf8GenericDrawImageString
 };
 
 typedef struct _XOCMethodsListRec {

Index: omImText.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omImText.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
--- omImText.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omImText.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -81,9 +81,9 @@
 }
 
 void
-_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
-			     int y, _Xconst char *text, int length)
+_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
+				   int x, int y, _Xconst char *text, int length)
 {
-    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XOMUtf8String,
+    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XFree86OMUtf8String,
 			       (XPointer) text, length);
 }

Index: omText.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omText.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
--- omText.c	29 Nov 2003 14:20:47 -0000	1.1.4.3
+++ omText.c	8 Dec 2003 16:42:30 -0000	1.1.4.4
@@ -361,9 +361,9 @@
 }
 
 int
-_Xutf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
-			_Xconst char *text, int length)
+_XFree86utf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
+			      int x, int y, _Xconst char *text, int length)
 {
-    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XOMUtf8String,
+    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XFree86OMUtf8String,
 				 (XPointer) text, length);
 }

Index: omTextEsc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omTextEsc.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
--- omTextEsc.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omTextEsc.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -292,8 +292,8 @@
 }
 
 int
-_Xutf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
+_XFree86utf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
 {
-    return _XomGenericTextEscapement(oc, XOMUtf8String, (XPointer) text,
+    return _XomGenericTextEscapement(oc, XFree86OMUtf8String, (XPointer) text,
 				     length);
 }

Index: omTextExt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omTextExt.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
--- omTextExt.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omTextExt.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -126,9 +126,9 @@
 }
 
 int
-_Xutf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
+_XFree86utf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
 			 XRectangle *overall_ink, XRectangle *overall_logical)
 {
-    return _XomGenericTextExtents(oc, XOMUtf8String, (XPointer) text, length,
-				  overall_ink, overall_logical);
+    return _XomGenericTextExtents(oc, XFree86OMUtf8String, (XPointer) text, 
+		    		  length, overall_ink, overall_logical);
 }

Index: omTextPer.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omTextPer.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
--- omTextPer.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omTextPer.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -188,14 +188,15 @@
 }
 
 Status
-_Xutf8GenericTextPerCharExtents(XOC oc, _Xconst char *text, int length,
-				XRectangle *ink_buf, XRectangle *logical_buf,
-				int buf_size, int *num_chars,
-				XRectangle *overall_ink,
-				XRectangle *overall_logical)
+_XFree86utf8GenericTextPerCharExtents(XOC oc, _Xconst char *text, int length,
+				      XRectangle *ink_buf, 
+				      XRectangle *logical_buf,
+				      int buf_size, int *num_chars,
+				      XRectangle *overall_ink,
+				      XRectangle *overall_logical)
 {
-    return _XomGenericTextPerCharExtents(oc, XOMUtf8String, (XPointer) text,
-					 length, ink_buf, logical_buf, buf_size,
-					 num_chars, overall_ink,
-					 overall_logical);
+    return _XomGenericTextPerCharExtents(oc, XFree86OMUtf8String, 
+		    			 (XPointer) text, length, ink_buf, 
+					 logical_buf, buf_size, num_chars, 
+					 overall_ink, overall_logical);
 }

Index: omXChar.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omXChar.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
--- omXChar.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ omXChar.c	8 Dec 2003 16:42:30 -0000	1.1.4.3
@@ -448,9 +448,9 @@
 	convp = &gen->mbs_to_cs;
 	conv_type = XlcNMultiByte;
 	break;
-    case XOMUtf8String:
+    case XFree86OMUtf8String:
 	convp = &gen->utf8_to_cs;
-	conv_type = XlcNUtf8String;
+	conv_type = XFree86lcNUtf8String;
 	break;
     default:
 	return (XlcConv) NULL;

Index: utf8WMProps.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/utf8WMProps.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
--- utf8WMProps.c	26 Nov 2003 22:48:36 -0000	1.1.4.1
+++ utf8WMProps.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -56,7 +56,7 @@
 #include <X11/Xlocale.h>
 
 void
-Xutf8SetWMProperties (
+XFree86utf8SetWMProperties (
     Display *dpy,
     Window w,
     _Xconst char *windowName,
@@ -72,11 +72,11 @@
     XTextProperty *iprop = NULL;
 
     if (windowName &&
-	Xutf8TextListToTextProperty(dpy, (char**)&windowName, 1,
+	XFree86utf8TextListToTextProperty(dpy, (char**)&windowName, 1,
 				    XStdICCTextStyle, &wname) >= Success)
 	wprop = &wname;
     if (iconName &&
-	Xutf8TextListToTextProperty(dpy, (char**)&iconName, 1,
+	XFree86utf8TextListToTextProperty(dpy, (char**)&iconName, 1,
 				    XStdICCTextStyle, &iname) >= Success)
 	iprop = &iname;
     XSetWMProperties(dpy, w, wprop, iprop, argv, argc,

Index: utf8Wrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/utf8Wrap.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
--- utf8Wrap.c	26 Nov 2003 22:48:36 -0000	1.1.4.1
+++ utf8Wrap.c	8 Dec 2003 16:42:30 -0000	1.1.4.2
@@ -78,7 +78,7 @@
 #include "Xlcint.h"
 
 void
-Xutf8DrawText(
+XFree86utf8DrawText(
     Display            *dpy,
     Drawable            d,
     GC                  gc,
@@ -111,7 +111,7 @@
 }
 
 void
-Xutf8DrawString(
+XFree86utf8DrawString(
     Display            *dpy,
     Drawable            d,
     XFontSet            font_set,
@@ -127,7 +127,7 @@
 
 
 void
-Xutf8DrawImageString(
+XFree86utf8DrawImageString(
     Display            *dpy,
     Drawable            d,
     XFontSet            font_set,
@@ -142,7 +142,7 @@
 }
 
 int 
-Xutf8TextEscapement(
+XFree86utf8TextEscapement(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len)
@@ -152,7 +152,7 @@
 }
 
 int
-Xutf8TextExtents(
+XFree86utf8TextExtents(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len,
@@ -166,7 +166,7 @@
 }
 
 Status
-Xutf8TextPerCharExtents(
+XFree86utf8TextPerCharExtents(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len,



