From cb71b2fb09a3dcecf57be801c6b5ecb683abb764 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 3 Nov 2002 21:18:42 +0000 Subject: [PATCH] stop using the Utf8 functions. will use them later for ONLY Utf-8 encoded strings!! --- otk/font.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/otk/font.cc b/otk/font.cc index 3f1b11e5..121f4fa7 100644 --- a/otk/font.cc +++ b/otk/font.cc @@ -84,10 +84,10 @@ void BFont::drawString(Drawable d, int x, int y, const BColor &color, 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 @@ void BFont::drawString(Drawable d, int x, int y, const BColor &color, 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 @@ unsigned int BFont::measureString(const string &string) const { 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); } -- 2.44.0