X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=7ffcb53b2dbcec7aa20166594fc859b2ea6748c2;hb=9d16ced24e0bdcba0998be008850372055d16a09;hp=96498c650064c0fd0cf751aaacc9442321775580;hpb=feb6bc632f4eebf2edb9590a17c77523507e228f;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 96498c65..7ffcb53b 100644
--- a/render/font.c
+++ b/render/font.c
@@ -68,8 +68,10 @@ ObFont *font_open(char *fontstring)
 
 void font_close(ObFont *f)
 {
-    XftFontClose(ob_display, f->xftfont);
-    g_free(f);
+    if (f) {
+        XftFontClose(ob_display, f->xftfont);
+        g_free(f);
+    }
 }
 
 int font_measure_string(ObFont *f, char *str, int shadow, int offset)
@@ -96,8 +98,10 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
 {
     int x,y,w,h;
     XftColor c;
+    char *text;
+    int m;
+    size_t l;
 
-    x = position->x;
     y = position->y;
     w = position->width;
     h = position->height;
@@ -106,18 +110,44 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
     y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
           (t->font->height + h) - 1) / 2;
 
-    x += 3; /* XXX figure out X with justification */
+    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;
@@ -127,6 +157,6 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
                      
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
                       t->font->xftfont->ascent + y,
-                      (FcChar8*)t->string, strlen(t->string));
+                      (FcChar8*)text, l);
     return;
 }