int version;
#endif /* DEBUG */
if (!XftInit(0)) {
- g_warning(_("Couldn't initialize Xft.\n\n"));
+ g_warning(_("Couldn't initialize Xft.\n"));
exit(3);
}
#ifdef DEBUG
version = XftGetVersion();
- g_message("Using Xft %d.%d.%d (Built against %d.%d.%d).\n",
+ g_message("Using Xft %d.%d.%d (Built against %d.%d.%d).",
version / 10000 % 100, version / 100 % 100, version % 100,
XFT_MAJOR, XFT_MINOR, XFT_REVISION);
#endif
XftTextExtentsUtf8(ob_display, f->xftfont,
(FcChar8*)str, strlen(str), &info);
- g_message("measured: %d", info.height);
f->height = (signed) info.height;
}
return (signed) f->xftfont->max_advance_width;
}
-void font_draw(XftDraw *d, TextureText *t)
+void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
{
- int x = 0, y = 0;
XftColor c;
+
+ /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
+ y += (h - t->font->xftfont->height) / 2;
+
+ x += 3; /* XXX figure out X with justification */
+
if (t->shadow) {
c.color.red = 0;
c.color.green = 0;