this includes a number of things since my magnificent return....

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index 8172dbfae83bb0d0a0dfa9c010ba64152798ee1a..14b9ea14ae8636d3fcde20b286b13e4d5492d5ac 100644 (file)
--- 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
+#ifdef USE_PANGO
 #include <locale.h>
 #endif
 
@@ -115,12 +116,12 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
     if (FcPatternGetString(match, "style", 0, &tmp_string) !=
             FcResultTypeMismatch) {
         /* Bold ? */
-        if (!strcasecmp("bold", (gchar *)tmp_string)) {
+        if (!g_ascii_strcasecmp("bold", (gchar *)tmp_string)) {
             pango_font_description_set_weight(out->pango_font_description,
                                               PANGO_WEIGHT_BOLD);
         }
         /* Italic ? */
-        else if (!strcasecmp("italic", (gchar *)tmp_string)) {
+        else if (!g_ascii_strcasecmp("italic", (gchar *)tmp_string)) {
             pango_font_description_set_style(out->pango_font_description,
                                              PANGO_STYLE_ITALIC);
         }
@@ -134,20 +135,23 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
     }
 
     /* based on gtkmain.c gtk_get_default_language() */
-    PangoLanguage *ln;
-    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,
-                                  ln = 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);
+    {
+        gchar *locale, *p;
+        PangoFontMetrics *metrics;
+
+        locale = g_strdup(setlocale(LC_CTYPE, NULL));
+        if ((p = strchr(locale, '.')))
+            *p = '\0';
+        if ((p = strchr(locale, '@')))
+            *p = '\0';
+        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)
@@ -292,8 +296,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