X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=5771a1c225b459bf03a2a35bfac3f841c67ada48;hb=c234ed9ecd9d5228744aae018768ff0c04f2d217;hp=6bb00c1bb29be787fc432e1b773c8cf671ff344f;hpb=b1a1ad5d0616a6278ec6b8ca56a4088fc1a77638;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 6bb00c1b..5771a1c2 100644
--- a/render/font.c
+++ b/render/font.c
@@ -28,6 +28,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 +46,9 @@ FcObjectType objs[] = {
     { OB_SHADOW_ALPHA,  FcTypeInteger  }
 };
 
+#ifdef USE_PANGO
 static PangoContext *context;
+#endif
 static gboolean started = FALSE;
 
 static void font_startup(void)
@@ -55,7 +60,8 @@ static void font_startup(void)
 
 #ifdef USE_PANGO
     g_type_init();
-    /* these will never be freed, but we will need them until we shut down anyway */
+    /* these will never be freed, but we will need
+     * them until we shut down anyway */
     context = pango_xft_get_context(RrDisplay(NULL), RrScreen(NULL));
 #endif /* USE_PANGO */
     /* Here we are teaching xft about the shadow, shadowoffset & shadowtint */
@@ -98,42 +104,45 @@ static RrFont *openfont(const RrInstance *inst, gchar *fontstring)
     out = g_new(RrFont, 1);
     out->inst = inst;
 #ifdef USE_PANGO
-    /*    printf("\n\n%s\n\n",fontstring);
-          FcPatternPrint(match); */
-
     out->pango_font_description = pango_font_description_new();
 
-    if (FcPatternGetString(match, "family", 0, &tmp_string) != FcResultTypeMismatch) {
-        pango_font_description_set_family(out->pango_font_description, (gchar *)tmp_string);
+    if (FcPatternGetString(match, "family", 0, &tmp_string) !=
+            FcResultTypeMismatch) {
+        pango_font_description_set_family(out->pango_font_description,
+                                          (gchar *)tmp_string);
         tmp_string = NULL;
     }
-    if (FcPatternGetString(match, "style", 0, &tmp_string) != FcResultTypeMismatch) {
+    if (FcPatternGetString(match, "style", 0, &tmp_string) !=
+            FcResultTypeMismatch) {
         /* Bold ? */
         if (!strcasecmp("bold", (gchar *)tmp_string)) {
-            pango_font_description_set_weight(out->pango_font_description, PANGO_WEIGHT_BOLD);
+            pango_font_description_set_weight(out->pango_font_description,
+                                              PANGO_WEIGHT_BOLD);
         }
         /* Italic ? */
         else if (!strcasecmp("italic", (gchar *)tmp_string)) {
-            pango_font_description_set_style(out->pango_font_description, PANGO_STYLE_ITALIC);
+            pango_font_description_set_style(out->pango_font_description,
+                                             PANGO_STYLE_ITALIC);
         }
         tmp_string = NULL;
     }
 
-    if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) != FcResultTypeMismatch) {
-        /* TODO: is PANGO_SCALE correct ?? */
-        pango_font_description_set_size(out->pango_font_description, tmp_int*PANGO_SCALE);
+    if (FcPatternGetInteger(match, "pixelsize", 0, &tmp_int) !=
+            FcResultTypeMismatch) {
+        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';
     if ((p = strchr(locale, '@')))
         *p = '\0';
-    printf("%s\n", locale);
-    PangoFontMetrics *metrics = pango_context_get_metrics(context, out->pango_font_description, ln = pango_language_from_string(locale));
+    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);
@@ -193,12 +202,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,
@@ -282,8 +291,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
@@ -395,11 +405,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);