From 4e590eba236c587caff22d8cfc3a8fc0332cb206 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 26 Apr 2007 13:10:36 +0000 Subject: add a separate font config for onscreendisplays change menutitle in the rc to menuheader fix up the xsd for fonts --- render/theme.c | 11 +++++++++-- render/theme.h | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'render') diff --git a/render/theme.c b/render/theme.c index a80777ba..cb50887b 100644 --- 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; @@ -173,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)) @@ -771,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 = diff --git a/render/theme.h b/render/theme.h index 62ff87dd..b0caa171 100644 --- a/render/theme.h +++ b/render/theme.h @@ -34,6 +34,7 @@ struct _RrTheme { RrFont *win_font_unfocused; RrFont *menu_title_font; RrFont *menu_font; + RrFont *osd_font; /* style settings - geometry */ gint paddingx; @@ -226,7 +227,8 @@ struct _RrTheme { the default font will be used. */ RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme, 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); void RrThemeFree(RrTheme *theme); G_END_DECLS -- cgit v1.2.3