X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Ffont.c;h=785b22fc2bff07e2c92e7dd7f96a2f0c837d7ce3;hb=3f32dfa87e08556d7f6a58efab9b7479e515be26;hp=22722245439f1a31bfa70df13b4cb9a7c81f2028;hpb=fd52dc5d350cc753de8df1f702c318e3f3154dcf;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 22722245..785b22fc 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,4 +1,5 @@
 #include "font.h"
+#include "theme.h"
 #include "kernel/openbox.h"
 #include "kernel/geom.h"
 #include "kernel/gettext.h"
@@ -29,7 +30,7 @@ void font_startup(void)
 #endif
 }
 
-static void measure_height(ObFont *f)
+static void measure_height(RrFont *f)
 {
     XGlyphInfo info;
 
@@ -39,13 +40,13 @@ static void measure_height(ObFont *f)
     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;
@@ -54,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;
@@ -65,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);
@@ -73,7 +74,7 @@ void font_close(ObFont *f)
     }
 }
 
-void font_measure_full(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;
@@ -85,24 +86,24 @@ void font_measure_full(ObFont *f, char *str, int shadow, int offset,
     *y = info.height + (shadow ? ABS(offset) : 0);
 }
 
-int font_measure_string(ObFont *f, char *str, int shadow, int offset)
+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->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;
@@ -111,20 +112,22 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
     size_t l;
     gboolean shortened = FALSE;
 
-    y = position->y;
-    w = position->width;
-    h = position->height;
+    /* 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 > position->width) {
+    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;
         font_measure_full(t->font, text->str, t->shadow, t->offset, &mw, &mh);
         mw += em;
@@ -135,18 +138,15 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
     }
     if (!l) return;
 
-    /* center vertically */
-    y -= ((t->font->xftfont->ascent + t->font->xftfont->descent) - mh) / 2;
-
     switch (t->justify) {
-    case Justify_Left:
-        x = position->x;
+    case RR_JUSTIFY_LEFT:
+        x = area->x + theme_bevel;
         break;
-    case Justify_Right:
-        x = position->x + (w - mw);
+    case RR_JUSTIFY_RIGHT:
+        x = area->x + (w - mw) - theme_bevel;
         break;
-    case Justify_Center:
-        x = position->x + (w - mw) / 2;
+    case RR_JUSTIFY_CENTER:
+        x = area->x + (w - mw) / 2;
         break;
     }