X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=0521e2af6c8575a7600e3ff5a0952573945e9631;hb=918065915439f0a12b7e109069f8acf1203aa470;hp=2a1872e0a4f602a436aba9a22cef89ce0e265b73;hpb=b177ace2c3e0eedcdb62212bdaeb00a04dfb9c45;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 2a1872e0..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,7 +29,7 @@
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
-#if USE_PANGO && !ENABLE_NLS
+#ifdef USE_PANGO
 #include <locale.h>
 #endif
 
@@ -129,12 +130,11 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
 
     if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) !=
             FcResultTypeMismatch) {
-        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, '.')))
@@ -143,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);
@@ -203,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,
@@ -292,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