X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=0521e2af6c8575a7600e3ff5a0952573945e9631;hb=2b99b62abf3441bc69c7c189da05a709edbb49f3;hp=5324fd30c9272cc0d3ddf1a327dbb9714078a6ba;hpb=3d1048f5a73ed69e5a191e01b9c0588cfe4b8bec;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 5324fd30..0521e2af 100644
--- a/render/font.c
+++ b/render/font.c
@@ -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,7 +47,9 @@ FcObjectType objs[] = {
     { OB_SHADOW_ALPHA,  FcTypeInteger  }
 };
 
+#ifdef USE_PANGO
 static PangoContext *context;
+#endif
 static gboolean started = FALSE;
 
 static void font_startup(void)
@@ -124,13 +130,11 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
 
     if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) !=
             FcResultTypeMismatch) {
-        /* TODO: is PANGO_SCALE correct ?? */
-        pango_font_description_set_size(out->pango_font_description,
+        pango_font_description_set_absolute_size(out->pango_font_description,
                                         tmp_int*PANGO_SCALE);
     }
 
     /* based on gtkmain.c gtk_get_default_language() */
-    PangoLanguage *ln;
     gchar *locale, *p;
     locale = g_strdup(setlocale(LC_CTYPE, NULL));
     if ((p = strchr(locale, '.')))
@@ -139,7 +143,7 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
         *p = '\0';
     PangoFontMetrics *metrics = 
         pango_context_get_metrics(context, out->pango_font_description,
-                                  ln = pango_language_from_string(locale));
+                                  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);
@@ -199,12 +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_description_free(f->pango_font_description);
-#endif
 }
 
 static void font_measure_full(const RrFont *f, const gchar *str,
@@ -288,8 +292,9 @@ 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
@@ -401,11 +406,10 @@ 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 */
+    /* 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);