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

diff --git a/otk/font.cc b/otk/font.cc
index 0f1ad8c1..a9f2fd3e 100644
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -13,10 +13,6 @@ extern "C" {
 #include <iostream>
 #include <algorithm>
 
-using std::string;
-using std::cerr;
-using std::endl;
-
 #include "font.hh"
 #include "util.hh"
 #include "display.hh"
@@ -34,10 +30,10 @@ extern "C" {
 
 namespace otk {
 
-string      Font::_fallback_font = "fixed";
+std::string Font::_fallback_font = "fixed";
 bool        Font::_xft_init      = false;
 
-Font::Font(int screen_num, const string &fontstring,
+Font::Font(int screen_num, const std::string &fontstring,
              bool shadow, unsigned char offset, unsigned char tint)
   : _screen_num(screen_num),
     _fontstring(fontstring),
@@ -60,14 +56,14 @@ Font::Font(int screen_num, const string &fontstring,
     _xft_init = true;
   }
 
-  if ((_xftfont = XftFontOpenName(Display::display, _screen_num,
+  if ((_xftfont = XftFontOpenName(**display, _screen_num,
                                   _fontstring.c_str())))
     return;
 
   printf(_("Unable to load font: %s\n"), _fontstring.c_str());
   printf(_("Trying fallback font: %s\n"), _fallback_font.c_str());
 
-  if ((_xftfont = XftFontOpenName(Display::display, _screen_num,
+  if ((_xftfont = XftFontOpenName(**display, _screen_num,
                                   _fallback_font.c_str())))
     return;
 
@@ -81,12 +77,12 @@ Font::Font(int screen_num, const string &fontstring,
 Font::~Font(void)
 {
   if (_xftfont)
-    XftFontClose(Display::display, _xftfont);
+    XftFontClose(**display, _xftfont);
 }
 
 
 void Font::drawString(XftDraw *d, int x, int y, const Color &color,
-                       const string &string, bool utf8) const
+                       const ustring &string) const
 {
   assert(d);
 
@@ -96,9 +92,9 @@ void Font::drawString(XftDraw *d, int x, int y, const Color &color,
     c.color.green = 0;
     c.color.blue = 0;
     c.color.alpha = _tint | _tint << 8; // transparent shadow
-    c.pixel = BlackPixel(Display::display, _screen_num);
+    c.pixel = BlackPixel(**display, _screen_num);
 
-    if (utf8)
+    if (string.utf8())
       XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
                         _xftfont->ascent + y + _offset,
                         (FcChar8*)string.c_str(), string.size());
@@ -115,7 +111,7 @@ void Font::drawString(XftDraw *d, int x, int y, const Color &color,
   c.pixel = color.pixel();
   c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
 
-  if (utf8)
+  if (string.utf8())
     XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
                       (FcChar8*)string.c_str(), string.size());
   else
@@ -126,15 +122,15 @@ void Font::drawString(XftDraw *d, int x, int y, const Color &color,
 }
 
 
-unsigned int Font::measureString(const string &string, bool utf8) const
+unsigned int Font::measureString(const ustring &string) const
 {
   XGlyphInfo info;
 
-  if (utf8)
-    XftTextExtentsUtf8(Display::display, _xftfont,
+  if (string.utf8())
+    XftTextExtentsUtf8(**display, _xftfont,
                        (FcChar8*)string.c_str(), string.size(), &info);
   else
-    XftTextExtents8(Display::display, _xftfont,
+    XftTextExtents8(**display, _xftfont,
                     (FcChar8*)string.c_str(), string.size(), &info);
 
   return info.xOff + (_shadow ? _offset : 0);