X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=b4d7cd1dcb92434a7ea02d27c09b01f66609f04d;hb=f33bbca9e6dfa55862de54501c07af635d56c137;hp=803be044d2c6ab90bfd1a95cd06e4849008cbe0d;hpb=d4170da07e0978578bad12300e71d503e87121e5;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index 803be044..b4d7cd1d 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -11,6 +11,9 @@ struct _RrTheme {
 
     const RrInstance *inst;
 
+    /* style settings - optional decor */
+    gboolean show_handle;
+
     /* style settings - geometry */
     gint bevel;
     gint handle_height;
@@ -32,54 +35,66 @@ 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;
+    RrColor *menu_selected_color;
 
     /* style settings - fonts */
     gint winfont_height;
-    RrFont *winfont;
+    RrFont *winfont_focused;
+    RrFont *winfont_unfocused;
     gint mtitlefont_height;
     RrFont *mtitlefont;
     gint mfont_height;
     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 *iconify_hover_mask;
     RrPixmapMask *iconify_disabled_mask;
-    RrPixmapMask *desk_set_mask;
-    RrPixmapMask *desk_unset_mask;
+    RrPixmapMask *iconify_pressed_mask;
+    RrPixmapMask *desk_mask;
+    RrPixmapMask *desk_toggled_mask;
     RrPixmapMask *desk_hover_mask;
     RrPixmapMask *desk_disabled_mask;
-    RrPixmapMask *shade_set_mask;
-    RrPixmapMask *shade_unset_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;
@@ -92,22 +107,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;
@@ -130,13 +145,19 @@ struct _RrTheme {
     RrAppearance *a_menu;
     RrAppearance *a_menu_item;
     RrAppearance *a_menu_disabled;
-    RrAppearance *a_menu_hilite;
+    RrAppearance *a_menu_selected;
+    RrAppearance *a_menu_text_item;
+    RrAppearance *a_menu_text_disabled;
+    RrAppearance *a_menu_text_selected;
+    RrAppearance *a_menu_bullet;
+    RrAppearance *a_clear;     /* clear with no texture */
+    RrAppearance *a_clear_tex; /* clear with a texture */
+
+    RrAppearance *app_selected_bg;
+    RrAppearance *app_unselected_bg;
+    RrAppearance *app_selected_label;
+    RrAppearance *app_unselected_label;
 
-    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);