remove debug cout

[chaz/openbox] / src / Font.cc

diff --git a/src/Font.cc b/src/Font.cc
index 979c4c215a64b24385baa8c7ada2c9f010f37c43..bc4f6440e5b0fe694903d10c18cc21c4eff1eefb 100644 (file)
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -44,23 +44,23 @@ using std::endl;
 #include "GCCache.hh"
 #include "Color.hh"
 
-bool        BFont::_antialias       = True;
 string      BFont::_fallback_font   = "fixed";
 
-
 #ifdef XFT
 BFont::BFont(Display *d, BScreen *screen, const string &family, int size,
-             bool bold, bool italic) : _display(d),
-                                       _screen(screen),
-                                       _family(family),
-                                       _simplename(False),
-                                       _size(size),
-                                       _bold(bold),
-                                       _italic(italic),
-                                       _xftfont(0),
-                                       _font(0),
-                                       _fontset(0),
-                                       _fontset_extents(0) {
+             bool bold, bool italic, bool antialias) :
+                                          _display(d),
+                                          _screen(screen),
+                                          _family(family),
+                                          _simplename(False),
+                                          _size(size),
+                                          _bold(bold),
+                                          _italic(italic),
+                                          _antialias(antialias),
+                                          _xftfont(0),
+                                          _font(0),
+                                          _fontset(0),
+                                          _fontset_extents(0) {
   _valid = False;
 
   _xftfont = XftFontOpen(_display, _screen->getScreenNumber(),
@@ -90,6 +90,7 @@ BFont::BFont(Display *d, BScreen *screen, const string &xlfd) :
                                        _display(d),
                                        _screen(screen),
 #ifdef    XFT
+                                       _antialias(False),
                                        _xftfont(0),
 #endif // XFT
                                        _font(0),
@@ -274,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);
 }