X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=db5eb3aac5df8097f73df2ffb164219c11120da4;hb=c0c06e3828981cacc96b27a87d7803f603241d15;hp=acf17c3e385bfe1824654a550bfc03201777a732;hpb=81af5a8b0caadc0a82ff2304c315f816c9576e93;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index acf17c3e..db5eb3aa 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -20,6 +20,7 @@ struct _RrTheme {
     gint title_height;
     gint button_size;
     gint grip_width;
+    gint menu_overlap;
 
     /* style settings - colors */
     RrColor *b_color;
@@ -29,67 +30,100 @@ struct _RrTheme {
     RrColor *title_unfocused_color;
     RrColor *titlebut_disabled_focused_color;
     RrColor *titlebut_disabled_unfocused_color;
-    RrColor *titlebut_focused_color;
-    RrColor *titlebut_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;
 
     /* 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 - title layout */
-    gchar *title_layout;
-
     /* 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;
+    RrAppearance *a_hover_unfocused_close;
     RrAppearance *a_focused_unpressed_close;
     RrAppearance *a_focused_pressed_close;
     RrAppearance *a_unfocused_unpressed_close;
     RrAppearance *a_unfocused_pressed_close;
     RrAppearance *a_disabled_focused_desk;
     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;
+    RrAppearance *a_hover_unfocused_iconify;
     RrAppearance *a_focused_unpressed_iconify;
     RrAppearance *a_focused_pressed_iconify;
     RrAppearance *a_unfocused_unpressed_iconify;
@@ -109,12 +143,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);