X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.cc;h=0f1ad8c1cb5559d20647e21df54db7c4dead0ef8;hb=bc99e6a420c04b4607bffc90e528d9572649f95f;hp=e7b8bab1a955dde35194e247863de95ce666c245;hpb=c6f228f3ff9ab7087669366a23d2ae61d8e5b9b9;p=chaz%2Fopenbox

diff --git a/otk/font.cc b/otk/font.cc
index e7b8bab1..0f1ad8c1 100644
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -34,10 +34,10 @@ extern "C" {
 
 namespace otk {
 
-string      BFont::_fallback_font = "fixed";
-bool        BFont::_xft_init      = false;
+string      Font::_fallback_font = "fixed";
+bool        Font::_xft_init      = false;
 
-BFont::BFont(int screen_num, const string &fontstring,
+Font::Font(int screen_num, const string &fontstring,
              bool shadow, unsigned char offset, unsigned char tint)
   : _screen_num(screen_num),
     _fontstring(fontstring),
@@ -51,39 +51,41 @@ BFont::BFont(int screen_num, const string &fontstring,
   
   if (!_xft_init) {
     if (!XftInit(0)) {
-      printf(_("Couldn't initialize Xft version %d.\n\n"), XftVersion);
+      printf(_("Couldn't initialize Xft.\n\n"));
       ::exit(3);
     }
-    printf(_("Using Xft %d.\n"), XftVersion);
+    int version = XftGetVersion();
+    printf(_("Using Xft %d.%d.%d.\n"),
+           version / 10000 % 100, version / 100 % 100, version % 100);
     _xft_init = true;
   }
 
-  if ((_xftfont = XftFontOpenName(OBDisplay::display, _screen_num,
+  if ((_xftfont = XftFontOpenName(Display::display, _screen_num,
                                   _fontstring.c_str())))
     return;
 
-  printf(_("Unable to load font: %s"), _fontstring.c_str());
+  printf(_("Unable to load font: %s\n"), _fontstring.c_str());
   printf(_("Trying fallback font: %s\n"), _fallback_font.c_str());
 
-  if ((_xftfont = XftFontOpenName(OBDisplay::display, _screen_num,
+  if ((_xftfont = XftFontOpenName(Display::display, _screen_num,
                                   _fallback_font.c_str())))
     return;
 
-  printf(_("Unable to load font: %s"), _fallback_font.c_str());
+  printf(_("Unable to load font: %s\n"), _fallback_font.c_str());
   printf(_("Aborting!.\n"));
 
   ::exit(3); // can't continue without a font
 }
 
 
-BFont::~BFont(void)
+Font::~Font(void)
 {
   if (_xftfont)
-    XftFontClose(OBDisplay::display, _xftfont);
+    XftFontClose(Display::display, _xftfont);
 }
 
 
-void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
+void Font::drawString(XftDraw *d, int x, int y, const Color &color,
                        const string &string, bool utf8) const
 {
   assert(d);
@@ -94,16 +96,16 @@ void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
     c.color.green = 0;
     c.color.blue = 0;
     c.color.alpha = _tint | _tint << 8; // transparent shadow
-    c.pixel = BlackPixel(OBDisplay::display, _screen_num);
+    c.pixel = BlackPixel(Display::display, _screen_num);
 
     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;
@@ -111,41 +113,41 @@ void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
   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 BColor yet
+  c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
 
   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;
 }
 
 
-unsigned int BFont::measureString(const string &string, bool utf8) const
+unsigned int Font::measureString(const string &string, bool utf8) const
 {
   XGlyphInfo info;
 
   if (utf8)
-    XftTextExtentsUtf8(OBDisplay::display, _xftfont,
-                       (const FcChar8*)string.c_str(), string.size(), &info);
+    XftTextExtentsUtf8(Display::display, _xftfont,
+                       (FcChar8*)string.c_str(), string.size(), &info);
   else
-    XftTextExtents8(OBDisplay::display, _xftfont,
-                    (const FcChar8*)string.c_str(), string.size(), &info);
+    XftTextExtents8(Display::display, _xftfont,
+                    (FcChar8*)string.c_str(), string.size(), &info);
 
   return info.xOff + (_shadow ? _offset : 0);
 }
 
 
-unsigned int BFont::height(void) const
+unsigned int Font::height(void) const
 {
   return _xftfont->height + (_shadow ? _offset : 0);
 }
 
 
-unsigned int BFont::maxCharWidth(void) const
+unsigned int Font::maxCharWidth(void) const
 {
   return _xftfont->max_advance_width;
 }