dont try free the widget's pixmap until it is no longer in use

[chaz/openbox] / otk / font.cc

diff --git a/otk/font.cc b/otk/font.cc
index f649185ede37a4db847df2ff30031798a129b19c..21b9bfb060d505d9cf2e9e66958c01bd197a286a 100644 (file)
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -14,9 +14,9 @@ extern "C" {
 #include <algorithm>
 
 #include "font.hh"
+#include "surface.hh"
 #include "util.hh"
 #include "display.hh"
-#include "color.hh"
 #include "screeninfo.hh"
 
 extern "C" {
@@ -50,11 +50,10 @@ Font::Font(int screen_num, const std::string &fontstring,
       printf(_("Couldn't initialize Xft.\n\n"));
       ::exit(3);
     }
-    int build = XFT_VERSION;
     int version = XftGetVersion();
     printf(_("Using Xft %d.%d.%d (Built against %d.%d.%d).\n"),
            version / 10000 % 100, version / 100 % 100, version % 100,
-           build / 10000 % 100, build / 100 % 100, build % 100);
+           XFT_MAJOR, XFT_MINOR, XFT_REVISION);
     _xft_init = true;
   }
 
@@ -83,47 +82,6 @@ Font::~Font(void)
 }
 
 
-void Font::drawString(XftDraw *d, int x, int y, const Color &color,
-                       const ustring &string) const
-{
-  assert(d);
-
-  if (_shadow) {
-    XftColor c;
-    c.color.red = 0;
-    c.color.green = 0;
-    c.color.blue = 0;
-    c.color.alpha = _tint | _tint << 8; // transparent shadow
-    c.pixel = BlackPixel(**display, _screen_num);
-
-    if (string.utf8())
-      XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
-                        _xftfont->ascent + y + _offset,
-                        (FcChar8*)string.c_str(), string.bytes());
-    else
-      XftDrawString8(d, &c, _xftfont, x + _offset,
-                     _xftfont->ascent + y + _offset,
-                     (FcChar8*)string.c_str(), string.bytes());
-  }
-    
-  XftColor c;
-  c.color.red = color.red() | color.red() << 8;
-  c.color.green = color.green() | color.green() << 8;
-  c.color.blue = color.blue() | color.blue() << 8;
-  c.pixel = color.pixel();
-  c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
-
-  if (string.utf8())
-    XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
-                      (FcChar8*)string.c_str(), string.bytes());
-  else
-    XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
-                   (FcChar8*)string.c_str(), string.bytes());
-
-  return;
-}
-
-
 unsigned int Font::measureString(const ustring &string) const
 {
   XGlyphInfo info;