set masks properly

[chaz/openbox] / otk / font.cc

diff --git a/otk/font.cc b/otk/font.cc
index ac76696e8ebedfb69b6ff1f13ae5ddccc968536d..e794268fc50a6ad2319cf4d2851f10dbe7606ea4 100644 (file)
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -51,11 +51,12 @@ BFont::BFont(int screen_num, const string &fontstring,
   
   if (!_xft_init) {
     if (!XftInit(0)) {
-      printf(_("Couldn't initialize Xft version %d.%d.%d.\n\n"),
-             XFT_MAJOR, XFT_MINOR, XFT_REVISION);
+      printf(_("Couldn't initialize Xft.\n\n"));
       ::exit(3);
     }
-    printf(_("Using Xft %d.%d.%d.\n"), XFT_MAJOR, XFT_MINOR, XFT_REVISION);
+    int version = XftGetVersion();
+    printf(_("Using Xft %d.%d.%d.\n"),
+           version / 10000 % 100, version / 100 % 100, version % 100);
     _xft_init = true;
   }
 
@@ -100,11 +101,11 @@ void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
     if (utf8)
       XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
                         _xftfont->ascent + y + _offset,
-                        (const FcChar8*)string.c_str(), string.size());
+                        (FcChar8*)string.c_str(), string.size());
     else
       XftDrawString8(d, &c, _xftfont, x + _offset,
                      _xftfont->ascent + y + _offset,
-                     (const FcChar8*)string.c_str(), string.size());
+                     (FcChar8*)string.c_str(), string.size());
   }
     
   XftColor c;
@@ -116,10 +117,10 @@ void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
 
   if (utf8)
     XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
-                      (const FcChar8*)string.c_str(), string.size());
+                      (FcChar8*)string.c_str(), string.size());
   else
     XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
-                   (const FcChar8*)string.c_str(), string.size());
+                   (FcChar8*)string.c_str(), string.size());
 
   return;
 }
@@ -131,10 +132,10 @@ unsigned int BFont::measureString(const string &string, bool utf8) const
 
   if (utf8)
     XftTextExtentsUtf8(OBDisplay::display, _xftfont,
-                       (const FcChar8*)string.c_str(), string.size(), &info);
+                       (FcChar8*)string.c_str(), string.size(), &info);
   else
     XftTextExtents8(OBDisplay::display, _xftfont,
-                    (const FcChar8*)string.c_str(), string.size(), &info);
+                    (FcChar8*)string.c_str(), string.size(), &info);
 
   return info.xOff + (_shadow ? _offset : 0);
 }