X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=c03ea544447f789008297e545a0e312714864cef;hb=597fad9d8d5b7be27cabeeec750ed15f86377a07;hp=716623bcdc48a7999f621de8ba98badbc7498efc;hpb=aa68e45b1902a9ff741aa8dade90860388d4b6e7;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 716623bc..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");
@@ -47,13 +64,11 @@ ObFont *font_open(char *fontstring)
     exit(3); // can't continue without a font
 }
 
-
 void font_close(ObFont *f)
 {
     XftFontClose(ob_display, f->xftfont);
 }
 
-
 int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
 {
     XGlyphInfo info;
@@ -64,14 +79,45 @@ int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
     return (signed) info.xOff + (shadow ? offset : 0);
 }
 
-
 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)
 {
-  return (signed) f->xftfont->max_advance_width;
+    return (signed) f->xftfont->max_advance_width;
+}
+
+void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
+{
+    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;
+        c.color.blue = 0;
+        c.color.alpha = t->tint | t->tint << 8; // transparent shadow
+        c.pixel = BlackPixel(ob_display, ob_screen);
+  
+        XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
+                          t->font->xftfont->ascent + y + t->offset,
+                          (FcChar8*)t->string, strlen(t->string));
+    }  
+    c.color.red = t->color->r | t->color->r << 8;
+    c.color.green = t->color->g | t->color->g << 8;
+    c.color.blue = t->color->b | t->color->b << 8;
+    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 -
+                      (t->font->xftfont->height - t->font->height) / 2,
+                     (FcChar8*)t->string, strlen(t->string));
+    return;
 }