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

diff --git a/render/font.c b/render/font.c
index c03ea544..7ffcb53b 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,11 +1,13 @@
-#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>
+#include "../kernel/geom.h"
+
 void font_startup(void)
 {
 #ifdef DEBUG
@@ -44,32 +46,35 @@ ObFont *font_open(char *fontstring)
     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");
+    g_warning(_("Trying fallback font: %s\n"), "sans");
 
-    if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
-        out = malloc(sizeof(ObFont));
+    if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
     }
-    g_warning(_("Unable to load font: %s\n"), "fixed");
+    g_warning(_("Unable to load font: %s\n"), "sans");
     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);
+    if (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;
 
@@ -89,35 +94,69 @@ 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;
+    char *text;
+    int m;
+    size_t l;
 
-    /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
-    y += (h - t->font->xftfont->height) / 2;
+    y = position->y;
+    w = position->width;
+    h = position->height;
 
-    x += 3; /* XXX figure out X with justification */
+    /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
+    y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
+          (t->font->height + h) - 1) / 2;
+
+    text = g_strdup(t->string);
+    l = strlen(text);
+    m = font_measure_string(t->font, text, t->shadow, t->offset);
+    while (l && m > position->width) {
+        text[--l] = '\0';
+        m = font_measure_string(t->font, text, t->shadow, t->offset);
+    }
+    if (!l) return;
+
+    switch (t->justify) {
+    case Justify_Left:
+        x = position->x;
+        break;
+    case Justify_Right:
+        x = position->x + (w - m);
+        break;
+    case Justify_Center:
+        x = position->x + (w - m) / 2;
+        break;
+    }
 
     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);
-  
+        if (t->tint >= 0) {
+            c.color.red = 0;
+            c.color.green = 0;
+            c.color.blue = 0;
+            c.color.alpha = 0xffff * t->tint / 100; /* transparent shadow */
+            c.pixel = BlackPixel(ob_display, ob_screen);
+        } else {
+            c.color.red = 0xffff * -t->tint / 100;
+            c.color.green = 0xffff * -t->tint / 100;
+            c.color.blue = 0xffff * -t->tint / 100;
+            c.color.alpha = 0xffff * -t->tint / 100; /* transparent shadow */
+            c.pixel = WhitePixel(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));
+                          (FcChar8*)text, l);
     }  
     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;
-    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));
+                      t->font->xftfont->ascent + y,
+                      (FcChar8*)text, l);
     return;
 }