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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.80 by root, Mon Jan 9 07:17:24 2006 UTC vs.
Revision 1.83 by root, Mon Jan 9 07:35:23 2006 UTC

 void
 rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
                      const text_t *text, int len,
                      int fg, int bg)
 {
+  XGlyphInfo extents;
+  XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec));
+  XftGlyphSpec *ep = enc;
   clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
-  int base = ascent; // should be fbase, but that is incorrect
-  XGlyphInfo extents;
-  XftGlyphSpec *enc = (XftGlyphSpec *) get_enc_buf (len * sizeof (XftGlyphSpec));
-  XftGlyphSpec *ep = enc;
-  // skip trailing spaces
+  // cut trailing spaces
   while (len && text [len - 1] == ' ')
     len--;
   while (len)
     {
       while (len && *text == NOCHAR)
         text++, len--, cwidth += r->fwidth;
       if (fc != ' ') // skip spaces
         {
-          FT_UInt gl = XftCharIndex (d.display->display, f, fc);
+          FT_UInt glyph = XftCharIndex (d.display->display, f, fc);
-          XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
+          XftGlyphExtents (d.display->display, f, &glyph, 1, &extents);
-          ep->glyph = gl;
+          ep->glyph = glyph;
           ep->x = x + (cwidth - extents.xOff >> 1);
-          ep->y = y + base;
+          ep->y = y + ascent;
           ep++;
         }
       x += cwidth;
     }

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