--- rxvt-unicode/src/command.C	2006/01/29 20:51:27	1.291
+++ rxvt-unicode/src/command.C	2006/01/30 04:27:17	1.293
@@ -229,9 +229,16 @@
         ch = 0xfffd;
 # endif
       scr_overlay_set (11, y, ch, r);
-      scr_overlay_set (12, y, NOCHAR, r);
+
+      if (WCWIDTH (ch) >= 2)
+        scr_overlay_set (12, y, NOCHAR, r);
     }
 
+//  {
+//    char buf[4+4+3+1];
+//    snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
+//    scr_overlay_set (0, 0, buf);
+//  }
   scr_overlay_set (0, len    , attr);
   scr_overlay_set (0, len + 1, fname);
 
@@ -3721,7 +3728,7 @@
 
 #if XFT
       if (c.a != rxvt_rgba::MAX_CC)
-        tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp);
+        tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
       else
 #endif
         tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);