simply the render interface by not requiring the setting of all the areas. only take...

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index 7ffcb53b2dbcec7aa20166594fc859b2ea6748c2..274743041a35322ed05b3b15414a68025b7cb32d 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -1,12 +1,17 @@
-#include "../kernel/openbox.h"
 #include "font.h"
-
-#include "../kernel/gettext.h"
+#include "theme.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)
 {
@@ -28,16 +33,11 @@ void font_startup(void)
 static void measure_height(ObFont *f)
 {
     XGlyphInfo info;
-    char *str;
-
-    /* XXX add some extended UTF8 characters in here? */
-    str = "12345678900-qwertyuiopasdfghjklzxcvbnm"
-        "!@#$%^&*()_+QWERTYUIOPASDFGHJKLZXCVBNM"
-        "`~[]\\;',./{}|:\"<>?";
 
+    /* measure an elipses */
     XftTextExtentsUtf8(ob_display, f->xftfont,
-                       (FcChar8*)str, strlen(str), &info);
-    f->height = (signed) info.height;
+                       (FcChar8*)ELIPSES, strlen(ELIPSES), &info);
+    f->elipses_length = (signed) info.xOff;
 }
 
 ObFont *font_open(char *fontstring)
@@ -74,19 +74,28 @@ void font_close(ObFont *f)
     }
 }
 
-int font_measure_string(ObFont *f, char *str, int shadow, int offset)
+void font_measure_full(ObFont *f, char *str, int shadow, int offset,
+                       int *x, int *y)
 {
     XGlyphInfo info;
 
     XftTextExtentsUtf8(ob_display, f->xftfont,
                        (FcChar8*)str, strlen(str), &info);
 
-    return (signed) info.xOff + (shadow ? offset : 0);
+    *x = (signed) info.xOff + (shadow ? ABS(offset) : 0);
+    *y = info.height + (shadow ? ABS(offset) : 0);
+}
+
+int font_measure_string(ObFont *f, char *str, int shadow, int offset)
+{
+    int x, y;
+    font_measure_full (f, str, shadow, offset, &x, &y);
+    return x;
 }
 
 int font_height(ObFont *f, int shadow, int offset)
 {
-    return f->height + (shadow ? offset : 0);
+    return f->xftfont->ascent + f->xftfont->descent + (shadow ? offset : 0);
 }
 
 int font_max_char_width(ObFont *f)
@@ -94,43 +103,55 @@ int font_max_char_width(ObFont *f)
     return (signed) f->xftfont->max_advance_width;
 }
 
-void font_draw(XftDraw *d, TextureText *t, Rect *position)
+void font_draw(XftDraw *d, TextureText *t, Rect *area)
 {
     int x,y,w,h;
     XftColor c;
-    char *text;
-    int m;
+    GString *text;
+    int mw, em, mh;
     size_t l;
-
-    y = position->y;
-    w = position->width;
-    h = position->height;
-
-    /* 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);
+    gboolean shortened = FALSE;
+
+    /* center vertically */
+    y = area->y +
+        (area->height - font_height(t->font, t->shadow, t->offset)) / 2;
+    w = area->width;
+    h = area->height;
+
+    text = g_string_new(t->string);
+    l = g_utf8_strlen(text->str, -1);
+    font_measure_full(t->font, text->str, t->shadow, t->offset, &mw, &mh);
+    while (l && mw > area->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 > area->width)
+            shortened = FALSE;
+        font_measure_full(t->font, text->str, t->shadow, t->offset, &mw, &mh);
+        mw += 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;
+        x = area->x + theme_bevel;
         break;
     case Justify_Right:
-        x = position->x + (w - m);
+        x = area->x + (w - mw) - theme_bevel;
         break;
     case Justify_Center:
-        x = position->x + (w - m) / 2;
+        x = area->x + (w - mw) / 2;
         break;
     }
 
+    l = strlen(text->str); /* number of bytes */
+
     if (t->shadow) {
         if (t->tint >= 0) {
             c.color.red = 0;
@@ -147,7 +168,7 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
         }  
         XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
                           t->font->xftfont->ascent + y + t->offset,
-                          (FcChar8*)text, l);
+                          (FcChar8*)text->str, l);
     }  
     c.color.red = t->color->r | t->color->r << 8;
     c.color.green = t->color->g | t->color->g << 8;
@@ -157,6 +178,6 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
                      
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
                       t->font->xftfont->ascent + y,
-                      (FcChar8*)text, l);
+                      (FcChar8*)text->str, l);
     return;
 }