Thu Apr 15 03:15:01 PDT 2004

Committed by: eich

Update of /cvs/xorg/xc/lib/X11
In directory pdx:/home/eich/tstbuild/xc/lib/X11

Modified Files:
      Tag: XORG-CURRENT
	Host.c ICWrap.c LiHosts.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 
	imThaiFlt.c imThaiIc.c imThaiIm.c lcDefConv.c lcEuc.c 
	lcGenConv.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:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


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

--- a/Host.c	5 Mar 2004 13:39:07 -0000	1.1.4.2
+++ b/Host.c	15 Apr 2004 10:14:54 -0000	1.1.4.3
@@ -1,78 +1,125 @@
 /* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
+/* $XdotOrg$ */
 /*
 
 Copyright 1986, 1998  The Open Group
+Copyright 2004 Sun Microsystems, Inc.
 
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
+All rights reserved.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-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.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+X Window System is a trademark of The Open Group.
 
 */
 /* $XFree86: xc/lib/X11/Host.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
 
-/* this might be rightly reguarded an os dependent file */
+/* this might be rightly regarded an os dependent file */
 
 #include "Xlibint.h"
 
 int
-XAddHost (dpy, host)
-    register Display *dpy;
-    XHostAddress *host;
-    {
+XAddHost (
+    register Display *dpy,
+    XHostAddress *host)
+{
     register xChangeHostsReq *req;
-    register int length = (host->length + 3) & ~0x3;	/* round up */
+    register int length;
+    XServerInterpretedAddress *siAddr;
+    int addrlen;
+
+    if (host->family == FamilyServerInterpreted) {
+	siAddr = (XServerInterpretedAddress *) host->address;
+	addrlen = siAddr->typelength + siAddr->valuelength + 1;
+    } else {
+	addrlen = host->length;
+    }
+    
+    length = (addrlen + 3) & ~0x3;	/* round up */
 
     LockDisplay(dpy);
     GetReqExtra (ChangeHosts, length, req);
     req->mode = HostInsert;
     req->hostFamily = host->family;
-    req->hostLength = host->length;
-    memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, host->length);
+    req->hostLength = addrlen;
+    if (host->family == FamilyServerInterpreted) {
+	char *dest = (char *) NEXTPTR(req,xChangeHostsReq);
+	memcpy(dest, siAddr->type, siAddr->typelength);
+	dest[siAddr->typelength] = '\0';
+	memcpy(dest + siAddr->typelength + 1,siAddr->value,siAddr->valuelength);
+    } else {
+	memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, addrlen);
+    }
     UnlockDisplay(dpy);
     SyncHandle();
     return 1;
-    }
+}
 
 int
-XRemoveHost (dpy, host)
-    register Display *dpy;
-    XHostAddress *host;
-    {
+XRemoveHost (
+    register Display *dpy,
+    XHostAddress *host)
+{
     register xChangeHostsReq *req;
-    register int length = (host->length + 3) & ~0x3;	/* round up */
+    register int length;
+    XServerInterpretedAddress *siAddr;
+    int addrlen;
+
+    if (host->family == FamilyServerInterpreted) {
+	siAddr = (XServerInterpretedAddress *) host->address;
+	addrlen = siAddr->typelength + siAddr->valuelength + 1;
+    } else {
+	addrlen = host->length;
+    }
+    
+    length = (addrlen + 3) & ~0x3;	/* round up */
 
     LockDisplay(dpy);
     GetReqExtra (ChangeHosts, length, req);
     req->mode = HostDelete;
     req->hostFamily = host->family;
-    req->hostLength = host->length;
-    memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, host->length);
+    req->hostLength = addrlen;
+    if (host->family == FamilyServerInterpreted) {
+	char *dest = (char *) NEXTPTR(req,xChangeHostsReq);
+	memcpy(dest, siAddr->type, siAddr->typelength);
+	dest[siAddr->typelength] = '\0';
+	memcpy(dest + siAddr->typelength + 1,siAddr->value,siAddr->valuelength);
+    } else {
+	memcpy((char *) NEXTPTR(req,xChangeHostsReq), host->address, addrlen);
+    }
     UnlockDisplay(dpy);
     SyncHandle();
     return 1;
-    }
+}
 
 int
-XAddHosts (dpy, hosts, n)
-    register Display *dpy;
-    XHostAddress *hosts;
-    int n;
+XAddHosts (
+    register Display *dpy,
+    XHostAddress *hosts,
+    int n)
 {
     register int i;
     for (i = 0; i < n; i++) {
@@ -82,10 +129,10 @@
 }
 
 int
-XRemoveHosts (dpy, hosts, n)
-    register Display *dpy;
-    XHostAddress *hosts;
-    int n;
+XRemoveHosts (
+    register Display *dpy,
+    XHostAddress *hosts,
+    int n)
 {
     register int i;
     for (i = 0; i < n; i++) {

Index: ICWrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ICWrap.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/ICWrap.c	5 Mar 2004 13:39:07 -0000	1.1.4.6
+++ b/ICWrap.c	15 Apr 2004 10:14:54 -0000	1.1.4.7
@@ -391,7 +391,8 @@
 }
 
 char *
-XFree86utf8ResetIC(XIC ic)
+Xutf8ResetIC(ic)
+    XIC ic;
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_reset)
@@ -402,15 +403,6 @@
     return (char *)NULL;
 }
 
-#ifndef NOXFREE86COMPAT
-#undef Xutf8ResetIC
-char *
-Xutf8ResetIC(XIC ic)
-{
-    return XFree86utf8ResetIC(ic);
-}
-#endif
-
 int
 XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
     XIC ic;
@@ -442,13 +434,13 @@
 }
 
 int
-XFree86utf8LookupString(
-    XIC ic,
-    register XKeyEvent *ev,
-    char *buffer,
-    int nbytes,
-    KeySym *keysym,
-    Status *status)
+Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
+    XIC ic;
+    register XKeyEvent *ev;
+    char *buffer;
+    int nbytes;
+    KeySym *keysym;
+    Status *status;
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_lookup_string)
@@ -460,18 +452,3 @@
     }
     return XLookupNone;
 }
-
-#ifndef NOXFREE86COMPAT
-#undef Xutf8LookupString
-int
-Xutf8LookupString(
-    XIC ic,
-    register XKeyEvent *ev,
-    char *buffer,
-    int nbytes,
-    KeySym *keysym,
-    Status *status)
-{
-    return XFree86utf8LookupString(ic, ev, buffer, nbytes, keysym, status);
-}
-#endif

Index: LiHosts.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/LiHosts.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/LiHosts.c	14 Nov 2003 15:54:36 -0000	1.1
+++ b/LiHosts.c	15 Apr 2004 10:14:54 -0000	1.1.4.1
@@ -1,27 +1,38 @@
 /* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
+/* $XdotOrg$ */
 /*
 
 Copyright 1986, 1998  The Open Group
+Copyright 2004 Sun Microsystems, Inc.
 
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
+All rights reserved.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-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.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+X Window System is a trademark of The Open Group.
 
 */
 
@@ -33,17 +44,18 @@
  * can be freed using XFree.
  */
 
-XHostAddress *XListHosts (dpy, nhosts, enabled)
-    register Display *dpy;
-    int *nhosts;	/* RETURN */
-    Bool *enabled;	/* RETURN */
-    {
+XHostAddress *XListHosts (
+    register Display *dpy,
+    int *nhosts,	/* RETURN */
+    Bool *enabled)	/* RETURN */
+{
     register XHostAddress *outbuf = 0, *op;
     xListHostsReply reply;
     long nbytes;
     unsigned char *buf, *bp;
     register unsigned i;
     register xListHostsReq *req;
+    XServerInterpretedAddress *sip;
 
     *nhosts = 0;
     LockDisplay(dpy);
@@ -56,9 +68,15 @@
     }
 
     if (reply.nHosts) {
+	unsigned int l;
 	nbytes = reply.length << 2;	/* compute number of bytes in reply */
+	l = (unsigned) (nbytes + 
+	      (reply.nHosts * sizeof(XHostAddress)) +
+	  (reply.nHosts * sizeof(XServerInterpretedAddress)));
 	op = outbuf = (XHostAddress *)
-	    Xmalloc((unsigned) (nbytes + reply.nHosts * sizeof(XHostAddress)));
+	    Xmalloc((unsigned) (nbytes + 
+	      (reply.nHosts * sizeof(XHostAddress)) +
+	      (reply.nHosts * sizeof(XServerInterpretedAddress))));
 
 	if (! outbuf) {	
 	    _XEatData(dpy, (unsigned long) nbytes);
@@ -66,8 +84,10 @@
 	    SyncHandle();
 	    return (XHostAddress *) NULL;
 	}
-	bp = buf = 
-	    ((unsigned char  *) outbuf) + reply.nHosts * sizeof(XHostAddress);
+	sip = (XServerInterpretedAddress *) 
+	 (((unsigned char  *) outbuf) + (reply.nHosts * sizeof(XHostAddress)));
+	bp = buf = ((unsigned char  *) sip) 
+	  + (reply.nHosts * sizeof(XServerInterpretedAddress));
 
 	_XRead (dpy, (char *) buf, nbytes);
 
@@ -81,7 +101,24 @@
 	    op->family = ((xHostEntry *) bp)->family;
 	    op->length =((xHostEntry *) bp)->length; 
 #endif
-	    op->address = (char *) (bp + SIZEOF(xHostEntry));
+	    if (op->family == FamilyServerInterpreted) {
+		char *tp = (char *) (bp + SIZEOF(xHostEntry));
+		char *vp = memchr(tp, 0, op->length);
+		
+		if (vp != NULL) {
+		    sip->type = tp;
+		    sip->typelength = vp - tp;
+		    sip->value = vp + 1;
+		    sip->valuelength = op->length - (sip->typelength + 1);
+		} else {
+		    sip->type = sip->value = NULL;
+		    sip->typelength = sip->valuelength = 0;
+		}
+		op->address = (char *) sip;
+		sip++;
+	    } else {
+		op->address = (char *) (bp + SIZEOF(xHostEntry));
+	    }
 	    bp += SIZEOF(xHostEntry) + (((op->length + 3) >> 2) << 2);
 	    op++;
 	}

Index: Ximint.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Ximint.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Ximint.h	5 Mar 2004 13:39:08 -0000	1.1.4.5
+++ b/Ximint.h	15 Apr 2004 10:14:54 -0000	1.1.4.6
@@ -705,7 +705,7 @@
     Status	*state
 );
 
-extern int	_XFree86imProtoUtf8LookupString(
+extern int	_XimProtoUtf8LookupString(
     XIC		 xic,
     XKeyEvent	*ev,
     char	*buffer,
@@ -764,7 +764,7 @@
     XComposeStatus	*status
 );
 
-extern int	_XFree86imLookupUtf8Text(
+extern int	_XimLookupUTF8Text(
     Xic			 ic,
     XKeyEvent		*event,
     char		*buffer,
@@ -915,7 +915,7 @@
     Status		*status
 );
 
-extern int _XFree86imLocalUtf8LookupString(
+extern int _XimLocalUtf8LookupString(
     XIC			 ic,
     XKeyEvent		*ev,
     char		*buffer,

Index: XlcPubI.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XlcPubI.h,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/XlcPubI.h	5 Mar 2004 13:39:08 -0000	1.1.4.6
+++ b/XlcPubI.h	15 Apr 2004 10:14:54 -0000	1.1.4.7
@@ -156,7 +156,7 @@
     int*		count_ret
 );
 
-extern int _XFree86utf8TextPropertyToTextList(
+extern int _Xutf8TextPropertyToTextList(
     XLCd		lcd,
     Display*		dpy,
     const XTextProperty* text_prop,
@@ -182,7 +182,7 @@
     XTextProperty*	/* text_prop */
 );
 
-extern int _XFree86utf8TextListToTextProperty(
+extern int _Xutf8TextListToTextProperty(
     XLCd		/* lcd */,
     Display*		/* dpy */,
     char**		/* list */,
@@ -246,12 +246,12 @@
 #endif
 
 extern int
-_XFree86mbstoutf8(
+_Xmbstoutf8(
     char *ustr,
     const char *str,
     int len);
 extern int
-_XFree86lcmbstoutf8(
+_Xlcmbstoutf8(
     XLCd lcd,
     char *ustr,
     const char *str,
@@ -293,7 +293,7 @@
 
 
 extern XPointer
-_XFree86utf8GetConvByName(
+_Utf8GetConvByName(
     const char *name);
 
 _XFUNCPROTOEND

Index: XlcPublic.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XlcPublic.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
--- a/XlcPublic.h	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/XlcPublic.h	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -206,7 +206,7 @@
 #define XlcNWideChar 		"wideChar"
 #define XlcNCompoundText 	"compoundText"
 #define XlcNString 		"string"
-#define XFree86lcNUtf8String 	"utf8String"
+#define XlcNUtf8String 		"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.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/Xlcint.h	5 Mar 2004 13:39:08 -0000	1.1.4.6
+++ b/Xlcint.h	15 Apr 2004 10:14:54 -0000	1.1.4.7
@@ -903,12 +903,12 @@
 );
 
 /* Registers UTF-8 converters for a non-UTF-8 locale. */
-extern void _XFree86lcAddUtf8Converters(
+extern void _XlcAddUtf8Converters(
     XLCd		lcd
 );
 
 /* Registers UTF-8 converters for a UTF-8 locale. */
-extern void _XFree86lcAddUtf8LocaleConverters(
+extern void _XlcAddUtf8LocaleConverters(
     XLCd		lcd
 );
 

Index: Xlib.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Xlib.h,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -d -r1.1.4.8 -r1.1.4.9
--- a/Xlib.h	5 Mar 2004 13:39:08 -0000	1.1.4.8
+++ b/Xlib.h	15 Apr 2004 10:14:54 -0000	1.1.4.9
@@ -379,6 +379,16 @@
 } XHostAddress;
 
 /*
+ * Data structure for ServerFamilyInterpreted addresses in host routines
+ */
+typedef struct {
+	int typelength;		/* length of type string, in bytes */
+	int valuelength;	/* length of value string, in bytes */
+	char *type;		/* pointer to where to find the type string */
+	char *value;		/* pointer to where to find the address */
+} XServerInterpretedAddress;
+
+/*
  * Data structure for "image" data, used by image manipulation routines.
  */
 typedef struct _XImage {
@@ -3654,14 +3664,11 @@
     int			/* num_wchars */
 );
 
-extern int XFree86utf8TextEscapement(
+extern int Xutf8TextEscapement(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8TextEscapement XFree86utf8TextEscapement
-#endif
 
 extern int XmbTextExtents(
     XFontSet		/* font_set */,
@@ -3679,16 +3686,13 @@
     XRectangle*		/* overall_logical_return */
 );
 
-extern int XFree86utf8TextExtents(
+extern int Xutf8TextExtents(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */,
     XRectangle*		/* overall_ink_return */,
     XRectangle*		/* overall_logical_return */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8TextExtents XFree86utf8TextExtents
-#endif
 
 extern Status XmbTextPerCharExtents(
     XFontSet		/* font_set */,
@@ -3714,7 +3718,7 @@
     XRectangle*		/* overall_logical_return */
 );
 
-extern Status XFree86utf8TextPerCharExtents(
+extern Status Xutf8TextPerCharExtents(
     XFontSet		/* font_set */,
     _Xconst char*	/* text */,
     int			/* bytes_text */,
@@ -3725,9 +3729,6 @@
     XRectangle*		/* overall_ink_return */,
     XRectangle*		/* overall_logical_return */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8TextPerCharExtents XFree86utf8TextPerCharExtents
-#endif
 
 extern void XmbDrawText(
     Display*		/* display */,
@@ -3749,7 +3750,7 @@
     int			/* nitems */
 );
 
-extern void XFree86utf8DrawText(
+extern void Xutf8DrawText(
     Display*		/* display */,
     Drawable		/* d */,
     GC			/* gc */,
@@ -3758,9 +3759,6 @@
     XmbTextItem*	/* text_items */,
     int			/* nitems */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8DrawText XFree86utf8DrawText
-#endif
 
 extern void XmbDrawString(
     Display*		/* display */,
@@ -3784,7 +3782,7 @@
     int			/* num_wchars */
 );
 
-extern void XFree86utf8DrawString(
+extern void Xutf8DrawString(
     Display*		/* display */,
     Drawable		/* d */,
     XFontSet		/* font_set */,
@@ -3794,9 +3792,6 @@
     _Xconst char*	/* text */,
     int			/* bytes_text */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8DrawString XFree86utf8DrawString
-#endif
 
 extern void XmbDrawImageString(
     Display*		/* display */,
@@ -3820,7 +3815,7 @@
     int			/* num_wchars */
 );
 
-extern void XFree86utf8DrawImageString(
+extern void Xutf8DrawImageString(
     Display*		/* display */,
     Drawable		/* d */,
     XFontSet		/* font_set */,
@@ -3830,9 +3825,6 @@
     _Xconst char*	/* text */,
     int			/* bytes_text */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8DrawImageString XFree86utf8DrawImageString
-#endif
 
 extern XIM XOpenIM(
     Display*			/* dpy */,
@@ -3885,12 +3877,9 @@
     XIC /* ic */
 );
 
-extern char *XFree86utf8ResetIC(
+extern char *Xutf8ResetIC(
     XIC /* ic */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8ResetIC XFree86utf8ResetIC
-#endif
 
 extern char *XSetICValues(
     XIC /* ic */, ...
@@ -3927,7 +3916,7 @@
     Status*		/* status_return */
 );
 
-extern int XFree86utf8LookupString(
+extern int Xutf8LookupString(
     XIC			/* ic */,
     XKeyPressedEvent*	/* event */,
     char*		/* buffer_return */,
@@ -3935,9 +3924,6 @@
     KeySym*		/* keysym_return */,
     Status*		/* status_return */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8LookupString XFree86utf8LookupString
-#endif
 
 extern XVaNestedList XVaCreateNestedList(
     int /*unused*/, ...

Index: XomGeneric.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XomGeneric.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
--- a/XomGeneric.h	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/XomGeneric.h	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -61,7 +61,7 @@
 typedef enum {
     XOMMultiByte,
     XOMWideChar,
-    XFree86OMUtf8String
+    XOMUtf8String
 } XOMTextType;
 
 typedef struct _FontDataRec {
@@ -178,7 +178,7 @@
 extern int
 _XwcDefaultTextEscapement(XOC oc, _Xconst wchar_t *text, int length);
 extern int
-_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length);
+_Xutf8DefaultTextEscapement(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
-_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
+_Xutf8DefaultTextExtents(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
-_XFree86utf8DefaultTextPerCharExtents(
+_Xutf8DefaultTextPerCharExtents(
     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
-_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
-    int x, int y, _Xconst char *text, int length);
+_Xutf8DefaultDrawString(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
-_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
-    int x, int y, _Xconst char *text, int length);
+_Xutf8DefaultDrawImageString(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
-_XFree86utf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
-    int x, int y, _Xconst char *text, int length);
+_Xutf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
+    _Xconst char *text, int length);
 extern void
-_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
-    int x, int y, _Xconst char *text, int length);
+_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
+    int y, _Xconst char *text, int length);
 extern Status
-_XFree86utf8GenericTextPerCharExtents(
+_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);
 extern int
-_XFree86utf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
+_Xutf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
     XRectangle *overall_ink, XRectangle *overall_logical);
 extern int
-_XFree86utf8GenericTextEscapement(XOC oc, _Xconst char *text, int length);
+_Xutf8GenericTextEscapement(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.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/Xutil.h	5 Mar 2004 13:39:08 -0000	1.1.4.6
+++ b/Xutil.h	15 Apr 2004 10:14:54 -0000	1.1.4.7
@@ -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 */
-    XFree86Utf8StringStyle	/* UTF8_STRING */
+    XUTF8StringStyle		/* UTF8_STRING */
 } XICCEncodingStyle;
 
 typedef struct {
@@ -672,7 +672,7 @@
     XClassHint*		/* class_hints */
 );
 
-extern void XFree86utf8SetWMProperties(
+extern void Xutf8SetWMProperties(
     Display*		/* display */,
     Window		/* w */,
     _Xconst char*	/* window_name */,
@@ -683,9 +683,6 @@
     XWMHints*		/* wm_hints */,
     XClassHint*		/* class_hints */
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8SetWMProperties XFree86utf8SetWMProperties
-#endif
 
 extern void XSetWMSizeHints(
     Display*		/* display */,
@@ -747,16 +744,13 @@
     XTextProperty*	text_prop_return
 );
 
-extern int XFree86utf8TextListToTextProperty(
+extern int Xutf8TextListToTextProperty(
     Display*		display,
     char**		list,
     int			count,
     XICCEncodingStyle	style,
     XTextProperty*	text_prop_return
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8TextListToTextProperty XFree86utf8TextListToTextProperty
-#endif
 
 extern void XwcFreeStringList(
     wchar_t**		list
@@ -782,15 +776,12 @@
     int*		count_return
 );
 
-extern int XFree86utf8TextPropertyToTextList(
+extern int Xutf8TextPropertyToTextList(
     Display*		display,
     const XTextProperty* text_prop,
     char***		list_return,
     int*		count_return
 );
-#ifndef NOXFREE86COMPAT
-#define Xutf8TextPropertyToTextList XFree86utf8TextPropertyToTextList
-#endif
 
 extern int XUnionRectWithRegion(
     XRectangle*		/* rectangle */,

Index: imConv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imConv.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/imConv.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/imConv.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -84,12 +84,12 @@
 _XimGetLocaleCode (
     _Xconst char*	encoding_name)
 {
-    XPointer cvt = _XFree86utf8GetConvByName(encoding_name);
+    XPointer cvt = _Utf8GetConvByName(encoding_name);
     if (!cvt && encoding_name) {
        int i;
        for (i = 0; i < num_substitute; i++)
            if (!strcmp(encoding_name, SubstTable[i].encoding_name))
-               return _XFree86utf8GetConvByName(SubstTable[i].charset_name);
+               return _Utf8GetConvByName(SubstTable[i].charset_name);
     }
     return cvt;
 }
@@ -298,7 +298,7 @@
 }
 
 int
-_XFree86imLookupUtf8Text(ic, event, buffer, nbytes, keysym, status)
+_XimLookupUTF8Text(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.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/imDefIc.c	5 Mar 2004 13:39:08 -0000	1.1.4.5
+++ b/imDefIc.c	15 Apr 2004 10:14:54 -0000	1.1.4.6
@@ -1212,7 +1212,7 @@
 }
 
 Private char *
-_XFree86imCommitedUtf8String(
+_XimCommitedUtf8String(
     Xim			 im,
     Xic			 ic,
     XPointer		 buf)
@@ -1262,10 +1262,10 @@
 }
 
 Private char *
-_XFree86imProtoUtf8Reset(
+_XimProtoUtf8Reset(
     XIC		 xic)
 {
-    return _XimProtoReset(xic, _XFree86imCommitedUtf8String);
+    return _XimProtoReset(xic, _XimCommitedUtf8String);
 }
 
 Private XICMethodsRec ic_methods = {
@@ -1276,10 +1276,10 @@
     _XimProtoGetICValues,	/* get_values */
     _XimProtoMbReset,		/* mb_reset */
     _XimProtoWcReset,		/* wc_reset */
-    _XFree86imProtoUtf8Reset,	/* utf8_reset */
+    _XimProtoUtf8Reset,		/* utf8_reset */
     _XimProtoMbLookupString,	/* mb_lookup_string */
     _XimProtoWcLookupString,	/* wc_lookup_string */
-    _XFree86imProtoUtf8LookupString	/* utf8_lookup_string */
+    _XimProtoUtf8LookupString	/* utf8_lookup_string */
 };
 
 Private Bool

Index: imDefIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imDefIm.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/imDefIm.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/imDefIm.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -1587,7 +1587,7 @@
 				 XlcNCompoundText, lcd, XlcNWideChar)))
 	    return False;
 	if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+				 XlcNCompoundText, lcd, XlcNUtf8String)))
 	    return False;
     }
 
@@ -1602,7 +1602,7 @@
 				 XlcNCompoundText, lcd, XlcNWideChar)))
 		    return False;
 		if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
-				 XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+				 XlcNCompoundText, lcd, XlcNUtf8String)))
 		    return False;
 		break;
 	    } else {
@@ -1634,7 +1634,7 @@
 	return False;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
 	return False;
     private->cstoutf8_conv = conv;
 
@@ -1642,7 +1642,7 @@
 	return False;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
 	return False;
     private->ucstoutf8_conv = conv;
 

Index: imDefLkup.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imDefLkup.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/imDefLkup.c	5 Mar 2004 13:39:08 -0000	1.1.4.5
+++ b/imDefLkup.c	15 Apr 2004 10:14:54 -0000	1.1.4.6
@@ -1105,7 +1105,7 @@
 }
 
 Public int
-_XFree86imProtoUtf8LookupString(
+_XimProtoUtf8LookupString(
     XIC			 xic,
     XKeyEvent		*ev,
     char		*buffer,
@@ -1145,7 +1145,7 @@
 	_XimUnregCommitInfo(ic);
 
     } else if (ev->type == KeyPress) {
-	ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
+	ret = _XimLookupUTF8Text(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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/imLcIc.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/imLcIc.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -125,7 +125,7 @@
     _XimLocalMbReset,		/* utf8_reset */
     _XimLocalMbLookupString,	/* mb_lookup_string */
     _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XFree86imLocalUtf8LookupString	/* utf8_lookup_string */
+    _XimLocalUtf8LookupString	/* utf8_lookup_string */
 };
 
 Public XIC

Index: imLcIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcIm.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/imLcIm.c	5 Mar 2004 13:39:08 -0000	1.1.4.5
+++ b/imLcIm.c	15 Apr 2004 10:14:54 -0000	1.1.4.6
@@ -300,7 +300,7 @@
 	goto Open_Error;
     private->ctow_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNUtf8String)))
 	goto Open_Error;
     private->ctoutf8_conv = conv;
 
@@ -312,7 +312,7 @@
 	goto Open_Error;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
 	goto Open_Error;
     private->cstoutf8_conv = conv;
 
@@ -320,7 +320,7 @@
 	goto Open_Error;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
 	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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/imLcLkup.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/imLcLkup.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -161,7 +161,7 @@
 }
 
 Public int
-_XFree86imLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
+_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
     XIC		  xic;
     XKeyEvent	 *ev;
     char	 *buffer;
@@ -199,7 +199,7 @@
 	}
 	return (ret);
     } else { /* Throughed Event */
-	ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
+	ret = _XimLookupUTF8Text(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.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/imLcPrs.c	5 Mar 2004 13:39:08 -0000	1.1.4.6
+++ b/imLcPrs.c	15 Apr 2004 10:14:54 -0000	1.1.4.7
@@ -47,7 +47,7 @@
     int		len
 );
 
-extern int _XFree86mbstoutf8(
+extern int _Xmbstoutf8(
     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 = _XFree86mbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
+    l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
     if (l == LOCAL_UTF8_BUFSIZE - 1) {
 	local_wc_buf[l] = '\0';
     }

Index: imThaiFlt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imThaiFlt.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/imThaiFlt.c	5 Mar 2004 13:39:08 -0000	1.1.4.7
+++ b/imThaiFlt.c	15 Apr 2004 10:14:54 -0000	1.1.4.8
@@ -1358,7 +1358,7 @@
     _Xlcwcstombs(ic->core.im->core.lcd, ic->private.local.composed->mb,
 		 ic->private.local.composed->wc, 10);
 
-    _XFree86lcmbstoutf8(ic->core.im->core.lcd, ic->private.local.composed->utf8,
+    _Xlcmbstoutf8(ic->core.im->core.lcd, ic->private.local.composed->utf8,
 		  ic->private.local.composed->mb, 10);
 
     /* Remember the last character inputted

Index: imThaiIc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imThaiIc.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/imThaiIc.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/imThaiIc.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -138,7 +138,7 @@
     _XimThaiMbReset,		/* utf8_reset */
     _XimLocalMbLookupString,	/* mb_lookup_string */
     _XimLocalWcLookupString,	/* wc_lookup_string */
-    _XFree86imLocalUtf8LookupString	/* utf8_lookup_string */
+    _XimLocalUtf8LookupString	/* utf8_lookup_string */
 };
 
 XIC

Index: imThaiIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imThaiIm.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/imThaiIm.c	5 Mar 2004 13:39:08 -0000	1.1.4.3
+++ b/imThaiIm.c	15 Apr 2004 10:14:54 -0000	1.1.4.4
@@ -106,7 +106,7 @@
 	goto Open_Error;
     private->ctow_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNUtf8String)))
 	goto Open_Error;
     private->ctoutf8_conv = conv;
 
@@ -118,7 +118,7 @@
 	goto Open_Error;
     private->cstowc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNUtf8String)))
 	goto Open_Error;
     private->cstoutf8_conv = conv;
 
@@ -126,7 +126,7 @@
 	goto Open_Error;
     private->ucstoc_conv = conv;
 
-    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XFree86lcNUtf8String)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNUcsChar, lcd, XlcNUtf8String)))
 	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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/lcDefConv.c	5 Mar 2004 13:39:08 -0000	1.1.4.3
+++ b/lcDefConv.c	15 Apr 2004 10:14:54 -0000	1.1.4.4
@@ -784,7 +784,7 @@
     _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
     _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
 
-    _XFree86lcAddUtf8Converters(lcd);
+    _XlcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcEuc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcEuc.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/lcEuc.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/lcEuc.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -1488,7 +1488,7 @@
     _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
 #endif
 
-    _XFree86lcAddUtf8Converters(lcd);
+    _XlcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcGenConv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcGenConv.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/lcGenConv.c	5 Mar 2004 13:39:08 -0000	1.1.4.4
+++ b/lcGenConv.c	15 Apr 2004 10:14:54 -0000	1.1.4.5
@@ -3142,7 +3142,7 @@
     }
 #endif
 
-    _XFree86lcAddUtf8Converters(lcd);
+    _XlcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcJis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcJis.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/lcJis.c	5 Mar 2004 13:39:08 -0000	1.1.4.3
+++ b/lcJis.c	15 Apr 2004 10:14:55 -0000	1.1.4.4
@@ -934,7 +934,7 @@
     }
 #endif
 
-    _XFree86lcAddUtf8Converters(lcd);
+    _XlcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcPrTxt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcPrTxt.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/lcPrTxt.c	5 Mar 2004 13:39:09 -0000	1.1.4.4
+++ b/lcPrTxt.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -139,7 +139,7 @@
     if (encoding == XA_STRING)
 	from_type = XlcNString;
     else if (encoding == XInternAtom(dpy, "UTF8_STRING", False))
-	from_type = XFree86lcNUtf8String;
+	from_type = XlcNUtf8String;
     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, XFree86lcNUtf8String) == 0)
+	if (strcmp(to_type, XlcNUtf8String) == 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 XFree86lcNUtf8String to XFree86lcNUtf8String */
+       or XlcNUtf8String to XlcNUtf8String */
     if (!strcmp(from_type, to_type)) {
         do_strcpy = True;
     } else {
@@ -265,14 +265,14 @@
 }
 
 int
-_XFree86utf8TextPropertyToTextList(
+_Xutf8TextPropertyToTextList(
     XLCd lcd,
     Display *dpy,
     const XTextProperty *text_prop,
     char ***list_ret,
     int *count_ret)
 {
-    return _XTextPropertyToTextList(lcd, dpy, text_prop, XFree86lcNUtf8String,
+    return _XTextPropertyToTextList(lcd, dpy, text_prop, XlcNUtf8String,
 				    (XPointer **) list_ret, count_ret);
 }
 

Index: lcPublic.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcPublic.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/lcPublic.c	5 Mar 2004 13:39:09 -0000	1.1.4.4
+++ b/lcPublic.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -50,10 +50,10 @@
 	_XrmDefaultInitParseInfo,
 	_XmbTextPropertyToTextList,
 	_XwcTextPropertyToTextList,
-	_XFree86utf8TextPropertyToTextList,
+	_Xutf8TextPropertyToTextList,
 	_XmbTextListToTextProperty,
 	_XwcTextListToTextProperty,
-	_XFree86utf8TextListToTextProperty,
+	_Xutf8TextListToTextProperty,
 	_XwcFreeStringList,
 	default_string,
 	NULL,

Index: lcSjis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcSjis.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/lcSjis.c	5 Mar 2004 13:39:09 -0000	1.1.4.3
+++ b/lcSjis.c	15 Apr 2004 10:14:55 -0000	1.1.4.4
@@ -1556,7 +1556,7 @@
     _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
 #endif
 
-    _XFree86lcAddUtf8Converters(lcd);
+    _XlcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcStd.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcStd.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/lcStd.c	5 Mar 2004 13:39:09 -0000	1.1.4.5
+++ b/lcStd.c	15 Apr 2004 10:14:55 -0000	1.1.4.6
@@ -319,7 +319,7 @@
 
 
 int
-_XFree86lcmbstoutf8(
+_Xlcmbstoutf8(
     XLCd lcd,
     char *ustr,
     const char *str,
@@ -335,7 +335,7 @@
 	    return -1;
     }
 
-    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XFree86lcNUtf8String);
+    conv = _XlcOpenConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String);
     if (conv == NULL)
 	return -1;
 
@@ -358,10 +358,10 @@
 }
 
 int
-_XFree86mbstoutf8(
+_Xmbstoutf8(
     char *ustr,
     const char *str,
     int len)
 {
-    return _XFree86lcmbstoutf8((XLCd) NULL, ustr, str, len);
+    return _Xlcmbstoutf8((XLCd) NULL, ustr, str, len);
 }

Index: lcTxtPr.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcTxtPr.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/lcTxtPr.c	5 Mar 2004 13:39:09 -0000	1.1.4.3
+++ b/lcTxtPr.c	15 Apr 2004 10:14:55 -0000	1.1.4.4
@@ -97,9 +97,9 @@
 	    encoding = XA_STRING;
 	    to_type = XlcNString;
 	    break;
-	case XFree86Utf8StringStyle:
+	case XUTF8StringStyle:
 	    encoding = XInternAtom(dpy, "UTF8_STRING", False);
-	    to_type = XFree86lcNUtf8String;
+	    to_type = XlcNUtf8String;
 	    break;
 	case XCompoundTextStyle:
 	    encoding = XInternAtom(dpy, "COMPOUND_TEXT", False);
@@ -240,7 +240,7 @@
 }
 
 int
-_XFree86utf8TextListToTextProperty(
+_Xutf8TextListToTextProperty(
     XLCd lcd,
     Display *dpy,
     char **list,
@@ -248,6 +248,6 @@
     XICCEncodingStyle style,
     XTextProperty *text_prop)
 {
-    return _XTextListToTextProperty(lcd, dpy, XFree86lcNUtf8String, 
-		    		    (XPointer) list, count, style, text_prop);
+    return _XTextListToTextProperty(lcd, dpy, XlcNUtf8String, (XPointer) list,
+				    count, style, text_prop);
 }

Index: lcUTF8.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcUTF8.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/lcUTF8.c	5 Mar 2004 13:39:09 -0000	1.1.4.3
+++ b/lcUTF8.c	15 Apr 2004 10:14:55 -0000	1.1.4.4
@@ -371,7 +371,8 @@
 	    init_all_charsets();					\
     } while (0)
 
-/* from XlcNCharSet to XFree86lcNUtf8String */ 
+/* from XlcNCharSet to XlcNUtf8String */
+
 static int
 cstoutf8(
     XlcConv conv,
@@ -463,7 +464,7 @@
     return create_conv(from_lcd, &methods_cstoutf8);
 }
 
-/* from XFree86lcNUtf8String to XlcNCharSet */
+/* from XlcNUtf8String to XlcNCharSet */
 
 static XlcConv
 create_tocs_conv(
@@ -677,7 +678,7 @@
     return create_tocs_conv(from_lcd, &methods_utf8tocs);
 }
 
-/* from XFree86lcNUtf8String to XlcNChar */
+/* from XlcNUtf8String to XlcNChar */
 
 static int
 utf8tocs1(
@@ -781,7 +782,7 @@
     return create_tocs_conv(from_lcd, &methods_utf8tocs1);
 }
 
-/* from XFree86lcNUtf8String to XlcNString */
+/* from XlcNUtf8String to XlcNString */
 
 static int
 utf8tostr(
@@ -857,7 +858,7 @@
     return create_conv(from_lcd, &methods_utf8tostr);
 }
 
-/* from XlcNString to XFree86lcNUtf8String */
+/* from XlcNString to XlcNUtf8String */
 
 static int
 strtoutf8(
@@ -917,7 +918,7 @@
 /* Support for the input methods. */
 
 XPointer
-_XFree86utf8GetConvByName(
+_Utf8GetConvByName(
     const char *name)
 {
     XrmQuark xrm_name;
@@ -1055,7 +1056,7 @@
     return create_ucstocs_conv(from_lcd, &methods_ucstocs1);
 }
 
-/* from XlcNUcsChar to XFree86lcNUtf8String, needed for input methods */
+/* from XlcNUcsChar to XlcNUtf8String, needed for input methods */
 
 static int
 ucstoutf8(
@@ -1118,16 +1119,16 @@
 
 /* Registers UTF-8 converters for a non-UTF-8 locale. */
 void
-_XFree86lcAddUtf8Converters(
+_XlcAddUtf8Converters(
     XLCd lcd)
 {
-    _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, 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, XlcNUcsChar,    lcd, XlcNChar, open_ucstocs1);
-    _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XFree86lcNUtf8String, open_ucstoutf8);
+    _XlcSetConverter(lcd, XlcNUcsChar,    lcd, XlcNUtf8String, open_ucstoutf8);
 }
 
 /***************************************************************************/
@@ -1801,7 +1802,7 @@
 /* Registers UTF-8 converters for a UTF-8 locale. */
 
 void
-_XFree86lcAddUtf8LocaleConverters(
+_XlcAddUtf8LocaleConverters(
     XLCd lcd)
 {
     /* Register elementary converters. */
@@ -1826,8 +1827,8 @@
 
     _XlcSetConverter(lcd, XlcNString, lcd, XlcNMultiByte, open_strtoutf8);
     _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString, open_utf8tostr);
-    _XlcSetConverter(lcd, XFree86lcNUtf8String, lcd, XlcNMultiByte, open_identity);
-    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XFree86lcNUtf8String, open_identity);
+    _XlcSetConverter(lcd, XlcNUtf8String, lcd, XlcNMultiByte, open_identity);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNUtf8String, 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.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/lcUTF8Load.c	5 Mar 2004 13:39:09 -0000	1.1.4.3
+++ b/lcUTF8Load.c	15 Apr 2004 10:14:55 -0000	1.1.4.4
@@ -54,8 +54,8 @@
 	return (XLCd) NULL;
     }
 
-    _XFree86lcAddUtf8LocaleConverters(lcd);
-    _XFree86lcAddUtf8Converters(lcd);
+    _XlcAddUtf8LocaleConverters(lcd);
+    _XlcAddUtf8Converters(lcd);
 
     return lcd;
 }

Index: lcWrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/lcWrap.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/lcWrap.c	5 Mar 2004 13:39:09 -0000	1.1.4.5
+++ b/lcWrap.c	15 Apr 2004 10:14:55 -0000	1.1.4.6
@@ -406,7 +406,7 @@
 }
 
 int
-XFree86utf8TextPropertyToTextList(
+Xutf8TextPropertyToTextList(
     Display *dpy,
     const XTextProperty *text_prop,
     char ***list_ret,
@@ -420,18 +420,6 @@
     return (*lcd->methods->utf8_text_prop_to_list)(lcd, dpy, text_prop,
 						   list_ret, count_ret);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8TextPropertyToTextList
-int
-Xutf8TextPropertyToTextList(
-    Display *dpy,
-    const XTextProperty *text_prop,
-    char ***list_ret,
-    int *count_ret)
-{
-    return XFree86utf8TextPropertyToTextList(dpy, text_prop, list_ret, count_ret);
-}
-#endif
 
 int
 XmbTextListToTextProperty(
@@ -468,7 +456,7 @@
 }
 
 int
-XFree86utf8TextListToTextProperty(
+Xutf8TextListToTextProperty(
     Display *dpy,
     char **list,
     int count,
@@ -483,19 +471,6 @@
     return (*lcd->methods->utf8_text_list_to_prop)(lcd, dpy, list, count,
 						   style, text_prop);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8TextListToTextProperty
-int
-Xutf8TextListToTextProperty(
-    Display *dpy,
-    char **list,
-    int count,
-    XICCEncodingStyle style,
-    XTextProperty *text_prop)
-{
-    return XFree86utf8TextListToTextProperty(dpy, list, count, style, text_prop);
-}
-#endif
 
 void
 XwcFreeStringList(

Index: omDefault.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omDefault.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omDefault.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omDefault.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -73,7 +73,7 @@
     XlcConv conv;
     int to_left, ret;
 
-    conv = _XomInitConverter(oc, XFree86OMUtf8String);
+    conv = _XomInitConverter(oc, XOMUtf8String);
     if (conv == NULL)
 	return False;
 
@@ -116,7 +116,7 @@
 }
 
 int
-_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
+_Xutf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -190,9 +190,8 @@
 }
 
 int
-_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
-			       XRectangle *overall_ink, 
-			       XRectangle *overall_logical)
+_Xutf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
+			 XRectangle *overall_ink, XRectangle *overall_logical)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -314,12 +313,11 @@
 }
 
 Status
-_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)
+_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)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -380,8 +378,8 @@
 }
 
 int
-_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
-			      int x, int y, _Xconst char *text, int length)
+_Xutf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
+			_Xconst char *text, int length)
 {
     DefineLocalBuf;
     char *buf = AllocLocalBuf(length);
@@ -431,8 +429,8 @@
 }
 
 void
-_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
-				   int x, int y, _Xconst char *text, int length)
+_Xutf8DefaultDrawImageString(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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omGeneric.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omGeneric.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -66,26 +66,26 @@
 
 #if 0
 extern int _XmbDefaultTextEscapement(), _XwcDefaultTextEscapement(),
-	   _XFree86utf8DefaultTextEscapement();
+	   _Xutf8DefaultTextEscapement();
 extern int _XmbDefaultTextExtents(), _XwcDefaultTextExtents(),
-	   _XFree86utf8DefaultTextExtents();
+	   _Xutf8DefaultTextExtents();
 extern Status _XmbDefaultTextPerCharExtents(), _XwcDefaultTextPerCharExtents(),
-	      _XFree86utf8DefaultTextPerCharExtents();
+	      _Xutf8DefaultTextPerCharExtents();
 extern int _XmbDefaultDrawString(), _XwcDefaultDrawString(),
-	   _XFree86utf8DefaultDrawString();
+	   _Xutf8DefaultDrawString();
 extern void _XmbDefaultDrawImageString(), _XwcDefaultDrawImageString(),
-	    _XFree86utf8DefaultDrawImageString();
+	    _Xutf8DefaultDrawImageString();
 
 extern int _XmbGenericTextEscapement(), _XwcGenericTextEscapement(),
-	   _XFree86utf8GenericTextEscapement();
+	   _Xutf8GenericTextEscapement();
 extern int _XmbGenericTextExtents(), _XwcGenericTextExtents(),
-	   _XFree86utf8GenericTextExtents();
+	   _Xutf8GenericTextExtents();
 extern Status _XmbGenericTextPerCharExtents(), _XwcGenericTextPerCharExtents(),
-	      _XFree86utf8GenericTextPerCharExtents();
+	      _Xutf8GenericTextPerCharExtents();
 extern int _XmbGenericDrawString(), _XwcGenericDrawString(),
-	   _XFree86utf8GenericDrawString();
+	   _Xutf8GenericDrawString();
 extern void _XmbGenericDrawImageString(), _XwcGenericDrawImageString(),
-	    _XFree86utf8GenericDrawImageString();
+	    _Xutf8GenericDrawImageString();
 
 extern void _XlcDbg_printValue (const char *str, char **value, int num);
 #endif
@@ -1583,11 +1583,11 @@
     _XwcDefaultTextPerCharExtents,
     _XwcDefaultDrawString,
     _XwcDefaultDrawImageString,
-    _XFree86utf8DefaultTextEscapement,
-    _XFree86utf8DefaultTextExtents,
-    _XFree86utf8DefaultTextPerCharExtents,
-    _XFree86utf8DefaultDrawString,
-    _XFree86utf8DefaultDrawImageString
+    _Xutf8DefaultTextEscapement,
+    _Xutf8DefaultTextExtents,
+    _Xutf8DefaultTextPerCharExtents,
+    _Xutf8DefaultDrawString,
+    _Xutf8DefaultDrawImageString
 };
 
 static XOCMethodsRec oc_generic_methods = {
@@ -1604,11 +1604,11 @@
     _XwcGenericTextPerCharExtents,
     _XwcGenericDrawString,
     _XwcGenericDrawImageString,
-    _XFree86utf8GenericTextEscapement,
-    _XFree86utf8GenericTextExtents,
-    _XFree86utf8GenericTextPerCharExtents,
-    _XFree86utf8GenericDrawString,
-    _XFree86utf8GenericDrawImageString
+    _Xutf8GenericTextEscapement,
+    _Xutf8GenericTextExtents,
+    _Xutf8GenericTextPerCharExtents,
+    _Xutf8GenericDrawString,
+    _Xutf8GenericDrawImageString
 };
 
 typedef struct _XOCMethodsListRec {

Index: omImText.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omImText.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omImText.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omImText.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -81,9 +81,9 @@
 }
 
 void
-_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, 
-				   int x, int y, _Xconst char *text, int length)
+_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
+			     int y, _Xconst char *text, int length)
 {
-    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XFree86OMUtf8String,
+    _XomGenericDrawImageString(dpy, d, oc, gc, x, y, XOMUtf8String,
 			       (XPointer) text, length);
 }

Index: omText.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omText.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/omText.c	5 Mar 2004 13:39:10 -0000	1.1.4.5
+++ b/omText.c	15 Apr 2004 10:14:55 -0000	1.1.4.6
@@ -361,9 +361,9 @@
 }
 
 int
-_XFree86utf8GenericDrawString(Display *dpy, Drawable d, XOC oc, GC gc, 
-			      int x, int y, _Xconst char *text, int length)
+_Xutf8GenericDrawString(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, XFree86OMUtf8String,
+    return _XomGenericDrawString(dpy, d, oc, gc, x, y, XOMUtf8String,
 				 (XPointer) text, length);
 }

Index: omTextEsc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omTextEsc.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omTextEsc.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omTextEsc.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -292,8 +292,8 @@
 }
 
 int
-_XFree86utf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
+_Xutf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
 {
-    return _XomGenericTextEscapement(oc, XFree86OMUtf8String, (XPointer) text,
+    return _XomGenericTextEscapement(oc, XOMUtf8String, (XPointer) text,
 				     length);
 }

Index: omTextExt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/omTextExt.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omTextExt.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omTextExt.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -126,9 +126,9 @@
 }
 
 int
-_XFree86utf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
+_Xutf8GenericTextExtents(XOC oc, _Xconst char *text, int length,
 			 XRectangle *overall_ink, XRectangle *overall_logical)
 {
-    return _XomGenericTextExtents(oc, XFree86OMUtf8String, (XPointer) text, 
-		    		  length, overall_ink, overall_logical);
+    return _XomGenericTextExtents(oc, XOMUtf8String, (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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omTextPer.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omTextPer.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -188,15 +188,14 @@
 }
 
 Status
-_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)
+_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)
 {
-    return _XomGenericTextPerCharExtents(oc, XFree86OMUtf8String, 
-		    			 (XPointer) text, length, ink_buf, 
-					 logical_buf, buf_size, num_chars, 
-					 overall_ink, overall_logical);
+    return _XomGenericTextPerCharExtents(oc, XOMUtf8String, (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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/omXChar.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/omXChar.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -448,9 +448,9 @@
 	convp = &gen->mbs_to_cs;
 	conv_type = XlcNMultiByte;
 	break;
-    case XFree86OMUtf8String:
+    case XOMUtf8String:
 	convp = &gen->utf8_to_cs;
-	conv_type = XFree86lcNUtf8String;
+	conv_type = XlcNUtf8String;
 	break;
     default:
 	return (XlcConv) NULL;

Index: utf8WMProps.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/utf8WMProps.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/utf8WMProps.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/utf8WMProps.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -56,7 +56,7 @@
 #include <X11/Xlocale.h>
 
 void
-XFree86utf8SetWMProperties (
+Xutf8SetWMProperties (
     Display *dpy,
     Window w,
     _Xconst char *windowName,
@@ -72,11 +72,11 @@
     XTextProperty *iprop = NULL;
 
     if (windowName &&
-	XFree86utf8TextListToTextProperty(dpy, (char**)&windowName, 1,
+	Xutf8TextListToTextProperty(dpy, (char**)&windowName, 1,
 				    XStdICCTextStyle, &wname) >= Success)
 	wprop = &wname;
     if (iconName &&
-	XFree86utf8TextListToTextProperty(dpy, (char**)&iconName, 1,
+	Xutf8TextListToTextProperty(dpy, (char**)&iconName, 1,
 				    XStdICCTextStyle, &iname) >= Success)
 	iprop = &iname;
     XSetWMProperties(dpy, w, wprop, iprop, argv, argc,
@@ -88,21 +88,3 @@
 
     /* Note: The WM_LOCALE_NAME property is set by XSetWMProperties. */
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8SetWMProperties
-void
-Xutf8SetWMProperties (
-    Display *dpy,
-    Window w,
-    _Xconst char *windowName,
-    _Xconst char *iconName,
-    char **argv,
-    int argc,
-    XSizeHints *sizeHints,
-    XWMHints *wmHints,
-    XClassHint *classHints)
-{
-    XFree86utf8SetWMProperties (dpy, w, windowName, iconName, argv, argc,
-	sizeHints, wmHints, classHints);
-}
-#endif

Index: utf8Wrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/utf8Wrap.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/utf8Wrap.c	5 Mar 2004 13:39:10 -0000	1.1.4.4
+++ b/utf8Wrap.c	15 Apr 2004 10:14:55 -0000	1.1.4.5
@@ -78,7 +78,7 @@
 #include "Xlcint.h"
 
 void
-XFree86utf8DrawText(
+Xutf8DrawText(
     Display            *dpy,
     Drawable            d,
     GC                  gc,
@@ -109,24 +109,9 @@
 	x += esc;
     }
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8DrawText
-void
-Xutf8DrawText(
-    Display            *dpy,
-    Drawable            d,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    XmbTextItem        *text_items,
-    int                 nitems)
-{
-    XFree86utf8DrawText(dpy, d, gc, x, y, text_items, nitems);
-}
-#endif
 
 void
-XFree86utf8DrawString(
+Xutf8DrawString(
     Display            *dpy,
     Drawable            d,
     XFontSet            font_set,
@@ -139,25 +124,10 @@
     (void)(*font_set->methods->utf8_draw_string) (dpy, d, font_set, gc, x, y,
 						  (char *)text, text_len);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8DrawString
-void
-Xutf8DrawString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst char       *text,
-    int                 text_len)
-{
-    XFree86utf8DrawString(dpy, d, font_set, gc, x, y, text, text_len);
-}
-#endif
+
 
 void
-XFree86utf8DrawImageString(
+Xutf8DrawImageString(
     Display            *dpy,
     Drawable            d,
     XFontSet            font_set,
@@ -170,25 +140,9 @@
     (*font_set->methods->utf8_draw_image_string) (dpy, d, font_set, gc, x, y,
 						  (char *)text, text_len);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8DrawImageString
-void
-Xutf8DrawImageString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst char       *text,
-    int                 text_len)
-{
-    XFree86utf8DrawImageString(dpy, d, font_set, gc, x, y, text, text_len);
-}
-#endif
 
 int 
-XFree86utf8TextEscapement(
+Xutf8TextEscapement(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len)
@@ -196,20 +150,9 @@
     return (*font_set->methods->utf8_escapement) (font_set,
 						  (char *)text, text_len);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8TextEscapement
-int 
-Xutf8TextEscapement(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len)
-{
-    return XFree86utf8TextEscapement(font_set, text, text_len);
-}
-#endif
 
 int
-XFree86utf8TextExtents(
+Xutf8TextExtents(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len,
@@ -221,23 +164,9 @@
 					       overall_ink_extents,
 					       overall_logical_extents);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8TextExtents
-int
-Xutf8TextExtents(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len,
-    XRectangle     *overall_ink_extents,
-    XRectangle     *overall_logical_extents)
-{
-    return XFree86utf8TextExtents(font_set, text, text_len,
-	overall_ink_extents, overall_logical_extents);
-}
-#endif
 
 Status
-XFree86utf8TextPerCharExtents(
+Xutf8TextPerCharExtents(
     XFontSet        font_set,
     _Xconst char   *text,
     int             text_len,
@@ -253,22 +182,3 @@
 	      ink_extents_buffer, logical_extents_buffer,
 	      buffer_size, num_chars, max_ink_extents, max_logical_extents);
 }
-#ifndef NOXFREE86COMPAT
-#undef Xutf8TextPerCharExtents
-Status
-Xutf8TextPerCharExtents(
-    XFontSet        font_set,
-    _Xconst char   *text,
-    int             text_len,
-    XRectangle     *ink_extents_buffer,
-    XRectangle     *logical_extents_buffer,
-    int             buffer_size,
-    int            *num_chars,
-    XRectangle     *max_ink_extents,
-    XRectangle     *max_logical_extents)
-{
-    return XFree86utf8TextPerCharExtents(font_set, text, text_len,
-	ink_extents_buffer, logical_extents_buffer, buffer_size,
-	    num_chars, max_ink_extents, max_logical_extents);
-}
-#endif


