add a separate font config for onscreendisplays

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index ade6f6c566f158f81272953ef309faf863c277eb..cb50887bab6448e76e9e33315e53bf612120cacb 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -66,7 +66,8 @@ static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names
 
 RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
                     RrFont *active_window_font, RrFont *inactive_window_font,
-                    RrFont *menu_title_font, RrFont *menu_item_font)
+                    RrFont *menu_title_font, RrFont *menu_item_font,
+                    RrFont *osd_font)
 {
     ParseState ps;
     xmlNodePtr root;
@@ -76,15 +77,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
 
     if (name) {
         if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) {
-            g_warning("Falling back to the default theme: '%s'",
+            g_message("Unable to load the theme '%s'", name);
+            g_message("Falling back to the default theme '%s'",
                       DEFAULT_THEME);
             /* make it fall back to default theme */
             name = NULL;
         }
     }
     if (!name) {
-        if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path))
+        if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) {
+            g_message("Unable to load the theme '%s'", DEFAULT_THEME);
             return NULL;
+        }
     }
     ps.inst = inst;
 
@@ -170,6 +174,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     } else
         theme->menu_font = RrFontOpenDefault(inst);
 
+    if (osd_font) {
+        theme->osd_font = osd_font;
+        RrFontRef(osd_font);
+    } else
+        theme->osd_font = RrFontOpenDefault(inst);
+
     /* load direct dimensions */
     if (!FIND(int, L("menu","overlap"),
               &theme->menu_overlap, -100, 100))
@@ -768,8 +778,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_focused_label->texture[0].data.text.justify = winjust;
     theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
     theme->a_focused_label->texture[0].data.text.font =
-        theme->osd_hilite_label->texture[0].data.text.font =
         theme->win_font_focused;
+    theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font;
     theme->a_focused_label->texture[0].data.text.color =
         theme->title_focused_color;
     theme->osd_hilite_label->texture[0].data.text.color =