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

diff --git a/render/font.c b/render/font.c
index 96498c65..db4e8483 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,12 +1,16 @@
-#include "../kernel/openbox.h"
 #include "font.h"
-
-#include "../kernel/gettext.h"
+#include "kernel/openbox.h"
+#include "kernel/geom.h"
+#include "kernel/gettext.h"
 #define _(str) gettext(str)
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
-#include "../kernel/geom.h"
+#include <string.h>
+
+#define ELIPSES "..."
+#define ELIPSES_LENGTH(font, shadow, offset) \
+    (font->elipses_length + (shadow ? offset : 0))
 
 void font_startup(void)
 {
@@ -38,6 +42,11 @@ static void measure_height(ObFont *f)
     XftTextExtentsUtf8(ob_display, f->xftfont,
                        (FcChar8*)str, strlen(str), &info);
     f->height = (signed) info.height;
+
+    /* measure an elipses */
+    XftTextExtentsUtf8(ob_display, f->xftfont,
+                       (FcChar8*)ELIPSES, strlen(ELIPSES), &info);
+    f->elipses_length = (signed) info.xOff;
 }
 
 ObFont *font_open(char *fontstring)
@@ -68,8 +77,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 +107,11 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
 {
     int x,y,w,h;
     XftColor c;
+    GString *text;
+    int m, em;
+    size_t l;
+    gboolean shortened = FALSE;
 
-    x = position->x;
     y = position->y;
     w = position->width;
     h = position->height;
@@ -106,18 +120,56 @@ 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_string_new(t->string);
+    l = g_utf8_strlen(text->str, -1);
+    m = font_measure_string(t->font, text->str, t->shadow, t->offset);
+    while (l && m > position->width) {
+        shortened = TRUE;
+        /* remove a character from the middle */
+        text = g_string_erase(text, l-- / 2, 1);
+        em = ELIPSES_LENGTH(t->font, t->shadow, t->offset);
+        /* if the elipses are too large, don't show them at all */
+        if (em > position->width)
+            shortened = FALSE;
+        m = font_measure_string(t->font, text->str, t->shadow, t->offset) + em;
+    }
+    if (shortened) {
+        text = g_string_insert(text, (l + 1) / 2, ELIPSES);
+        l += 3;
+    }
+    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;
+    }
+
+    l = strlen(text->str); /* number of bytes */
 
     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->str, l);
     }  
     c.color.red = t->color->r | t->color->r << 8;
     c.color.green = t->color->g | t->color->g << 8;
@@ -127,6 +179,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->str, l);
     return;
 }