/* -*- 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
#include <glib.h>
#include <string.h>
#include <stdlib.h>
-#if USE_PANGO && !ENABLE_NLS
+#ifdef USE_PANGO
#include <locale.h>
#endif
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, '.')))
*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);
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,
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