#include <iostream>
#include <algorithm>
-using std::string;
-using std::cerr;
-using std::endl;
-
#include "font.hh"
#include "util.hh"
#include "display.hh"
namespace otk {
-string BFont::_fallback_font = "fixed";
-bool BFont::_xft_init = false;
+std::string Font::_fallback_font = "fixed";
+bool Font::_xft_init = false;
-BFont::BFont(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),
::exit(3);
}
int version = XftGetVersion();
- printf(_("Using Xft %d.%d.%d.\n"),
- version / 10000 % 100, version / 100 % 100, version % 100);
+ printf(_("Using Xft %d.%d.%d (Built against %d.%d.%d).\n"),
+ version / 10000 % 100, version / 100 % 100, version % 100,
+ XFT_MAJOR, XFT_MINOR, XFT_REVISION);
_xft_init = true;
}
- if ((_xftfont = XftFontOpenName(OBDisplay::display, _screen_num,
+ if ((_xftfont = XftFontOpenName(**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, _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, _xftfont);
}
-void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
- const string &string, bool utf8) const
+void Font::drawString(XftDraw *d, int x, int y, const Color &color,
+ const ustring &string) const
{
assert(d);
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, _screen_num);
- if (utf8)
+ if (string.utf8())
XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset,
- (FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.bytes());
else
XftDrawString8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset,
- (FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.bytes());
}
XftColor c;
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)
+ if (string.utf8())
XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
- (FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.bytes());
else
XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
- (FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.bytes());
return;
}
-unsigned int BFont::measureString(const string &string, bool utf8) const
+unsigned int Font::measureString(const ustring &string) const
{
XGlyphInfo info;
- if (utf8)
- XftTextExtentsUtf8(OBDisplay::display, _xftfont,
- (FcChar8*)string.c_str(), string.size(), &info);
+ if (string.utf8())
+ XftTextExtentsUtf8(**display, _xftfont,
+ (FcChar8*)string.c_str(), string.bytes(), &info);
else
- XftTextExtents8(OBDisplay::display, _xftfont,
- (FcChar8*)string.c_str(), string.size(), &info);
+ XftTextExtents8(**display, _xftfont,
+ (FcChar8*)string.c_str(), string.bytes(), &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;
}