#include <X11/Xft/Xft.h>
#include <glib.h>
+#include "../kernel/geom.h"
void font_startup(void)
{
return out;
}
g_warning(_("Unable to load font: %s\n"), fontstring);
- g_warning(_("Trying fallback font: %s\n"), "fixed");
+ g_warning(_("Trying fallback font: %s\n"), "sans");
- if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
+ if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
out = g_new(ObFont, 1);
out->xftfont = xf;
measure_height(out);
return out;
}
- g_warning(_("Unable to load font: %s\n"), "fixed");
+ g_warning(_("Unable to load font: %s\n"), "sans");
g_warning(_("Aborting!.\n"));
exit(3); /* can't continue without a font */
return (signed) f->xftfont->max_advance_width;
}
-void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
+void font_draw(XftDraw *d, TextureText *t, Rect *position)
{
+ int x,y,w,h;
XftColor c;
+ x = position->x;
+ y = position->y;
+ w = position->width;
+ h = position->height;
+
/* accomidate for areas bigger/smaller than Xft thinks the font is tall */
y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
- (t->font->height + h)) / 2;
+ (t->font->height + h) - 1) / 2;
x += 3; /* XXX figure out X with justification */