X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=c03ea544447f789008297e545a0e312714864cef;hb=7d215bd255d0744101b9ceb52c235bdc985fa034;hp=a55cb77a8e1bca0e1c8213dba8c8d0e694cdca97;hpb=88a8bc413b433dc7196c17f4e318ae920ae7d1e6;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index a55cb77a..c03ea544 100644
--- a/render/font.c
+++ b/render/font.c
@@ -12,17 +12,32 @@ void font_startup(void)
     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
 }
 
+static void measure_height(ObFont *f)
+{
+    XGlyphInfo info;
+    char *str;
+
+    /* XXX add some extended UTF8 characters in here? */
+    str = "12345678900-qwertyuiopasdfghjklzxcvbnm"
+        "!@#$%^&*()_+QWERTYUIOPASDFGHJKLZXCVBNM"
+        "`~[]\\;',./{}|:\"<>?";
+
+    XftTextExtentsUtf8(ob_display, f->xftfont,
+                       (FcChar8*)str, strlen(str), &info);
+    f->height = (signed) info.height;
+}
+
 ObFont *font_open(char *fontstring)
 {
     ObFont *out;
@@ -31,6 +46,7 @@ ObFont *font_open(char *fontstring)
     if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
         out = malloc(sizeof(ObFont));
         out->xftfont = xf;
+        measure_height(out);
         return out;
     }
     g_warning(_("Unable to load font: %s\n"), fontstring);
@@ -39,6 +55,7 @@ ObFont *font_open(char *fontstring)
     if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
         out = malloc(sizeof(ObFont));
         out->xftfont = xf;
+        measure_height(out);
         return out;
     }
     g_warning(_("Unable to load font: %s\n"), "fixed");
@@ -64,7 +81,7 @@ int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
 
 int font_height(ObFont *f, int shadow, int offset)
 {
-    return (signed) f->xftfont->height + (shadow ? offset : 0);
+    return f->height + (shadow ? offset : 0);
 }
 
 int font_max_char_width(ObFont *f)
@@ -72,10 +89,15 @@ int font_max_char_width(ObFont *f)
     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;
@@ -93,7 +115,9 @@ void font_draw(XftDraw *d, TextureText *t)
     c.pixel = t->color->pixel;
     c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
                      
-    XftDrawStringUtf8(d, &c, t->font->xftfont, x, t->font->xftfont->ascent + y,
+    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));
     return;
 }