if (!_xft_init) {
if (!XftInit(0)) {
- printf(_("Couldn't initialize Xft version %d.\n\n"), XftVersion);
+ printf(_("Couldn't initialize Xft.\n\n"));
::exit(3);
}
- printf(_("Using Xft %d.\n"), XftVersion);
+ int version = XftGetVersion();
+ printf(_("Using Xft %d.%d.%d.\n"),
+ version / 10000 % 100, version / 100 % 100, version % 100);
_xft_init = true;
}
_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,
_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
if (utf8)
XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset,
- (const FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.size());
else
XftDrawString8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset,
- (const FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.size());
}
XftColor c;
if (utf8)
XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
- (const FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.size());
else
XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
- (const FcChar8*)string.c_str(), string.size());
+ (FcChar8*)string.c_str(), string.size());
return;
}
if (utf8)
XftTextExtentsUtf8(OBDisplay::display, _xftfont,
- (const FcChar8*)string.c_str(), string.size(), &info);
+ (FcChar8*)string.c_str(), string.size(), &info);
else
XftTextExtents8(OBDisplay::display, _xftfont,
- (const FcChar8*)string.c_str(), string.size(), &info);
+ (FcChar8*)string.c_str(), string.size(), &info);
return info.xOff + (_shadow ? _offset : 0);
}