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

diff --git a/render/font.c b/render/font.c
index 716623bc..405cf1c3 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,60 +1,77 @@
-#include <stdlib.h>
-#include <X11/Xft/Xft.h>
 #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>
+
 void font_startup(void)
 {
 #ifdef DEBUG
     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;
     XftFont *xf;
     
     if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
-        out = malloc(sizeof(ObFont));
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
+        measure_height(out);
         return out;
     }
     g_warning(_("Unable to load font: %s\n"), fontstring);
     g_warning(_("Trying fallback font: %s\n"), "fixed");
 
     if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
-        out = malloc(sizeof(ObFont));
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
+        measure_height(out);
         return out;
     }
     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)
 {
     XftFontClose(ob_display, f->xftfont);
+    g_free(f);
 }
 
-
-int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
+int font_measure_string(ObFont *f, char *str, int shadow, int offset)
 {
     XGlyphInfo info;
 
@@ -64,14 +81,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.color.alpha = 0xff | 0xff << 8; /* fully opaque text */
+    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));
+    return;
 }