1 files changed, 31 insertions, 20 deletions

diff --git a/modules/om/generic/omXChar.c b/modules/om/generic/omXChar.c
index eb47e66d..ce7b3287 100644
--- a/modules/om/generic/omXChar.c
+++ b/modules/om/generic/omXChar.c
@@ -34,6 +34,7 @@
 /*
  * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD)
  */
+/* $XFree86: xc/lib/X11/omXChar.c,v 1.5 2001/01/17 19:41:57 dawes Exp $ */
 
 #include "Xlibint.h"
 #include "XlcPublic.h"
@@ -113,13 +114,13 @@ check_vertical_fonttype(name)
 #define FONTSCOPE     2
 
 FontData
-_XomGetFontDataFromFontSet(fs,str,len,len_ret,is2b,type)
-FontSet fs;
-unsigned char *str;
-int len;
-int *len_ret;
-int is2b;     
-int type;          /* VMAP , VROTATE , else */
+_XomGetFontDataFromFontSet(fs, str,len, len_ret, is2b, type)
+    FontSet fs;
+    unsigned char *str;
+    int len;
+    int *len_ret;
+    int is2b;     
+    int type;          /* VMAP , VROTATE , else */
 {
     unsigned long value;
     int num,i,hit,csize;
@@ -435,18 +436,29 @@ _XomInitConverter(oc, type)
     XOMTextType type;
 {
     XOCGenericPart *gen = XOC_GENERIC(oc);
-    XlcConv conv;
+    XlcConv *convp;
     char *conv_type;
+    XlcConv conv;
     XLCd lcd;
 
-    if (type == XOMWideChar) {
-	conv = gen->wcs_to_cs;
+    switch (type) {
+    case XOMWideChar:
+	convp = &gen->wcs_to_cs;
 	conv_type = XlcNWideChar;
-    } else {
-	conv = gen->mbs_to_cs;
+	break;
+    case XOMMultiByte:
+	convp = &gen->mbs_to_cs;
 	conv_type = XlcNMultiByte;
+	break;
+    case XOMUtf8String:
+	convp = &gen->utf8_to_cs;
+	conv_type = XlcNUtf8String;
+	break;
+    default:
+	return (XlcConv) NULL;
     }
 
+    conv = *convp;
     if (conv) {
 	_XlcResetConverter(conv);
 	return conv;
@@ -454,14 +466,13 @@ _XomInitConverter(oc, type)
 
     lcd = oc->core.om->core.lcd;
 
-    conv = _XlcOpenConverter(lcd, conv_type, lcd, XlcNCharSet);
-    if (conv == (XlcConv) NULL)
-	return (XlcConv) NULL;
-
-    if (type == XOMWideChar)
-	gen->wcs_to_cs = conv;
-    else
-	gen->mbs_to_cs = conv;
+    conv = _XlcOpenConverter(lcd, conv_type, lcd, XlcNFontCharSet);
+    if (conv == (XlcConv) NULL) {
+        conv = _XlcOpenConverter(lcd, conv_type, lcd, XlcNCharSet);
+        if (conv == (XlcConv) NULL)
+	    return (XlcConv) NULL;
+    }
 
+    *convp = conv;
     return conv;
 }