From: Mikael Magnusson <mikachu@comhem.se>
Date: Tue, 29 Apr 2008 14:56:31 +0000 (+0200)
Subject: Allow to use a pango font description string.
X-Git-Tag: mikabox-3.4.7.2~40
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=76bbb6bc55529970af91ccd4d4d2ec7544694cfa;p=mikachu%2Fopenbox.git

Allow to use a pango font description string.
---

diff --git a/openbox/config.c b/openbox/config.c
index fc628ce0..adac23a6 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -664,6 +664,13 @@ static void parse_theme(xmlNodePtr node, gpointer d)
 
         *font = RrFontOpen(ob_rr_inst, name, size, weight, slant);
         g_free(name);
+
+        if ((fnode = obt_parse_find_node(n->children, "description"))) {
+            gchar *s = obt_parse_node_string(fnode);
+            RrFontDescriptionFromString(*font, s);
+            g_free(s);
+        }
+
     next_font:
         n = obt_parse_find_node(n->next, "font");
     }
diff --git a/render/font.c b/render/font.c
index 10df5e09..ff8852b9 100644
--- a/render/font.c
+++ b/render/font.c
@@ -60,6 +60,15 @@ static void measure_font(const RrInstance *inst, RrFont *f)
 
 }
 
+void RrFontDescriptionFromString(RrFont *font, gchar *description)
+{
+    PangoFontDescription *desc;
+    desc = pango_font_description_from_string(description);
+    pango_font_description_merge(font->font_desc, desc, TRUE);
+    pango_font_description_free(desc);
+    pango_layout_set_font_description(font->layout, font->font_desc);
+}
+
 RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size,
                    RrFontWeight weight, RrFontSlant slant)
 {