[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.203 by root, Sat Jun 18 09:02:37 2005 UTC

 void
 rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
 {
   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))
     {
       len = rxvt_composite.expand (ch, 0);
       alloc = 0;
       chr = &ch2;
       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);
   r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
 #endif
       scr_overlay_set (11, y, ch, r);
       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)
     delete [] alloc;
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines