X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=e425ae2ae40140b996d82f987719057e5cff1041;hb=35ed95fe18e9b8d7a79f79f4fd7466a2b46435e3;hp=5abe35ea7f7cfc6bde9b521db043ab3176622dad;hpb=54ad34a039d5d83d61c481aaef18d1ea7876d36e;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index 5abe35ea..e425ae2a 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -32,12 +32,15 @@ struct _RrTheme {
     RrColor *titlebut_disabled_unfocused_color;
     RrColor *titlebut_hover_focused_color;
     RrColor *titlebut_hover_unfocused_color;
+    RrColor *titlebut_toggled_focused_color;
+    RrColor *titlebut_toggled_unfocused_color;
     RrColor *titlebut_focused_pressed_color;
     RrColor *titlebut_unfocused_pressed_color;
     RrColor *titlebut_focused_unpressed_color;
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_color;
     RrColor *menu_color;
+    RrColor *menu_bullet_color;
     RrColor *menu_disabled_color;
     RrColor *menu_hilite_color;
 
@@ -50,26 +53,44 @@ struct _RrTheme {
     RrFont *mfont;
 
     /* style settings - masks */
-    RrPixmapMask *max_set_mask;
-    RrPixmapMask *max_unset_mask;
+    RrPixmapMask *max_mask;
+    RrPixmapMask *max_toggled_mask;
+    RrPixmapMask *max_hover_mask;
+    RrPixmapMask *max_disabled_mask;
+    RrPixmapMask *max_pressed_mask;
     RrPixmapMask *iconify_mask;
-    RrPixmapMask *desk_set_mask;
-    RrPixmapMask *desk_unset_mask;
-    RrPixmapMask *shade_set_mask;
-    RrPixmapMask *shade_unset_mask;
+    RrPixmapMask *iconify_hover_mask;
+    RrPixmapMask *iconify_disabled_mask;
+    RrPixmapMask *iconify_pressed_mask;
+    RrPixmapMask *desk_mask;
+    RrPixmapMask *desk_toggled_mask;
+    RrPixmapMask *desk_hover_mask;
+    RrPixmapMask *desk_disabled_mask;
+    RrPixmapMask *desk_pressed_mask;
+    RrPixmapMask *shade_mask;
+    RrPixmapMask *shade_toggled_mask;
+    RrPixmapMask *shade_hover_mask;
+    RrPixmapMask *shade_disabled_mask;
+    RrPixmapMask *shade_pressed_mask;
     RrPixmapMask *close_mask;
+    RrPixmapMask *close_hover_mask;
+    RrPixmapMask *close_disabled_mask;
+    RrPixmapMask *close_pressed_mask;
+
+    RrPixmapMask *menu_bullet_mask; /* submenu pointer */
+    RrPixmapMask *menu_toggle_mask; /* menu boolean */
 
     /* global appearances */
     RrAppearance *a_disabled_focused_max;
     RrAppearance *a_disabled_unfocused_max;
     RrAppearance *a_hover_focused_max;
     RrAppearance *a_hover_unfocused_max;
+    RrAppearance *a_toggled_focused_max;
+    RrAppearance *a_toggled_unfocused_max;
     RrAppearance *a_focused_unpressed_max;
     RrAppearance *a_focused_pressed_max;
-    RrAppearance *a_focused_pressed_set_max;
     RrAppearance *a_unfocused_unpressed_max;
     RrAppearance *a_unfocused_pressed_max;
-    RrAppearance *a_unfocused_pressed_set_max;
     RrAppearance *a_disabled_focused_close;
     RrAppearance *a_disabled_unfocused_close;
     RrAppearance *a_hover_focused_close;
@@ -82,22 +103,22 @@ struct _RrTheme {
     RrAppearance *a_disabled_unfocused_desk;
     RrAppearance *a_hover_focused_desk;
     RrAppearance *a_hover_unfocused_desk;
+    RrAppearance *a_toggled_focused_desk;
+    RrAppearance *a_toggled_unfocused_desk;
     RrAppearance *a_focused_unpressed_desk;
     RrAppearance *a_focused_pressed_desk;
-    RrAppearance *a_focused_pressed_set_desk;
     RrAppearance *a_unfocused_unpressed_desk;
     RrAppearance *a_unfocused_pressed_desk;
-    RrAppearance *a_unfocused_pressed_set_desk;
     RrAppearance *a_disabled_focused_shade;
     RrAppearance *a_disabled_unfocused_shade;
     RrAppearance *a_hover_focused_shade;
     RrAppearance *a_hover_unfocused_shade;
+    RrAppearance *a_toggled_focused_shade;
+    RrAppearance *a_toggled_unfocused_shade;
     RrAppearance *a_focused_unpressed_shade;
     RrAppearance *a_focused_pressed_shade;
-    RrAppearance *a_focused_pressed_set_shade;
     RrAppearance *a_unfocused_unpressed_shade;
     RrAppearance *a_unfocused_pressed_shade;
-    RrAppearance *a_unfocused_pressed_set_shade;
     RrAppearance *a_disabled_focused_iconify;
     RrAppearance *a_disabled_unfocused_iconify;
     RrAppearance *a_hover_focused_iconify;
@@ -121,12 +142,15 @@ struct _RrTheme {
     RrAppearance *a_menu_item;
     RrAppearance *a_menu_disabled;
     RrAppearance *a_menu_hilite;
+    RrAppearance *a_menu_bullet;
+    RrAppearance *a_clear;
 
     RrAppearance *app_hilite_bg;
     RrAppearance *app_unhilite_bg;
     RrAppearance *app_hilite_label;
     RrAppearance *app_unhilite_label;
     RrAppearance *app_icon;
+
 };
 
 RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);