X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=5771a1c225b459bf03a2a35bfac3f841c67ada48;hb=c234ed9ecd9d5228744aae018768ff0c04f2d217;hp=b6e5026b2239731285e8ad6d1788ab664e3e32a1;hpb=7089a86006929ccbb8bed18eaae702cb04364058;p=chaz%2Fopenbox diff --git a/render/font.c b/render/font.c index b6e5026b..5771a1c2 100644 --- a/render/font.c +++ b/render/font.c @@ -21,12 +21,16 @@ #include "color.h" #include "mask.h" #include "theme.h" +#include "geom.h" #include "gettext.h" #include #include #include #include +#ifdef USE_PANGO +#include +#endif #define ELIPSES "..." #define ELIPSES_LENGTH(font) \ @@ -42,6 +46,9 @@ FcObjectType objs[] = { { OB_SHADOW_ALPHA, FcTypeInteger } }; +#ifdef USE_PANGO +static PangoContext *context; +#endif static gboolean started = FALSE; static void font_startup(void) @@ -53,6 +60,9 @@ static void font_startup(void) #ifdef USE_PANGO g_type_init(); + /* these will never be freed, but we will need + * them until we shut down anyway */ + context = pango_xft_get_context(RrDisplay(NULL), RrScreen(NULL)); #endif /* USE_PANGO */ /* Here we are teaching xft about the shadow, shadowoffset & shadowtint */ FcNameRegisterObjectTypes(objs, (sizeof(objs) / sizeof(objs[0]))); @@ -79,7 +89,7 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring) FcResult res; gint tint; #ifdef USE_PANGO - gchar *tmp_string = NULL; + guchar *tmp_string = NULL; gint tmp_int; #endif /* USE_PANGO */ @@ -94,31 +104,49 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring) out = g_new(RrFont, 1); out->inst = inst; #ifdef USE_PANGO - /* printf("\n\n%s\n\n",fontstring); - FcPatternPrint(match); */ - out->pango_font_description = pango_font_description_new(); - if (FcPatternGetString(match, "family", 0, &tmp_string) != FcResultTypeMismatch) { - pango_font_description_set_family(out->pango_font_description, tmp_string); + if (FcPatternGetString(match, "family", 0, &tmp_string) != + FcResultTypeMismatch) { + pango_font_description_set_family(out->pango_font_description, + (gchar *)tmp_string); tmp_string = NULL; } - if (FcPatternGetString(match, "style", 0, &tmp_string) != FcResultTypeMismatch) { + if (FcPatternGetString(match, "style", 0, &tmp_string) != + FcResultTypeMismatch) { /* Bold ? */ - if (!strcasecmp("bold", tmp_string)) { - pango_font_description_set_weight(out->pango_font_description, PANGO_WEIGHT_BOLD); + if (!strcasecmp("bold", (gchar *)tmp_string)) { + pango_font_description_set_weight(out->pango_font_description, + PANGO_WEIGHT_BOLD); } /* Italic ? */ - else if (!strcasecmp("italic", tmp_string)) { - pango_font_description_set_style(out->pango_font_description, PANGO_STYLE_ITALIC); + else if (!strcasecmp("italic", (gchar *)tmp_string)) { + pango_font_description_set_style(out->pango_font_description, + PANGO_STYLE_ITALIC); } tmp_string = NULL; } - if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) != FcResultTypeMismatch) { - /* TODO: is PANGO_SCALE correct ?? */ - pango_font_description_set_size(out->pango_font_description, tmp_int*PANGO_SCALE); + if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) != + FcResultTypeMismatch) { + pango_font_description_set_absolute_size(out->pango_font_description, + tmp_int*PANGO_SCALE); } + + /* based on gtkmain.c gtk_get_default_language() */ + gchar *locale, *p; + locale = g_strdup(setlocale(LC_CTYPE, NULL)); + if ((p = strchr(locale, '.'))) + *p = '\0'; + if ((p = strchr(locale, '@'))) + *p = '\0'; + PangoFontMetrics *metrics = + pango_context_get_metrics(context, out->pango_font_description, + pango_language_from_string(locale)); + out->pango_ascent = pango_font_metrics_get_ascent(metrics); + out->pango_descent = pango_font_metrics_get_descent(metrics); + g_free(locale); + pango_font_metrics_unref(metrics); #endif /* USE_PANGO */ if (FcPatternGetBool(match, OB_SHADOW, 0, &out->shadow) != FcResultMatch) @@ -174,6 +202,9 @@ RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring) void RrFontClose(RrFont *f) { if (f) { +#ifdef USE_PANGO + pango_font_description_free(f->pango_font_description); +#endif XftFontClose(RrDisplay(f->inst), f->xftfont); g_free(f); } @@ -183,10 +214,8 @@ static void font_measure_full(const RrFont *f, const gchar *str, gint *x, gint *y) { #ifdef USE_PANGO - PangoContext *context; PangoLayout *pl; PangoRectangle rect; - context = pango_xft_get_context (RrDisplay(f->inst), RrScreen(f->inst)); pl = pango_layout_new (context); pango_layout_set_text(pl, str, -1); pango_layout_set_font_description(pl, f->pango_font_description); @@ -195,7 +224,6 @@ static void font_measure_full(const RrFont *f, const gchar *str, *x = rect.width + (f->shadow ? ABS(f->offset) : 0); *y = rect.height + (f->shadow ? ABS(f->offset) : 0); g_object_unref(pl); - g_object_unref(context); #else XGlyphInfo info; @@ -208,36 +236,25 @@ static void font_measure_full(const RrFont *f, const gchar *str, #endif /* USE_PANGO */ } -gint RrFontMeasureString(const RrFont *f, const gchar *str) +RrSize *RrFontMeasureString(const RrFont *f, const gchar *str) { - gint x, y; - font_measure_full (f, str, &x, &y); - return x + 4; + RrSize *size; + size = g_new(RrSize, 1); + font_measure_full (f, str, &size->width, &size->height); + return size; } gint RrFontHeight(const RrFont *f) { -#ifndef USE_PANGO - return f->xftfont->ascent + f->xftfont->descent + - (f->shadow ? f->offset : 0); -#else /* USE_PANGO */ - /* - PangoContext *context = pango_context_new (); - - PangoFontMetrics *metrics = pango_context_get_metrics(context, f->pango_font, NULL); - - gint result = pango_font_metrics_get_ascent (metrics) + - pango_font_metrics_get_descent(metrics) + - (f->shadow ? f->offset : 0); - - pango_font_metrics_unref(metrics); - g_object_unref(context); - return result; - */ +#ifdef USE_PANGO + return (f->pango_ascent + + f->pango_descent + ) / PANGO_SCALE + + (f->shadow ? f->offset : 0); +#else return f->xftfont->ascent + f->xftfont->descent + - (f->shadow ? f->offset : 0); - -#endif /* USE_PANGO */ + (f->shadow ? f->offset : 0); +#endif } gint RrFontMaxCharWidth(const RrFont *f) @@ -245,34 +262,67 @@ gint RrFontMaxCharWidth(const RrFont *f) return (signed) f->xftfont->max_advance_width; } +#ifdef USE_PANGO +static inline int font_calculate_baseline(RrFont *f, gint height) +{ +/* For my own reference: + * _________ + * ^space/2 ^height ^baseline + * v_________|_ | + * | ^ascent | _ _ + * | | | | |_ _____ _| |_ _ _ + * | | | | _/ -_) \ / _| || | + * | v_________v \__\___/_\_\\__|\_, | + * | ^descent |__/ + * __________|_v + * ^space/2 | + * V_________v + */ + int asc = f->pango_ascent; + int ascdesc = asc + f->pango_descent; + int space = height * PANGO_SCALE - ascdesc; + int baseline = space / 2 + asc; + return baseline / PANGO_SCALE; +} +#endif + void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) { gint x,y,w,h; XftColor c; GString *text; - gint mw, mh; + gint mw; +#ifndef USE_PANGO + gint mh; size_t l; gboolean shortened = FALSE; - -#ifdef USE_PANGO +#else PangoLayout *pl; - PangoLayoutLine *pll; - PangoContext *context; - GSList *p; + PangoRectangle rect; - context = pango_xft_get_context (RrDisplay(t->font->inst), RrScreen(t->font->inst)); pl = pango_layout_new (context); #endif /* USE_PANGO */ - /* center vertically */ + /* center vertically + * for xft we pass the top edge of the text for positioning... */ +#ifndef USE_PANGO y = area->y + (area->height - RrFontHeight(t->font)) / 2; +#else + /* but for pango we pass the baseline, since different fonts have + * different top edges. It looks stupid when the baseline of "normal" + * text jumps up and down when a "strange" character is just added + * to the end of the text */ + y = area->y + + font_calculate_baseline(t->font, area->height); +#endif /* 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); +#ifndef USE_PANGO l = g_utf8_strlen(text->str, -1); font_measure_full(t->font, text->str, &mw, &mh); while (l && mw > area->width) { @@ -291,6 +341,21 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) } if (!l) return; + l = strlen(text->str); /* number of bytes */ + +#else + pango_layout_set_text(pl, text->str, -1); + pango_layout_set_font_description(pl, t->font->pango_font_description); + pango_layout_set_single_paragraph_mode(pl, TRUE); + pango_layout_set_width(pl, w * PANGO_SCALE); + pango_layout_set_ellipsize(pl, PANGO_ELLIPSIZE_MIDDLE); + /* This doesn't work with layout_line() of course */ +/* pango_layout_set_alignment(pl, (PangoAlignment)(t->justify)); */ + pango_layout_get_pixel_extents(pl, NULL, &rect); + mw = rect.width; + +#endif /* USE_PANGO */ + switch (t->justify) { case RR_JUSTIFY_LEFT: break; @@ -302,19 +367,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) break; } - l = strlen(text->str); /* number of bytes */ - -#ifdef USE_PANGO - pango_layout_set_text(pl, text->str, l); - pango_layout_set_font_description(pl, t->font->pango_font_description); - pango_layout_set_single_paragraph_mode(pl, TRUE); - pll = pango_layout_get_line(pl, 0); -#endif /* USE_PANGO */ - if (t->font->shadow) { -#ifdef USE_PANGO - int x2 = x; -#endif /* USE_PANGO */ if (t->font->tint >= 0) { c.color.red = 0; c.color.green = 0; @@ -329,29 +382,18 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) c.color.alpha = 0xffff * -t->font->tint / 100; c.pixel = WhitePixel(RrDisplay(t->font->inst), RrScreen(t->font->inst)); + } #ifndef USE_PANGO - } XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->font->offset, t->font->xftfont->ascent + y + t->font->offset, (FcChar8*)text->str, l); - } #else /* USE_PANGO */ - } - - for (p = pll->runs; p != NULL; p = p->next) - { - PangoLayoutRun *run = p->data; - PangoFont *font = run->item->analysis.font; - PangoGlyphString *glyphs = run->glyphs; - PangoRectangle rect; - - pango_glyph_string_extents (glyphs, font, NULL, &rect); - pango_xft_render (d, &c, font, glyphs, x2 + t->font->offset, - t->font->xftfont->ascent + y + t->font->offset); - x2 += rect.width / PANGO_SCALE; - } - } + /* see below... */ + pango_xft_render_layout_line(d, &c, pango_layout_get_line(pl, 0), + (x + t->font->offset) * PANGO_SCALE, + (y + t->font->offset) * PANGO_SCALE); #endif /* USE_PANGO */ + } c.color.red = t->color->r | t->color->r << 8; c.color.green = t->color->g | t->color->g << 8; c.color.blue = t->color->b | t->color->b << 8; @@ -363,22 +405,14 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) t->font->xftfont->ascent + y, (FcChar8*)text->str, l); #else /* USE_PANGO */ - for (p = pll->runs; p != NULL; p = p->next) - { - PangoLayoutRun *run = p->data; - PangoFont *font = run->item->analysis.font; - PangoGlyphString *glyphs = run->glyphs; - PangoRectangle rect; - - pango_glyph_string_extents (glyphs, font, NULL, &rect); - pango_xft_render (d, &c, font, glyphs, x, t->font->xftfont->ascent + y); - x += rect.width / PANGO_SCALE; - } - - // pango_layout_line_unref(pll); - g_object_unref(pl); - g_object_unref(context); -#endif /* USE_PANGO */ + /* layout_line() bases y on the baseline, while layout() bases y on the + * top of the ink layout. We want the baseline to always be in the same + * place, thusly, we use layout_line() + * The actual line doesn't need to be freed (per the pango docs) */ + pango_xft_render_layout_line(d, &c, pango_layout_get_line(pl, 0), + x * PANGO_SCALE, y * PANGO_SCALE); + g_object_unref(pl); +#endif g_string_free(text, TRUE); return;