]> Dogcows Code - chaz/openbox/blobdiff - render/font.c
update copyright step 2
[chaz/openbox] / render / font.c
index 0f2ce8fb9b2312cee8427621905162c5fedc3881..0521e2af6c8575a7600e3ff5a0952573945e9631 100644 (file)
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    font.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
    Copyright (c) 2003        Derek Foreman
 
@@ -28,6 +29,9 @@
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef USE_PANGO
+#include <locale.h>
+#endif
 
 #define ELIPSES "..."
 #define ELIPSES_LENGTH(font) \
@@ -43,9 +47,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 +61,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,34 +105,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, (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);
-    out->pango_font_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 */
 
     if (FcPatternGetBool(match, OB_SHADOW, 0, &out->shadow) != FcResultMatch)
@@ -184,13 +203,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_metrics_unref(f->pango_font_metrics);
-    pango_font_description_free(f->pango_font_description);
-#endif
 }
 
 static void font_measure_full(const RrFont *f, const gchar *str,
@@ -230,13 +248,13 @@ RrSize *RrFontMeasureString(const RrFont *f, const gchar *str)
 gint RrFontHeight(const RrFont *f)
 {
 #ifdef USE_PANGO
-    int ascent, descent;
-    ascent = pango_font_metrics_get_ascent(f->pango_font_metrics);
-    descent = pango_font_metrics_get_descent(f->pango_font_metrics);
-    return (ascent + descent) / PANGO_SCALE;
+    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);
+           (f->shadow ? f->offset : 0);
 #endif
 }
 
@@ -245,13 +263,38 @@ 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
@@ -261,10 +304,18 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     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;
@@ -291,17 +342,6 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     }
     if (!l) return;
 
-    switch (t->justify) {
-    case RR_JUSTIFY_LEFT:
-        break;
-    case RR_JUSTIFY_RIGHT:
-        x += (w - mw);
-        break;
-    case RR_JUSTIFY_CENTER:
-        x += (w - mw) / 2;
-        break;
-    }
-
     l = strlen(text->str); /* number of bytes */
 
 #else
@@ -310,13 +350,24 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     pango_layout_set_single_paragraph_mode(pl, TRUE);
     pango_layout_set_width(pl, w * PANGO_SCALE);
     pango_layout_set_ellipsize(pl, PANGO_ELLIPSIZE_MIDDLE);
-    pango_layout_set_alignment(pl, (PangoAlignment)(t->justify));
+    /* 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);
-    y = area->y +
-        (area->height - rect.height) / 2;
+    mw = rect.width;
 
 #endif /* USE_PANGO */
 
+    switch (t->justify) {
+    case RR_JUSTIFY_LEFT:
+        break;
+    case RR_JUSTIFY_RIGHT:
+        x += (w - mw);
+        break;
+    case RR_JUSTIFY_CENTER:
+        x += (w - mw) / 2;
+        break;
+    }
+
     if (t->font->shadow) {
         if (t->font->tint >= 0) {
             c.color.red = 0;
@@ -338,8 +389,10 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
                           t->font->xftfont->ascent + y + t->font->offset,
                           (FcChar8*)text->str, l);
 #else /* USE_PANGO */
-        pango_xft_render_layout(d, &c, pl, (x + t->font->offset) * PANGO_SCALE,
-                                (y + t->font->offset) * 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;
@@ -353,7 +406,12 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
                       t->font->xftfont->ascent + y,
                       (FcChar8*)text->str, l);
 #else /* USE_PANGO */
-    pango_xft_render_layout(d, &c, pl, x * PANGO_SCALE, y * PANGO_SCALE);
+    /* 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
 
This page took 0.0266 seconds and 4 git commands to generate.