#include "../kernel/openbox.h"
#include "font.h"
-#include "../src/gettext.h"
+#include "../kernel/gettext.h"
#define _(str) gettext(str)
#include <X11/Xft/Xft.h>
#include <glib.h>
+#include "../kernel/geom.h"
void font_startup(void)
{
g_warning(_("Unable to load font: %s\n"), "fixed");
g_warning(_("Aborting!.\n"));
- exit(3); // can't continue without a font
+ exit(3); /* can't continue without a font */
}
void font_close(ObFont *f)
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 += (h - t->font->xftfont->height) / 2;
+ y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
+ (t->font->height + h) - 1) / 2;
x += 3; /* XXX figure out X with justification */
c.pixel = t->color->pixel;
XftDrawStringUtf8(d, &c, t->font->xftfont, x,
- t->font->xftfont->ascent + y -
- (t->font->xftfont->height - t->font->height) / 2,
- (FcChar8*)t->string, strlen(t->string));
+ t->font->xftfont->ascent + y,
+ (FcChar8*)t->string, strlen(t->string));
return;
}