changes to the client menu, which entries are there, and reorganizing, and renaming.

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index c3b375c66a7c3744ea6127dc33ecf54cda4db058..3359d04a8f6615978bd611aa1336d046f15e8928 100644 (file)
--- 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;
@@ -77,8 +78,9 @@ struct _RrTheme {
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_color;
     RrColor *menu_color;
-    RrColor *menu_disabled_color;
     RrColor *menu_selected_color;
+    RrColor *menu_disabled_color;
+    RrColor *menu_disabled_selected_color;
     RrColor *title_focused_shadow_color;
     gchar    title_focused_shadow_alpha;
     RrColor *title_unfocused_shadow_color;
@@ -94,6 +96,8 @@ struct _RrTheme {
     gchar    menu_text_selected_shadow_alpha;
     RrColor *menu_text_disabled_shadow_color;
     gchar    menu_text_disabled_shadow_alpha;
+    RrColor *menu_text_disabled_selected_shadow_color;
+    gchar    menu_text_disabled_selected_shadow_alpha;
 
     /* style settings - pics */
     RrPixel32 *def_win_icon; /* 48x48 RGBA */
@@ -201,13 +205,16 @@ struct _RrTheme {
     RrAppearance *a_icon;
     RrAppearance *a_focused_handle;
     RrAppearance *a_unfocused_handle;
+    RrAppearance *a_menu_text_title;
     RrAppearance *a_menu_title;
     RrAppearance *a_menu;
     RrAppearance *a_menu_normal;
-    RrAppearance *a_menu_disabled;
     RrAppearance *a_menu_selected;
+    RrAppearance *a_menu_disabled;
+    RrAppearance *a_menu_disabled_selected;
     RrAppearance *a_menu_text_normal;
     RrAppearance *a_menu_text_disabled;
+    RrAppearance *a_menu_text_disabled_selected;
     RrAppearance *a_menu_text_selected;
     RrAppearance *a_menu_bullet_normal;
     RrAppearance *a_menu_bullet_selected;
@@ -225,7 +232,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