X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=274743041a35322ed05b3b15414a68025b7cb32d;hb=cd12a2eae5b5b72df08d588ac71d1f6cf6725dfb;hp=d9bc4987bef84a2a441bdd891f8c580f0d2cc030;hpb=ff97498e1d466fa0f4de04252c8324a5a94c7e38;p=chaz%2Fopenbox diff --git a/render/font.c b/render/font.c index d9bc4987..27474304 100644 --- a/render/font.c +++ b/render/font.c @@ -1,11 +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 #include +#include + +#define ELIPSES "..." +#define ELIPSES_LENGTH(font, shadow, offset) \ + (font->elipses_length + (shadow ? offset : 0)) void font_startup(void) { @@ -27,16 +33,11 @@ void font_startup(void) static void measure_height(ObFont *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) @@ -51,39 +52,50 @@ ObFont *font_open(char *fontstring) return out; } g_warning(_("Unable to load font: %s\n"), fontstring); - g_warning(_("Trying fallback font: %s\n"), "fixed"); + g_warning(_("Trying fallback font: %s\n"), "sans"); - if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) { + if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) { out = g_new(ObFont, 1); out->xftfont = xf; measure_height(out); return out; } - g_warning(_("Unable to load font: %s\n"), "fixed"); + g_warning(_("Unable to load font: %s\n"), "sans"); g_warning(_("Aborting!.\n")); - exit(3); // can't continue without a font + exit(3); /* can't continue without a font */ } void font_close(ObFont *f) { - XftFontClose(ob_display, f->xftfont); - g_free(f); + if (f) { + XftFontClose(ob_display, f->xftfont); + g_free(f); + } } -int font_measure_string(ObFont *f, char *str, int shadow, int offset) +void font_measure_full(ObFont *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(ObFont *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) { - return f->height + (shadow ? offset : 0); + return f->xftfont->ascent + f->xftfont->descent + (shadow ? offset : 0); } int font_max_char_width(ObFont *f) @@ -91,25 +103,72 @@ int font_max_char_width(ObFont *f) return (signed) f->xftfont->max_advance_width; } -void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h) +void font_draw(XftDraw *d, TextureText *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; + 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 Justify_Left: + x = area->x + theme_bevel; + break; + case Justify_Right: + x = area->x + (w - mw) - theme_bevel; + break; + case Justify_Center: + x = area->x + (w - mw) / 2; + break; + } - /* accomidate for areas bigger/smaller than Xft thinks the font is tall */ - y += (h - t->font->xftfont->height) / 2; - - x += 3; /* XXX figure out X with justification */ + l = strlen(text->str); /* number of bytes */ if (t->shadow) { - c.color.red = 0; - c.color.green = 0; - c.color.blue = 0; - c.color.alpha = t->tint | t->tint << 8; /* transparent shadow */ - c.pixel = BlackPixel(ob_display, ob_screen); - + 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); + } 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); + } 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; @@ -118,8 +177,7 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h) c.pixel = t->color->pixel; XftDrawStringUtf8(d, &c, t->font->xftfont, x, - t->font->xftfont->ascent + y - - (t->font->xftfont->height - t->font->height) / 2, - (FcChar8*)t->string, strlen(t->string)); + t->font->xftfont->ascent + y, + (FcChar8*)text->str, l); return; }