X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=5771a1c225b459bf03a2a35bfac3f841c67ada48;hb=c234ed9ecd9d5228744aae018768ff0c04f2d217;hp=71302467ad7c25da44f379f46a8999a146c6345b;hpb=a5100fe6770d5b223cf444eda5629c2b2208cb29;p=chaz%2Fopenbox diff --git a/render/font.c b/render/font.c index 71302467..5771a1c2 100644 --- a/render/font.c +++ b/render/font.c @@ -28,6 +28,9 @@ #include #include #include +#ifdef USE_PANGO +#include +#endif #define ELIPSES "..." #define ELIPSES_LENGTH(font) \ @@ -43,9 +46,9 @@ FcObjectType objs[] = { { OB_SHADOW_ALPHA, FcTypeInteger } }; -PangoFontMap *pfm; -PangoContext *context; - +#ifdef USE_PANGO +static PangoContext *context; +#endif static gboolean started = FALSE; static void font_startup(void) @@ -57,8 +60,8 @@ 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 */ - pfm = pango_xft_get_font_map(RrDisplay(NULL), RrScreen(NULL)); + /* 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 */ @@ -101,36 +104,48 @@ 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, (gchar *)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", (gchar *)tmp_string)) { - pango_font_description_set_weight(out->pango_font_description, PANGO_WEIGHT_BOLD); + pango_font_description_set_weight(out->pango_font_description, + PANGO_WEIGHT_BOLD); } /* Italic ? */ else if (!strcasecmp("italic", (gchar *)tmp_string)) { - pango_font_description_set_style(out->pango_font_description, PANGO_STYLE_ITALIC); + 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); } - PangoFontset *pfs = pango_font_map_load_fontset(pfm, context, out->pango_font_description, NULL); - PangoFontMetrics *metrics = pango_fontset_get_metrics(pfs); + /* 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 */ @@ -187,12 +202,12 @@ 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); } -#ifdef USE_PANGO - pango_font_description_free(f->pango_font_description); -#endif } static void font_measure_full(const RrFont *f, const gchar *str, @@ -234,10 +249,11 @@ gint RrFontHeight(const RrFont *f) #ifdef USE_PANGO return (f->pango_ascent + f->pango_descent - ) / PANGO_SCALE; + ) / PANGO_SCALE + + (f->shadow ? f->offset : 0); #else return f->xftfont->ascent + f->xftfont->descent + - (f->shadow ? f->offset : 0); + (f->shadow ? f->offset : 0); #endif } @@ -246,27 +262,59 @@ 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; #else PangoLayout *pl; - PangoLayoutLine *pll; PangoRectangle rect; pl = pango_layout_new (context); #endif /* USE_PANGO */ - /* center vertically */ -#ifndef USE_PANGO /* We have to wait for the text string with pango */ + /* 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; @@ -305,11 +353,6 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) /* pango_layout_set_alignment(pl, (PangoAlignment)(t->justify)); */ pango_layout_get_pixel_extents(pl, NULL, &rect); mw = rect.width; - y = area->y + - area->height / 2 + - /* go to great lengths to center the text while keeping the baseline in - * the same place */ - t->font->pango_descent / PANGO_SCALE; #endif /* USE_PANGO */ @@ -346,7 +389,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) (FcChar8*)text->str, l); #else /* USE_PANGO */ /* see below... */ - pango_xft_render_layout_line(d, &c, pll = pango_layout_get_line(pl, 0), + 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 */ @@ -362,12 +405,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) t->font->xftfont->ascent + y, (FcChar8*)text->str, l); #else /* USE_PANGO */ - /* This looks retarded, but layout_line() bases y on the baseline, while - * layout() bases y on the top of the ink layout shit ass fucking crap. - * 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 */ - pango_xft_render_layout_line(d, &c, pll = pango_layout_get_line(pl, 0), + /* 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