X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=785b22fc2bff07e2c92e7dd7f96a2f0c837d7ce3;hb=a4a0cb78294bb1809b836ea1e86e9d7294bb2929;hp=c1139d6e70468ee3dba6583a3a7d70f8bac3a397;hpb=ef1f7b04949317a3ddfdd6c61651eb8ffca18f5f;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index c1139d6e..785b22fc 100644
--- 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)
 {
@@ -25,28 +30,23 @@ void font_startup(void)
 #endif
 }
 
-static void measure_height(ObFont *f)
+static void measure_height(RrFont *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)
+RrFont *font_open(char *fontstring)
 {
-    ObFont *out;
+    RrFont *out;
     XftFont *xf;
     
     if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
-        out = g_new(ObFont, 1);
+        out = g_new(RrFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -55,7 +55,7 @@ ObFont *font_open(char *fontstring)
     g_warning(_("Trying fallback font: %s\n"), "sans");
 
     if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
-        out = g_new(ObFont, 1);
+        out = g_new(RrFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -66,7 +66,7 @@ ObFont *font_open(char *fontstring)
     exit(3); /* can't continue without a font */
 }
 
-void font_close(ObFont *f)
+void font_close(RrFont *f)
 {
     if (f) {
         XftFontClose(ob_display, f->xftfont);
@@ -74,41 +74,83 @@ void font_close(ObFont *f)
     }
 }
 
-int font_measure_string(ObFont *f, char *str, int shadow, int offset)
+void font_measure_full(RrFont *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(RrFont *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)
+int font_height(RrFont *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)
+int font_max_char_width(RrFont *f)
 {
     return (signed) f->xftfont->max_advance_width;
 }
 
-void font_draw(XftDraw *d, TextureText *t, Rect *position)
+void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
 {
     int x,y,w,h;
     XftColor c;
+    GString *text;
+    int mw, em, mh;
+    size_t l;
+    gboolean shortened = FALSE;
+
+    /* center vertically */
+    y = area->y +
+        (area->height - font_height(t->font, t->shadow, t->offset)) / 2;
+    w = area->width - theme_bevel * 2;
+    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 RR_JUSTIFY_LEFT:
+        x = area->x + theme_bevel;
+        break;
+    case RR_JUSTIFY_RIGHT:
+        x = area->x + (w - mw) - theme_bevel;
+        break;
+    case RR_JUSTIFY_CENTER:
+        x = area->x + (w - mw) / 2;
+        break;
+    }
 
-    x = position->x;
-    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;
-
-    x += 3; /* XXX figure out X with justification */
+    l = strlen(text->str); /* number of bytes */
 
     if (t->shadow) {
         if (t->tint >= 0) {
@@ -126,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*)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;
@@ -136,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*)t->string, strlen(t->string));
+                      (FcChar8*)text->str, l);
     return;
 }