X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=94d9fa2db47e48f2805cf29c41d021b247f782f3;hb=c34ef4028e504b8ce862b9c2e47b284ab66717dd;hp=db4e8483fee4cf4bb29be3e2a134f70f6fbd4e41;hpb=955d9d8e3048d04edb8986bfe7693e659204eae3;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index db4e8483..94d9fa2d 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,137 +1,182 @@
 #include "font.h"
-#include "kernel/openbox.h"
-#include "kernel/geom.h"
-#include "kernel/gettext.h"
-#define _(str) gettext(str)
+#include "color.h"
+#include "mask.h"
+#include "theme.h"
+#include "gettext.h"
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #define ELIPSES "..."
-#define ELIPSES_LENGTH(font, shadow, offset) \
-    (font->elipses_length + (shadow ? offset : 0))
+#define ELIPSES_LENGTH(font) \
+    (font->elipses_length + (font->shadow ? font->offset : 0))
 
-void font_startup(void)
+#define OB_SHADOW "shadow"
+#define OB_SHADOW_OFFSET "shadowoffset"
+#define OB_SHADOW_ALPHA "shadowtint"
+
+FcObjectType objs[] = {
+    { OB_SHADOW,        FcTypeBool    },
+    { OB_SHADOW_OFFSET, FcTypeInteger },
+    { OB_SHADOW_ALPHA,  FcTypeInteger  }
+};
+
+static gboolean started = FALSE;
+
+static void font_startup(void)
 {
-#ifdef DEBUG
-    int version;
-#endif /* DEBUG */
     if (!XftInit(0)) {
         g_warning(_("Couldn't initialize Xft.\n"));
-        exit(3);
+        exit(EXIT_FAILURE);
     }
-#ifdef DEBUG
-    version = XftGetVersion();
-    g_message("Using Xft %d.%d.%d (Built against %d.%d.%d).",
-              version / 10000 % 100, version / 100 % 100, version % 100,
-              XFT_MAJOR, XFT_MINOR, XFT_REVISION);
-#endif
+    FcNameRegisterObjectTypes(objs, (sizeof(objs) / sizeof(objs[0])));
 }
 
-static void measure_height(ObFont *f)
+static void measure_font(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)
+static RrFont *openfont(const RrInstance *inst, char *fontstring)
 {
-    ObFont *out;
-    XftFont *xf;
-    
-    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
-        out = g_new(ObFont, 1);
-        out->xftfont = xf;
-        measure_height(out);
-        return out;
+    RrFont *out;
+    FcPattern *pat, *match;
+    XftFont *font;
+    FcResult res;
+    gint tint;
+
+    if (!(pat = XftNameParse(fontstring)))
+        return NULL;
+
+    match = XftFontMatch(RrDisplay(inst), RrScreen(inst), pat, &res);
+    if (!match)
+        return NULL;
+
+    out = g_new(RrFont, 1);
+    out->inst = inst;
+
+    if (FcPatternGetBool(match, OB_SHADOW, 0, &out->shadow) != FcResultMatch)
+        out->shadow = FALSE;
+
+    if (FcPatternGetInteger(match, OB_SHADOW_OFFSET, 0, &out->offset) !=
+        FcResultMatch)
+        out->offset = 1;
+
+    if (FcPatternGetInteger(match, OB_SHADOW_ALPHA, 0, &tint) != FcResultMatch)
+        tint = 25;
+    if (tint > 100) tint = 100;
+    else if (tint < -100) tint = -100;
+    out->tint = tint;
+
+    font = XftFontOpenPattern(RrDisplay(inst), match);
+    if (!font) {
+        FcPatternDestroy(match);
+        g_free(out);
+        return NULL;
+    } else
+        out->xftfont = font;
+
+    measure_font(out);
+
+    return out;
+}
+
+RrFont *RrFontOpen(const RrInstance *inst, char *fontstring)
+{
+    RrFont *out;
+
+    if (!started) {
+        font_startup();
+        started = TRUE;
     }
+
+    if ((out = openfont(inst, fontstring)))
+        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"))) {
-        out = g_new(ObFont, 1);
-        out->xftfont = xf;
-        measure_height(out);
+    if ((out = openfont(inst, "sans")))
         return out;
-    }
     g_warning(_("Unable to load font: %s\n"), "sans");
-    g_warning(_("Aborting!.\n"));
 
-    exit(3); /* can't continue without a font */
+    return NULL;
 }
 
-void font_close(ObFont *f)
+void RrFontClose(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)
+static void font_measure_full(const RrFont *f, const gchar *str,
+                              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);
 
-    return (signed) info.xOff + (shadow ? offset : 0);
+    *x = (signed) info.xOff + (f->shadow ? ABS(f->offset) : 0);
+    *y = info.height + (f->shadow ? ABS(f->offset) : 0);
 }
 
-int font_height(ObFont *f, int shadow, int offset)
+int RrFontMeasureString(const RrFont *f, const gchar *str)
 {
-    return f->height + (shadow ? offset : 0);
+    gint x, y;
+    font_measure_full (f, str, &x, &y);
+    return x + 4;
 }
 
-int font_max_char_width(ObFont *f)
+int RrFontHeight(const RrFont *f)
+{
+    return f->xftfont->ascent + f->xftfont->descent +
+        (f->shadow ? f->offset : 0);
+}
+
+int RrFontMaxCharWidth(const RrFont *f)
 {
     return (signed) f->xftfont->max_advance_width;
 }
 
-void font_draw(XftDraw *d, TextureText *t, Rect *position)
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
 {
-    int x,y,w,h;
+    gint x,y,w,h;
     XftColor c;
     GString *text;
-    int m, em;
+    gint 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 - RrFontHeight(t->font)) / 2;
+    /* the +2 and -4 leave a small blank edge on the sides */
+    x = area->x + 2;
+    w = area->width - 4;
+    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, &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);
+        em = ELIPSES_LENGTH(t->font);
         /* 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, &mw, &mh);
+        mw += em;
     }
     if (shortened) {
         text = g_string_insert(text, (l + 1) / 2, ELIPSES);
@@ -140,35 +185,36 @@ 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:
         break;
-    case Justify_Right:
-        x = position->x + (w - m);
+    case RR_JUSTIFY_RIGHT:
+        x += (w - mw);
         break;
-    case Justify_Center:
-        x = position->x + (w - m) / 2;
+    case RR_JUSTIFY_CENTER:
+        x += (w - mw) / 2;
         break;
     }
 
     l = strlen(text->str); /* number of bytes */
 
-    if (t->shadow) {
-        if (t->tint >= 0) {
+    if (t->font->shadow) {
+        if (t->font->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.color.alpha = 0xffff * t->font->tint / 100;
+            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.color.red = 0xffff;
+            c.color.green = 0xffff;
+            c.color.blue = 0xffff;
+            c.color.alpha = 0xffff * -t->font->tint / 100;
+            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,
+        XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->font->offset,
+                          t->font->xftfont->ascent + y + t->font->offset,
                           (FcChar8*)text->str, l);
     }  
     c.color.red = t->color->r | t->color->r << 8;
@@ -176,7 +222,7 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position)
     c.color.blue = t->color->b | t->color->b << 8;
     c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */
     c.pixel = t->color->pixel;
-                     
+
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
                       t->font->xftfont->ascent + y,
                       (FcChar8*)text->str, l);