all repos — openbox @ cb71b2fb09a3dcecf57be801c6b5ecb683abb764

openbox fork - make it a bit more like ryudo

stop using the Utf8 functions. will use them later for ONLY Utf-8 encoded strings!!
Dana Jansens danakj@orodu.net
commit

cb71b2fb09a3dcecf57be801c6b5ecb683abb764

parent

f8f73b7422c286c78253ab677eb4f33681d29d66

1 files changed, 8 insertions(+), 8 deletions(-)

jump to
M otk/font.ccotk/font.cc

@@ -84,10 +84,10 @@ c.color.blue = 0;

c.color.alpha = _tint | _tint << 8; // transparent shadow c.pixel = BlackPixel(OBDisplay::display, _screen_num); - XftDrawStringUtf8(draw, &c, _xftfont, x + _offset, - _xftfont->ascent + y + _offset, - (XftChar8 *) string.c_str(), - string.size()); + XftDrawString8(draw, &c, _xftfont, x + _offset, + _xftfont->ascent + y + _offset, + (XftChar8 *) string.c_str(), + string.size()); } XftColor c;

@@ -97,8 +97,8 @@ c.color.blue = color.blue() | color.blue() << 8;

c.pixel = color.pixel(); c.color.alpha = 0xff | 0xff << 8; // no transparency in BColor yet - XftDrawStringUtf8(draw, &c, _xftfont, x, _xftfont->ascent + y, - (XftChar8 *) string.c_str(), string.size()); + XftDrawString8(draw, &c, _xftfont, x, _xftfont->ascent + y, + (XftChar8 *) string.c_str(), string.size()); XftDrawDestroy(draw); return;

@@ -110,8 +110,8 @@ assert(_valid);

XGlyphInfo info; - XftTextExtentsUtf8(OBDisplay::display, _xftfont, - (XftChar8 *) string.c_str(), string.size(), &info); + XftTextExtents8(OBDisplay::display, _xftfont, + (XftChar8 *) string.c_str(), string.size(), &info); return info.xOff + (_shadow ? _offset : 0); }