the exg bug

diff --git a/Changes b/Changes
index b6783b778edff386e129cbee211d7d5f0fbc8403..d438670fc15444e46e06919fd9e7a2454796c1a7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -20,8 +20,10 @@ WISH: http://www120.pair.com/mccarthy/nextstep/intro.htmld/Workspace.html is the
 WISH: kick out xpm.C, replace by pixbuf
 DUMB: support tex fonts
 
-TODO: (exg) rxvt -fn -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 U+39b+U+30a wipes out 39b
 8.0
+       - combining characters cleared the area instead of creating an overlay,
+          thus losing the ability to draw combining characters properly in most
+          circumstances (reported by exg).
        - specified fonts were incorrectly morphed to bold/italic according to the
           basefont, even if explicitly specified (tracked down by tpope).
         - fixed urxvt::strwidth to calculate width in the same way as screen.C.

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 40484fd53625d2d729241ff8adb287f71874bda3..fd133d3fbe7da08ba142c6bff5446087a998a36e 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -234,9 +234,9 @@ rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
   dTermDisplay;
   dTermGC;
   
-  if (color < 0 || color == Color_bg)
+  if (color == Color_bg)
     XClearArea (disp, d, x, y, w, h, false);
-  else
+  else if (color >= 0)
     {
 #if XFT
       XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);