::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(Display::display, _screen_num,
+ if ((_xftfont = XftFontOpenName(**display, _screen_num,
_fontstring.c_str())))
return;
printf(_("Unable to load font: %s\n"), _fontstring.c_str());
printf(_("Trying fallback font: %s\n"), _fallback_font.c_str());
- if ((_xftfont = XftFontOpenName(Display::display, _screen_num,
+ if ((_xftfont = XftFontOpenName(**display, _screen_num,
_fallback_font.c_str())))
return;
Font::~Font(void)
{
if (_xftfont)
- XftFontClose(Display::display, _xftfont);
+ XftFontClose(**display, _xftfont);
}
c.color.green = 0;
c.color.blue = 0;
c.color.alpha = _tint | _tint << 8; // transparent shadow
- c.pixel = BlackPixel(Display::display, _screen_num);
+ c.pixel = BlackPixel(**display, _screen_num);
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;
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;
}
XGlyphInfo info;
if (string.utf8())
- XftTextExtentsUtf8(Display::display, _xftfont,
- (FcChar8*)string.c_str(), string.size(), &info);
+ XftTextExtentsUtf8(**display, _xftfont,
+ (FcChar8*)string.c_str(), string.bytes(), &info);
else
- XftTextExtents8(Display::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);
}