X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=a32bf7ce0a5ae995f3c3bcf567d22917d2c41289;hb=c62cf92cb8baaaaef0f8f2ab7de2eb6168736f4a;hp=a0e622d55364deac81a5f66f50690127173bc649;hpb=138d3e38d88dbcb1426bd1eb0cd8c43dd01777ad;p=chaz%2Fopenbox diff --git a/render/font.c b/render/font.c index a0e622d5..a32bf7ce 100644 --- a/render/font.c +++ b/render/font.c @@ -34,22 +34,30 @@ static void measure_font(const RrInstance *inst, RrFont *f) { PangoFontMetrics *metrics; - gchar *locale, *p; - - /* get the default language from the locale - (based on gtk_get_default_language in gtkmain.c) */ - locale = g_strdup(setlocale(LC_CTYPE, NULL)); - if ((p = strchr(locale, '.'))) *p = '\0'; /* strip off the . */ - if ((p = strchr(locale, '@'))) *p = '\0'; /* strip off the @ */ + static PangoLanguage *lang = NULL; + + if (lang == NULL) { +#if PANGO_VERSION_MAJOR > 1 || \ + (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) + lang = pango_language_get_default(); +#else + gchar *locale, *p; + /* get the default language from the locale + (based on gtk_get_default_language in gtkmain.c) */ + locale = g_strdup(setlocale(LC_CTYPE, NULL)); + if ((p = strchr(locale, '.'))) *p = '\0'; /* strip off the . */ + if ((p = strchr(locale, '@'))) *p = '\0'; /* strip off the @ */ + lang = pango_language_from_string(locale); + g_free(locale); +#endif + } /* measure the ascent and descent */ - metrics = pango_context_get_metrics(inst->pango, f->font_desc, - pango_language_from_string(locale)); + metrics = pango_context_get_metrics(inst->pango, f->font_desc, lang); f->ascent = pango_font_metrics_get_ascent(metrics); f->descent = pango_font_metrics_get_descent(metrics); pango_font_metrics_unref(metrics); - g_free(locale); } RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size, @@ -58,12 +66,23 @@ RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size, RrFont *out; PangoWeight pweight; PangoStyle pstyle; + PangoAttrList *attrlist; out = g_new(RrFont, 1); out->inst = inst; out->ref = 1; out->font_desc = pango_font_description_new(); out->layout = pango_layout_new(inst->pango); + out->shortcut_underline = pango_attr_underline_new(PANGO_UNDERLINE_LOW); + out->shortcut_underline->start_index = 0; + out->shortcut_underline->end_index = 0; + + attrlist = pango_attr_list_new(); + /* shortcut_underline is owned by the attrlist */ + pango_attr_list_insert(attrlist, out->shortcut_underline); + /* the attributes are owned by the layout */ + pango_layout_set_attributes(out->layout, attrlist); + pango_attr_list_unref(attrlist); switch (weight) { case RR_FONTWEIGHT_LIGHT: pweight = PANGO_WEIGHT_LIGHT; break; @@ -90,7 +109,6 @@ RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size, /* setup the layout */ pango_layout_set_font_description(out->layout, out->font_desc); pango_layout_set_single_paragraph_mode(out->layout, TRUE); - pango_layout_set_ellipsize(out->layout, PANGO_ELLIPSIZE_MIDDLE); /* get the ascent and descent */ measure_font(inst, out); @@ -127,8 +145,20 @@ static void font_measure_full(const RrFont *f, const gchar *str, pango_layout_set_text(f->layout, str, -1); pango_layout_set_width(f->layout, -1); - pango_layout_get_pixel_extents(f->layout, NULL, &rect); - *x = rect.width + ABS(shadow_x); + + /* pango_layout_get_pixel_extents lies! this is the right way to get the + size of the text's area */ + pango_layout_get_extents(f->layout, NULL, &rect); +#if PANGO_VERSION_MAJOR > 1 || \ + (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) + /* pass the logical rect as the ink rect, this is on purpose so we get the + full area for the text */ + pango_extents_to_pixels(&rect, NULL); +#else + rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE; + rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; +#endif + *x = rect.width + ABS(shadow_x) + 4 /* we put a 2 px edge on each side */; *y = rect.height + ABS(shadow_y); } @@ -175,8 +205,8 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) XftColor c; gint mw; PangoRectangle rect; - gchar *text; - PangoAttrList* attrs = NULL; + PangoAttrList *attrlist; + PangoEllipsizeMode ell; /* center the text vertically We do this centering based on the 'baseline' since different fonts have @@ -190,34 +220,24 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) w = area->width - 4; h = area->height; - /* * * set up the layout * * */ - - text = g_strdup(t->string); - - if (t->shortcut) { - gchar *i; - gchar *lowertext; - - lowertext = g_utf8_strdown(text, -1); - i = g_utf8_strchr(lowertext, -1, t->shortcut); - if (i != NULL) { - PangoAttribute *a; - - a = pango_attr_underline_new(PANGO_UNDERLINE_LOW); - a->start_index = i - lowertext; - a->end_index = i - lowertext + - g_unichar_to_utf8(t->shortcut, NULL); - - attrs = pango_attr_list_new(); - pango_attr_list_insert(attrs, a); - } - g_free(lowertext); + switch (t->ellipsize) { + case RR_ELLIPSIZE_NONE: + ell = PANGO_ELLIPSIZE_NONE; + break; + case RR_ELLIPSIZE_START: + ell = PANGO_ELLIPSIZE_START; + break; + case RR_ELLIPSIZE_MIDDLE: + ell = PANGO_ELLIPSIZE_MIDDLE; + break; + case RR_ELLIPSIZE_END: + ell = PANGO_ELLIPSIZE_END; + break; } - pango_layout_set_text(t->font->layout, text, -1); + pango_layout_set_text(t->font->layout, t->string, -1); pango_layout_set_width(t->font->layout, w * PANGO_SCALE); - - g_free(text); + pango_layout_set_ellipsize(t->font->layout, ell); /* * * end of setting up the layout * * */ @@ -244,8 +264,6 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) c.color.alpha = 0xffff * t->shadow_alpha / 255; c.pixel = t->shadow_color->pixel; - pango_layout_set_attributes(t->font->layout, NULL); - /* see below... */ pango_xft_render_layout_line (d, &c, pango_layout_get_line(t->font->layout, 0), @@ -259,12 +277,37 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */ c.pixel = t->color->pixel; - pango_layout_set_attributes(t->font->layout, attrs); - if (attrs != NULL) pango_attr_list_unref(attrs); + if (t->shortcut) { + const gchar *c = t->string + t->shortcut_pos; + + t->font->shortcut_underline->start_index = t->shortcut_pos; + t->font->shortcut_underline->end_index = t->shortcut_pos + + (g_utf8_next_char(c) - c); + + /* the attributes are owned by the layout. + re-add the attributes to the layout after changing the + start and end index */ + attrlist = pango_layout_get_attributes(t->font->layout); + pango_attr_list_ref(attrlist); + pango_layout_set_attributes(t->font->layout, attrlist); + pango_attr_list_unref(attrlist); + } /* layout_line() uses y to specify the baseline The line doesn't need to be freed, it's a part of the layout */ pango_xft_render_layout_line (d, &c, pango_layout_get_line(t->font->layout, 0), x * PANGO_SCALE, y * PANGO_SCALE); + + if (t->shortcut) { + t->font->shortcut_underline->start_index = 0; + t->font->shortcut_underline->end_index = 0; + /* the attributes are owned by the layout. + re-add the attributes to the layout after changing the + start and end index */ + attrlist = pango_layout_get_attributes(t->font->layout); + pango_attr_list_ref(attrlist); + pango_layout_set_attributes(t->font->layout, attrlist); + pango_attr_list_unref(attrlist); + } }