#endif // HAVE_STDLIB_H
}
+#include <iostream>
+#include <algorithm>
+
+using std::string;
+using std::cerr;
+using std::endl;
+
#include "font.hh"
+#include "util.hh"
#include "display.hh"
#include "color.hh"
#include "screeninfo.hh"
namespace otk {
-std::string Font::_fallback_font = "fixed";
+string Font::_fallback_font = "fixed";
bool Font::_xft_init = false;
-Font::Font(int screen_num, const std::string &fontstring,
+Font::Font(int screen_num, const string &fontstring,
bool shadow, unsigned char offset, unsigned char tint)
: _screen_num(screen_num),
_fontstring(fontstring),
void Font::drawString(XftDraw *d, int x, int y, const Color &color,
- const userstring &string) const
+ const string &string, bool utf8) const
{
assert(d);
c.color.alpha = _tint | _tint << 8; // transparent shadow
c.pixel = BlackPixel(Display::display, _screen_num);
- if (string.utf8())
+ if (utf8)
XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset,
(FcChar8*)string.c_str(), string.size());
c.pixel = color.pixel();
c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
- if (string.utf8())
+ if (utf8)
XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
(FcChar8*)string.c_str(), string.size());
else
}
-unsigned int Font::measureString(const userstring &string) const
+unsigned int Font::measureString(const string &string, bool utf8) const
{
XGlyphInfo info;
- if (string.utf8())
+ if (utf8)
XftTextExtentsUtf8(Display::display, _xftfont,
(FcChar8*)string.c_str(), string.size(), &info);
else