X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FFont.cc;h=bc4f6440e5b0fe694903d10c18cc21c4eff1eefb;hb=23e92e110e467796437d981c0c5bc129c0e20b8e;hp=ac315d507598f72d060c33d03979f55bd593f136;hpb=20bc088a998a362977233086577d74d00eea8765;p=chaz%2Fopenbox diff --git a/src/Font.cc b/src/Font.cc index ac315d50..bc4f6440 100644 --- a/src/Font.cc +++ b/src/Font.cc @@ -275,22 +275,16 @@ void BFont::drawString(Drawable d, int x, int y, const BColor &color, } #endif // XFT - BGCCache *_cache = color.display()->gcCache(); - BGCCacheItem *_item = _cache->find(color, _font, GXcopy, ClipByChildren); - - assert(_cache); - assert(_item); + BPen pen(color, _font); if (i18n.multibyte()) - XmbDrawString(_display, d, _fontset, _item->gc(), + XmbDrawString(_display, d, _fontset, pen.gc(), x, y - _fontset_extents->max_ink_extent.y, string.c_str(), string.size()); else - XDrawString(_display, d, _item->gc(), + XDrawString(_display, d, pen.gc(), x, _font->ascent + y, string.c_str(), string.size()); - - _cache->release(_item); }