--- rxvt-unicode/src/rxvtfont.C 2006/02/02 18:04:46 1.94 +++ rxvt-unicode/src/rxvtfont.C 2006/08/27 10:10:25 1.103 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: rxvtfont.C *----------------------------------------------------------------------* * Copyright (c) 2003-2006 Marc Lehmann @@ -165,24 +165,6 @@ ///////////////////////////////////////////////////////////////////////////// -#if XFT -rxvt_drawable::~rxvt_drawable () -{ - if (xftdrawable) - XftDrawDestroy (xftdrawable); -} - -rxvt_drawable::operator XftDraw *() -{ - if (!xftdrawable) - xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap); - - return xftdrawable; -} -#endif - -///////////////////////////////////////////////////////////////////////////// - static const char * enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) { @@ -252,9 +234,9 @@ dTermDisplay; dTermGC; - if (color == Color_bg) + if (color < 0 || color == Color_bg) XClearArea (disp, d, x, y, w, h, false); - else if (color >= 0) + else { #if XFT XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); @@ -290,7 +272,7 @@ return p; } - bool load (const rxvt_fontprop &prop) + bool load (const rxvt_fontprop &prop, bool force_prop) { width = 1; height = 1; ascent = 1; descent = 0; @@ -491,7 +473,7 @@ rxvt_fontprop properties (); - bool load (const rxvt_fontprop &prop); + bool load (const rxvt_fontprop &prop, bool force_prop); bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; @@ -647,7 +629,7 @@ } bool -rxvt_font_x11::load (const rxvt_fontprop &prop) +rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) { dTermDisplay; @@ -656,8 +638,7 @@ char field_str[64]; // enough for 128 bits // first morph the font if required - if (prop.weight != rxvt_fontprop::unset - || prop.slant != rxvt_fontprop::unset) + if (force_prop) { char fname[1024]; @@ -1059,7 +1040,7 @@ rxvt_fontprop properties (); - bool load (const rxvt_fontprop &prop); + bool load (const rxvt_fontprop &prop, bool force_prop); void draw (rxvt_drawable &d, int x, int y, const text_t *text, int len, @@ -1102,7 +1083,7 @@ } bool -rxvt_font_xft::load (const rxvt_fontprop &prop) +rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) { dTermDisplay; @@ -1121,11 +1102,11 @@ FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); if (prop.weight != rxvt_fontprop::unset - && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) + && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) FcPatternAddInteger (p, FC_WEIGHT, prop.weight); if (prop.slant != rxvt_fontprop::unset - && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) + && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) FcPatternAddInteger (p, FC_SLANT, prop.slant); #if 0 // clipping unfortunately destroys our precious double-width-characters @@ -1284,8 +1265,6 @@ const text_t *text, int len, int fg, int bg) { - clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); - XGlyphInfo extents; XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); XftGlyphSpec *ep = enc; @@ -1293,10 +1272,25 @@ dTermDisplay; dTermGC; + int w = term->fwidth * len; + int h = term->fheight; + + bool buffered = bg >= 0 // we don't use a transparent bg +#ifndef FORCE_UNBUFFERED_XFT +# if defined(XPM_BACKGROUND) || defined(TRANSPARENT) + || !term->am_transparent // we aren't transparent + || term->am_pixmap_trans // we have a pixmap +# endif +#endif + ; + // cut trailing spaces while (len && text [len - 1] == ' ') len--; + int x_ = buffered ? 0 : x; + int y_ = buffered ? 0 : y; + while (len) { int cwidth = term->fwidth; @@ -1311,21 +1305,67 @@ XftGlyphExtents (disp, f, &glyph, 1, &extents); ep->glyph = glyph; - ep->x = x + (cwidth - extents.xOff >> 1); - ep->y = y + ascent; + ep->x = x_ + (cwidth - extents.xOff >> 1); + ep->y = y_ + ascent; if (extents.xOff == 0) - ep->x = x + cwidth; + ep->x = x_ + cwidth; ep++; } - x += cwidth; + x_ += cwidth; } - if (ep != enc) - XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); + if (buffered) + { + if (ep != enc) + { + rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); + + if (0) + ; +#ifdef TRANSPARENT + else if (bg < 0 && term->am_pixmap_trans) + XCopyArea (disp, term->pixmap, d2, gc, + x + term->window_vt_x, y + term->window_vt_y, + w, h, 0, 0); +#endif +#ifdef XPM_BACKGROUND + else if (bg < 0 && term->bgPixmap.pixmap) + { + XGCValues gcv; + + gcv.fill_style = FillTiled; + gcv.tile = term->pixmap; + gcv.ts_x_origin = -x; + gcv.ts_y_origin = -y; + + GC gc2 = XCreateGC (disp, d2, + GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, + &gcv); + + XFillRectangle (disp, d2, gc2, 0, 0, w, h); + + XFreeGC (disp, gc2); + } +#endif + else + XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); + + XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); + XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); + } + else + clear_rect (d, x, y, w, h, bg); + } + else + { + clear_rect (d, x, y, w, h, bg); + XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); + } } + #endif ///////////////////////////////////////////////////////////////////////////// @@ -1346,6 +1386,7 @@ { prop.width = prop.height = prop.ascent = prop.weight = prop.slant = rxvt_fontprop::unset; + force_prop = false; for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) FONT_UNREF (*i); @@ -1467,7 +1508,7 @@ fonts[i]->loaded = true; - if (!fonts[i]->load (prop)) + if (!fonts[i]->load (prop, force_prop)) { fonts[i]->cs = CS_UNKNOWN; return false;