diff -r -up gcc.patched/libjava/gnu/gcj/xlib/natFont.cc gcc/libjava/gnu/gcj/xlib/natFont.cc
--- gcc.patched/libjava/gnu/gcj/xlib/natFont.cc	2003-02-18 15:20:50.000000000 -0500
+++ gcc/libjava/gnu/gcj/xlib/natFont.cc	2003-02-18 15:26:58.000000000 -0500
@@ -69,13 +69,20 @@ jint gnu::gcj::xlib::Font::getStringWidt
 {
   XFontStruct* fontStruct = (XFontStruct*) structure;
   
-  // FIXME: make proper unicode conversion
-  int len = JvGetStringUTFLength(text);
-  char ctxt[len+1];
-  JvGetStringUTFRegion(text, 0, text->length(), ctxt);
-  ctxt[len] = '\0';
-  int width = XTextWidth(fontStruct, ctxt, len);
-  return width;
+  // FIXME: Convert to the character set used in the font, which may or may not
+  // be unicode. For now, treat everything as 16-bit and use character codes
+  // directly, which should be OK for unicode or 8-bit ascii fonts.
+  jint length = text->length();
+  jchar* txt = JvGetStringChars(text);
+  XChar2b xwchars[length];
+  for (int i=0; i<length; i++)
+  {
+    XChar2b* xc = &(xwchars[i]);
+    jchar jc = txt[i];
+    xc->byte1 = (jc >> 8) & 0xff;
+    xc->byte2 = jc & 0xff;
+  }
+  return XTextWidth16(fontStruct, xwchars, length);
 }
 
 void gnu::gcj::xlib::Font::finalize()
diff -r -up gcc.patched/libjava/gnu/gcj/xlib/natGC.cc gcc/libjava/gnu/gcj/xlib/natGC.cc
--- gcc.patched/libjava/gnu/gcj/xlib/natGC.cc	2003-02-18 15:20:50.000000000 -0500
+++ gcc/libjava/gnu/gcj/xlib/natGC.cc	2003-02-18 15:27:20.000000000 -0500
@@ -95,34 +95,22 @@ void gnu::gcj::xlib::GC::drawString(jstr
   ::Drawable drawableXID = target->getXID();
   ::GC gc = (::GC) structure;
   
-  /*
-    FIXME: do something along the lines of the following instead:
+  jint length = text->length();
+  jchar* txt = JvGetStringChars(text);
 
-    jint length = text->length();
-    jchar* txt = JvGetStringChars(text);
+  XChar2b xwchars[length];
 
-    XChar2b xwchars[length];
-    
-    // FIXME: Add convertion and caching
-
-    for (int i=0; i<length; i++)
-      {
-	XChar2b* xc = &(xwchars[i]);
-	jchar jc = txt[i];
-	xc->byte1 = jc & 0xff;
-	xc->byte2 = jc >> 8;
-      }
-
-     XDrawString16(dpy, drawableXID, gc, x, y, xwchars, length);
-    */
-  
-  // FIXME, temporary code:
-  int len = JvGetStringUTFLength(text);
-  char ctxt[len+1];
-  JvGetStringUTFRegion(text, 0, text->length(), ctxt);
-  ctxt[len] = '\0';
-  XDrawString(dpy, drawableXID, gc, x, y, ctxt, len);
-  // no fast fail
+  // FIXME: Convert to the character set used in the font, which may or may not
+  // be unicode. For now, treat everything as 16-bit and use character codes
+  // directly, which should be OK for unicode or 8-bit ascii fonts.
+  for (int i=0; i<length; i++)
+  {
+    XChar2b* xc = &(xwchars[i]);
+    jchar jc = txt[i];
+    xc->byte1 = (jc >> 8) & 0xff;
+    xc->byte2 = jc & 0xff;
+  }
+  XDrawString16(dpy, drawableXID, gc, x, y, xwchars, length);
 }
 
 void gnu::gcj::xlib::GC::drawLine(jint x1, jint y1, jint x2, jint y2)