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 18464c36a072743b0e77fd2884004d795a16f810..803be044d2c6ab90bfd1a95cd06e4849008cbe0d 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -29,7 +29,7 @@ struct _RrTheme {
     RrColor *title_focused_color;
     RrColor *title_unfocused_color;
     RrColor *titlebut_disabled_focused_color;
-    RrColor *titlebut_disabled_unfocused_color; 
+    RrColor *titlebut_disabled_unfocused_color;
     RrColor *titlebut_hover_focused_color;
     RrColor *titlebut_hover_unfocused_color;
     RrColor *titlebut_focused_pressed_color;
@@ -49,18 +49,25 @@ struct _RrTheme {
     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_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;