X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=7556d1c8cb0f28ed7af6540513287aa9fb942e2a;hb=dbe2851b910dcdb02afbb744dbb2926286ab8f65;hp=22722245439f1a31bfa70df13b4cb9a7c81f2028;hpb=fd52dc5d350cc753de8df1f702c318e3f3154dcf;p=chaz%2Fopenbox diff --git a/render/font.c b/render/font.c index 22722245..7556d1c8 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) @@ -12,7 +12,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; @@ -29,34 +31,41 @@ void font_startup(void) #endif } -static void measure_height(ObFont *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; } -ObFont *font_open(char *fontstring) +RrFont *RrFontOpen(const RrInstance *inst, char *fontstring) { - ObFont *out; + RrFont *out; XftFont *xf; + + if (!started) { + font_startup(); + started = TRUE; + } - 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); + 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"))) { - 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); + measure_font(out); return out; } g_warning(_("Unable to load font: %s\n"), "sans"); @@ -65,66 +74,69 @@ ObFont *font_open(char *fontstring) exit(3); /* can't continue without a font */ } -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); } } -void font_measure_full(ObFont *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(ObFont *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(ObFont *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(ObFont *f) +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, 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; - y = position->y; - w = position->width; - h = position->height; + /* center vertically */ + y = area->y + + (area->height - RrFontHeight(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 > 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 +147,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; break; - case Justify_Right: - x = position->x + (w - mw); + case RR_JUSTIFY_RIGHT: + x = area->x + (w - mw); break; - case Justify_Center: - x = position->x + (w - mw) / 2; + case RR_JUSTIFY_CENTER: + x = area->x + (w - mw) / 2; break; } @@ -158,13 +167,15 @@ void font_draw(XftDraw *d, TextureText *t, Rect *position) 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,