X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Ffont.c;h=64f1da16c6c621b7b721b514a85c2d2794c4811a;hb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;hp=9d3a1321a2842d1a5de56e621e8ed31dffe89d4f;hpb=9b2a67d0445c5741c361ed03210bdb357d444708;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 9d3a1321..64f1da16 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,5 +1,5 @@
 #include "font.h"
-#include "kernel/openbox.h"
+#include "theme.h"
 #include "kernel/geom.h"
 #include "kernel/gettext.h"
 #define _(str) gettext(str)
@@ -29,33 +29,24 @@ 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"
-        "`~[]\\;',./{}|:\"<>?";
-
-    XftTextExtentsUtf8(ob_display, f->xftfont,
-                       (FcChar8*)str, strlen(str), &info);
-    f->height = (signed) info.height;
 
     /* measure an elipses */
-    XftTextExtentsUtf8(ob_display, f->xftfont,
+    XftTextExtentsUtf8(RrDisplay(f->inst), f->xftfont,
                        (FcChar8*)ELIPSES, strlen(ELIPSES), &info);
     f->elipses_length = (signed) info.xOff;
 }
 
-ObFont *font_open(char *fontstring)
+RrFont *font_open(const RrInstance *inst, char *fontstring)
 {
-    ObFont *out;
+    RrFont *out;
     XftFont *xf;
     
-    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
-        out = g_new(ObFont, 1);
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), fontstring))) {
+        out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -63,8 +54,9 @@ ObFont *font_open(char *fontstring)
     g_warning(_("Unable to load font: %s\n"), fontstring);
     g_warning(_("Trying fallback font: %s\n"), "sans");
 
-    if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
-        out = g_new(ObFont, 1);
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), "sans"))) {
+        out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -75,63 +67,71 @@ 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);
+        XftFontClose(RrDisplay(f->inst), f->xftfont);
         g_free(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,
+    XftTextExtentsUtf8(RrDisplay(f->inst), 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 m, em;
+    int mw, em, mh;
     size_t l;
     gboolean shortened = FALSE;
 
-    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;
+    /* 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);
-    m = font_measure_string(t->font, text->str, t->shadow, t->offset);
-    while (l && m > position->width) {
+    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 > position->width)
+        if (em > area->width)
             shortened = FALSE;
-        m = font_measure_string(t->font, text->str, t->shadow, t->offset) + em;
+        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);
@@ -140,34 +140,38 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
     if (!l) return;
 
     switch (t->justify) {
-    case Justify_Left:
-        x = position->x;
+    case RR_JUSTIFY_LEFT:
+        x = area->x;
         break;
-    case Justify_Right:
-        x = position->x + (w - m);
+    case RR_JUSTIFY_RIGHT:
+        x = area->x + (w - mw);
         break;
-    case Justify_Center:
-        x = position->x + (w - m) / 2;
+    case RR_JUSTIFY_CENTER:
+        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;
             c.color.green = 0;
             c.color.blue = 0;
             c.color.alpha = 0xffff * t->tint / 100; /* transparent shadow */
-            c.pixel = BlackPixel(ob_display, ob_screen);
+            c.pixel = BlackPixel(RrDisplay(t->font->inst),
+                                 RrScreen(t->font->inst));
         } 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);
+            c.pixel = WhitePixel(RrDisplay(t->font->inst),
+                                 RrScreen(t->font->inst));
         }  
         XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
                           t->font->xftfont->ascent + y + t->offset,
-                          (FcChar8*)text->str, strlen(text->str));
+                          (FcChar8*)text->str, l);
     }  
     c.color.red = t->color->r | t->color->r << 8;
     c.color.green = t->color->g | t->color->g << 8;
@@ -177,6 +181,6 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
                      
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
                       t->font->xftfont->ascent + y,
-                      (FcChar8*)text->str, strlen(text->str));
+                      (FcChar8*)text->str, l);
     return;
 }