renamed the _t bitmaps, and added disabled and hover bitmaps

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 5c39b3dfc276d9ea72d8c0299a21daddb8842289..803be044d2c6ab90bfd1a95cd06e4849008cbe0d 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -6,6 +6,7 @@
 typedef struct _RrTheme RrTheme;
 
 struct _RrTheme {
+    gchar *path;
     gchar *name;
 
     const RrInstance *inst;
@@ -19,6 +20,7 @@ struct _RrTheme {
     gint title_height;
     gint button_size;
     gint grip_width;
+    gint menu_overlap;
 
     /* style settings - colors */
     RrColor *b_color;
@@ -26,8 +28,14 @@ struct _RrTheme {
     RrColor *cb_unfocused_color;
     RrColor *title_focused_color;
     RrColor *title_unfocused_color;
-    RrColor *titlebut_focused_color;
-    RrColor *titlebut_unfocused_color;
+    RrColor *titlebut_disabled_focused_color;
+    RrColor *titlebut_disabled_unfocused_color;
+    RrColor *titlebut_hover_focused_color;
+    RrColor *titlebut_hover_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_disabled_color;
@@ -36,56 +44,74 @@ struct _RrTheme {
     /* style settings - fonts */
     gint winfont_height;
     RrFont *winfont;
-    gboolean winfont_shadow;
-    gint winfont_shadow_offset;
-    gint winfont_shadow_tint;
     gint mtitlefont_height;
     RrFont *mtitlefont;
-    gboolean mtitlefont_shadow;
-    gint mtitlefont_shadow_offset;
-    gint mtitlefont_shadow_tint;
     gint mfont_height;
     RrFont *mfont;
-    gboolean mfont_shadow;
-    gint mfont_shadow_offset;
-    gint mfont_shadow_tint;
-
-    /* style settings - title layout */
-    gchar *title_layout;
 
     /* style settings - masks */
     RrPixmapMask *max_set_mask;
     RrPixmapMask *max_unset_mask;
+    RrPixmapMask *max_hover_mask;
+    RrPixmapMask *max_disabled_mask;
     RrPixmapMask *iconify_mask;
+    RrPixmapMask *iconify_hover_mask;
+    RrPixmapMask *iconify_disabled_mask;
     RrPixmapMask *desk_set_mask;
     RrPixmapMask *desk_unset_mask;
+    RrPixmapMask *desk_hover_mask;
+    RrPixmapMask *desk_disabled_mask;
     RrPixmapMask *shade_set_mask;
     RrPixmapMask *shade_unset_mask;
+    RrPixmapMask *shade_hover_mask;
+    RrPixmapMask *shade_disabled_mask;
     RrPixmapMask *close_mask;
+    RrPixmapMask *close_hover_mask;
+    RrPixmapMask *close_disabled_mask;
 
     /* global appearances */
+    RrAppearance *a_disabled_focused_max;
+    RrAppearance *a_disabled_unfocused_max;
+    RrAppearance *a_hover_focused_max;
+    RrAppearance *a_hover_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_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_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;