mor fabulous focus fixings.

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index c2e97861432650f3eadb8af530dc188e11108edc..ee06caca861f9f6dee63917c31992787af5407e9 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -6,6 +6,7 @@
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
+#include "../kernel/geom.h"
 
 void font_startup(void)
 {
@@ -91,12 +92,19 @@ int font_max_char_width(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 += (t->font->xftfont->height + 1 - (t->font->height + h)) / 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 */