diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-04-26 13:10:36 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-04-26 13:10:36 +0000 |
| commit | 4e590eba236c587caff22d8cfc3a8fc0332cb206 (patch) | |
| tree | ab9c1fd825b694d9557d67b6a8504b71d58f4d21 /openbox | |
| parent | 1c4c2b92a0be1b1358f34898ef47f74e0b21ae6a (diff) | |
add a separate font config for onscreendisplays
change menutitle in the rc to menuheader
fix up the xsd for fonts
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/config.c | 5 | ||||
| -rw-r--r-- | openbox/config.h | 2 | ||||
| -rw-r--r-- | openbox/openbox.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/openbox/config.c b/openbox/config.c index f8b3fd95..4e3f6f9a 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -46,6 +46,7 @@ RrFont *config_font_activewindow; RrFont *config_font_inactivewindow; RrFont *config_font_menuitem; RrFont *config_font_menutitle; +RrFont *config_font_osd; gint config_desktops_num; GSList *config_desktops_names; @@ -467,10 +468,12 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, font = &config_font_activewindow; else if (parse_attr_contains("InactiveWindow", n, "place")) font = &config_font_inactivewindow; - else if (parse_attr_contains("MenuTitle", n, "place")) + else if (parse_attr_contains("MenuHeader", n, "place")) font = &config_font_menutitle; else if (parse_attr_contains("MenuItem", n, "place")) font = &config_font_menuitem; + else if (parse_attr_contains("OnScreenDisplay", n, "place")) + font = &config_font_osd; else goto next_font; diff --git a/openbox/config.h b/openbox/config.h index 283fa992..e6a441b0 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -97,6 +97,8 @@ extern RrFont *config_font_inactivewindow; extern RrFont *config_font_menutitle; /*! The font for menu items */ extern RrFont *config_font_menuitem; +/*! The font for on-screen-displays/popups */ +extern RrFont *config_font_osd; /*! The number of desktops */ extern gint config_desktops_num; diff --git a/openbox/openbox.c b/openbox/openbox.c index fc2e78c0..9de780dd 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -241,7 +241,8 @@ gint main(gint argc, gchar **argv) config_font_activewindow, config_font_inactivewindow, config_font_menutitle, - config_font_menuitem))) + config_font_menuitem, + config_font_osd))) { RrThemeFree(ob_rr_theme); ob_rr_theme = theme; |