*** empty log message ***

diff --git a/Changes b/Changes
index 2ea48c39d4ff66c80130ac9fd68344b3e39848e6..b71129d7fce168ffe9fee52b881bf167a2902fed 100644 (file)
--- a/Changes
+++ b/Changes
@@ -11,8 +11,8 @@ WISH: support tex fonts
 
        - added sections for DISTRIBUTION MAINTAINERS and about
           SETUID/SETGID to the FAQ.
-        - increased xft drawing speed for problematic fonts, speed
-          seems to be entirely server-dependent now.
+        - increased xft drawing speed for problematic fonts. The effect
+          will likely be small as 99% of the xft slowness is server-related.
        - selection, selection-popup and option-popup extensions
           enabled by default.
         - perl: much increased functionality, better overlays, popup support

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 779340827f65ead498254d732b708c90ebf0fea6..c1a3584baf05fbdfb8080dac2c7ad4ff24f45857 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -1271,12 +1271,12 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
                      const text_t *text, int len,
                      int fg, int bg)
 {
-  clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
-
   XGlyphInfo extents;
-  XftGlyphSpec *enc = (XftGlyphSpec *) get_enc_buf (len * sizeof (XftGlyphSpec));
+  XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec));
   XftGlyphSpec *ep = enc;
 
+  clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
+
   // cut trailing spaces
   while (len && text [len - 1] == ' ')
     len--;
@@ -1291,10 +1291,10 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
       
       if (fc != ' ') // skip spaces
         {
-          FT_UInt gl = XftCharIndex (d.display->display, f, fc);
-          XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
+          FT_UInt glyph = XftCharIndex (d.display->display, f, fc);
+          XftGlyphExtents (d.display->display, f, &glyph, 1, &extents);
 
-          ep->glyph = gl;
+          ep->glyph = glyph;
           ep->x = x + (cwidth - extents.xOff >> 1);
           ep->y = y + ascent;
           ep++;