--- rxvt-unicode/src/command.C	2005/02/21 19:26:07	1.201
+++ rxvt-unicode/src/command.C	2005/06/18 09:02:37	1.203
@@ -165,9 +165,11 @@
 {
   rxvt_fontset *fs = FONTSET (r);
   rxvt_font *f = (*fs)[fs->find_font (ch)];
-  wchar_t *chr, *alloc, ch2;
+  wchar_t *chr, *alloc, ch2, *fname;
   int len;
 
+  fname = rxvt_utf8towcs (f->name);
+
 #if ENABLE_COMBINING
   if (IS_COMPOSE (ch))
     {
@@ -185,7 +187,7 @@
       len = 1;
     }
 
-  int width = strlen (f->name);
+  int width = wcswidth (fname, wcslen (fname));
 
   scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
 
@@ -208,7 +210,9 @@
       scr_overlay_set (12, y, NOCHAR, r);
     }
 
-  scr_overlay_set (0, len, f->name);
+  scr_overlay_set (0, len, fname);
+
+  free (fname);
 
 #if ENABLE_COMBINING
   if (alloc)
@@ -318,9 +322,11 @@
           // at the point of XOpenIM, so temporarily switch locales
           if (rs[Rs_imLocale])
             SET_LOCALE (rs[Rs_imLocale]);
+
           // assume wchar_t == unicode or better
           len = XwcLookupString (Input_Context, &ev, wkbuf,
                                  KBUFSZ, &keysym, &status_return);
+
           if (rs[Rs_imLocale])
             SET_LOCALE (locale);
 
@@ -3590,7 +3596,7 @@
 
       seen_esc = false;
 
-      if (n >= sizeof (string) - 1)
+      if (n >= STRING_MAX - 1)
         // stop at some sane length
         return NULL;