X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=592ced6fe39b1752d323afbe875c25d222474f37;hb=33ec08ea2253a1692cac221f49dadda339371f66;hp=785b22fc2bff07e2c92e7dd7f96a2f0c837d7ce3;hpb=3f32dfa87e08556d7f6a58efab9b7479e515be26;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 785b22fc..592ced6f 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,6 +1,7 @@
 #include "font.h"
+#include "color.h"
+#include "mask.h"
 #include "theme.h"
-#include "kernel/openbox.h"
 #include "kernel/geom.h"
 #include "kernel/gettext.h"
 #define _(str) gettext(str)
@@ -13,7 +14,9 @@
 #define ELIPSES_LENGTH(font, shadow, offset) \
     (font->elipses_length + (shadow ? offset : 0))
 
-void font_startup(void)
+static gboolean started = FALSE;
+
+static void font_startup(void)
 {
 #ifdef DEBUG
     int version;
@@ -30,34 +33,41 @@ void font_startup(void)
 #endif
 }
 
-static void measure_height(RrFont *f)
+static void measure_font(RrFont *f)
 {
     XGlyphInfo info;
 
     /* 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;
 }
 
-RrFont *font_open(char *fontstring)
+RrFont *RrFontOpen(const RrInstance *inst, char *fontstring)
 {
     RrFont *out;
     XftFont *xf;
+
+    if (!started) {
+        font_startup();
+        started = TRUE;
+    }
     
-    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), fontstring))) {
         out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
-        measure_height(out);
+        measure_font(out);
         return out;
     }
     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"))) {
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), "sans"))) {
         out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
-        measure_height(out);
+        measure_font(out);
         return out;
     }
     g_warning(_("Unable to load font: %s\n"), "sans");
@@ -66,56 +76,57 @@ RrFont *font_open(char *fontstring)
     exit(3); /* can't continue without a font */
 }
 
-void font_close(RrFont *f)
+void RrFontClose(RrFont *f)
 {
     if (f) {
-        XftFontClose(ob_display, f->xftfont);
+        XftFontClose(RrDisplay(f->inst), f->xftfont);
         g_free(f);
     }
 }
 
-void font_measure_full(RrFont *f, char *str, int shadow, int offset,
-                       int *x, int *y)
+static void font_measure_full(const RrFont *f, const gchar *str,
+                              gint shadow, gint offset, gint *x, gint *y)
 {
     XGlyphInfo info;
 
-    XftTextExtentsUtf8(ob_display, f->xftfont,
-                       (FcChar8*)str, strlen(str), &info);
+    XftTextExtentsUtf8(RrDisplay(f->inst), f->xftfont,
+                       (const FcChar8*)str, strlen(str), &info);
 
     *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 RrFontMeasureString(const RrFont *f, const gchar *str,
+                        gint shadow, gint offset)
 {
-    int x, y;
+    gint x, y;
     font_measure_full (f, str, shadow, offset, &x, &y);
     return x;
 }
 
-int font_height(RrFont *f, int shadow, int offset)
+int RrFontHeight(const RrFont *f, gint shadow, gint offset)
 {
     return f->xftfont->ascent + f->xftfont->descent + (shadow ? offset : 0);
 }
 
-int font_max_char_width(RrFont *f)
+int RrFontMaxCharWidth(const RrFont *f)
 {
     return (signed) f->xftfont->max_advance_width;
 }
 
-void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
+void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area)
 {
-    int x,y,w,h;
+    gint x,y,w,h;
     XftColor c;
     GString *text;
-    int mw, em, mh;
+    gint 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;
+        (area->height - RrFontHeight(t->font, t->shadow, t->offset)) / 2;
+    w = area->width;
     h = area->height;
 
     text = g_string_new(t->string);
@@ -140,10 +151,10 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
 
     switch (t->justify) {
     case RR_JUSTIFY_LEFT:
-        x = area->x + theme_bevel;
+        x = area->x;
         break;
     case RR_JUSTIFY_RIGHT:
-        x = area->x + (w - mw) - theme_bevel;
+        x = area->x + (w - mw);
         break;
     case RR_JUSTIFY_CENTER:
         x = area->x + (w - mw) / 2;
@@ -158,13 +169,15 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
             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,