--- rxvt-unicode/src/rxvtfont.C	2004/09/08 05:45:30	1.46
+++ rxvt-unicode/src/rxvtfont.C	2004/12/04 02:56:06	1.52
@@ -348,6 +348,11 @@
           int W = r->TermWin.fwidth;
           int H = r->TermWin.fheight;
 
+          // support double-width (but not more) graphics chars
+          // TODO: do this outside the if/elsif.. statement for all cases
+          if (len && *text == NOCHAR)
+            W += r->TermWin.fwidth;
+
           int x_[16];
           int y_[16];
 
@@ -694,7 +699,7 @@
       char fname[1024];
 
       int diff = 0;
-      
+
       if (replace_field (fname, list[i], 6, '0', field_str))
         diff += 10; // slightly penalize scalable fonts
 
@@ -1058,7 +1063,8 @@
   FcValue v;
 
   if (prop.height != rxvt_fontprop::unset
-      && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
+      || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
+          && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
     FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
 
   if (prop.weight != rxvt_fontprop::unset