diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/font.c | 34 | ||||
| -rw-r--r-- | render/icon.h | 4 | ||||
| -rw-r--r-- | render/render.h | 2 |
3 files changed, 22 insertions, 18 deletions
diff --git a/render/font.c b/render/font.c index 0521e2af..14b9ea14 100644 --- a/render/font.c +++ b/render/font.c @@ -116,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); } @@ -135,19 +135,23 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring) } /* 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); + { + 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) diff --git a/render/icon.h b/render/icon.h index 7d0626e2..eafa6961 100644 --- a/render/icon.h +++ b/render/icon.h @@ -25,7 +25,7 @@ "To recreate this file, save an image as \"C-Source\" in The Gimp. Use \"ob_default_icon\" as the Prefixed Name. Enable Glib Types. Enable Save Alpha Channel. Enable Use Macros instead of Struct." #define OB_DEFAULT_ICON_PIXEL_DATA ((guint8*) OB_DEFAULT_ICON_pixel_data) static const guint8 OB_DEFAULT_ICON_pixel_data[48 * 48 * 4 + 1] = -("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" @@ -435,5 +435,5 @@ static const guint8 OB_DEFAULT_ICON_pixel_data[48 * 48 * 4 + 1] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0"); + "\0\0\0\0"; diff --git a/render/render.h b/render/render.h index fda40607..ac1394cf 100644 --- a/render/render.h +++ b/render/render.h @@ -68,7 +68,7 @@ typedef enum { RR_SURFACE_DIAGONAL, RR_SURFACE_CROSS_DIAGONAL, RR_SURFACE_PYRAMID, - RR_SURFACE_MIRROR_HORIZONTAL, + RR_SURFACE_MIRROR_HORIZONTAL } RrSurfaceColorType; typedef enum { |