add toggled-pressed and toggled-hover button states to themes. also rename toggled...

[dana/openbox.git] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index acceaf5..c3b375c 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -65,8 +65,12 @@ struct _RrTheme {
     RrColor *titlebut_disabled_unfocused_color;
     RrColor *titlebut_hover_focused_color;
     RrColor *titlebut_hover_unfocused_color;
     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_toggled_hover_focused_color;
+    RrColor *titlebut_toggled_hover_unfocused_color;
+    RrColor *titlebut_toggled_focused_pressed_color;
+    RrColor *titlebut_toggled_unfocused_pressed_color;
+    RrColor *titlebut_toggled_focused_unpressed_color;
+    RrColor *titlebut_toggled_unfocused_unpressed_color;

     RrColor *titlebut_focused_pressed_color;
     RrColor *titlebut_unfocused_pressed_color;
     RrColor *titlebut_focused_unpressed_color;
     RrColor *titlebut_focused_pressed_color;
     RrColor *titlebut_unfocused_pressed_color;
     RrColor *titlebut_focused_unpressed_color;


@@ -96,24 +100,30 @@ struct _RrTheme {
 
     /* style settings - masks */
     RrPixmapMask *max_mask;
 
     /* style settings - masks */
     RrPixmapMask *max_mask;

-    RrPixmapMask *max_toggled_mask;

     RrPixmapMask *max_hover_mask;
     RrPixmapMask *max_hover_mask;

-    RrPixmapMask *max_disabled_mask;

     RrPixmapMask *max_pressed_mask;
     RrPixmapMask *max_pressed_mask;

+    RrPixmapMask *max_toggled_mask;
+    RrPixmapMask *max_toggled_hover_mask;
+    RrPixmapMask *max_toggled_pressed_mask;
+    RrPixmapMask *max_disabled_mask;

     RrPixmapMask *iconify_mask;
     RrPixmapMask *iconify_hover_mask;
     RrPixmapMask *iconify_mask;
     RrPixmapMask *iconify_hover_mask;

-    RrPixmapMask *iconify_disabled_mask;

     RrPixmapMask *iconify_pressed_mask;
     RrPixmapMask *iconify_pressed_mask;

+    RrPixmapMask *iconify_disabled_mask;

     RrPixmapMask *desk_mask;
     RrPixmapMask *desk_mask;

-    RrPixmapMask *desk_toggled_mask;

     RrPixmapMask *desk_hover_mask;
     RrPixmapMask *desk_hover_mask;

-    RrPixmapMask *desk_disabled_mask;

     RrPixmapMask *desk_pressed_mask;
     RrPixmapMask *desk_pressed_mask;

+    RrPixmapMask *desk_toggled_mask;
+    RrPixmapMask *desk_toggled_hover_mask;
+    RrPixmapMask *desk_toggled_pressed_mask;
+    RrPixmapMask *desk_disabled_mask;

     RrPixmapMask *shade_mask;
     RrPixmapMask *shade_mask;

-    RrPixmapMask *shade_toggled_mask;

     RrPixmapMask *shade_hover_mask;
     RrPixmapMask *shade_hover_mask;

-    RrPixmapMask *shade_disabled_mask;

     RrPixmapMask *shade_pressed_mask;
     RrPixmapMask *shade_pressed_mask;

+    RrPixmapMask *shade_toggled_mask;
+    RrPixmapMask *shade_toggled_hover_mask;
+    RrPixmapMask *shade_toggled_pressed_mask;
+    RrPixmapMask *shade_disabled_mask;

     RrPixmapMask *close_mask;
     RrPixmapMask *close_hover_mask;
     RrPixmapMask *close_disabled_mask;
     RrPixmapMask *close_mask;
     RrPixmapMask *close_hover_mask;
     RrPixmapMask *close_disabled_mask;


@@ -127,12 +137,16 @@ struct _RrTheme {
     RrAppearance *a_disabled_unfocused_max;
     RrAppearance *a_hover_focused_max;
     RrAppearance *a_hover_unfocused_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_unfocused_unpressed_max;
     RrAppearance *a_unfocused_pressed_max;
     RrAppearance *a_focused_unpressed_max;
     RrAppearance *a_focused_pressed_max;
     RrAppearance *a_unfocused_unpressed_max;
     RrAppearance *a_unfocused_pressed_max;

+    RrAppearance *a_toggled_hover_focused_max;
+    RrAppearance *a_toggled_hover_unfocused_max;
+    RrAppearance *a_toggled_focused_unpressed_max;
+    RrAppearance *a_toggled_focused_pressed_max;
+    RrAppearance *a_toggled_unfocused_unpressed_max;
+    RrAppearance *a_toggled_unfocused_pressed_max;

     RrAppearance *a_disabled_focused_close;
     RrAppearance *a_disabled_unfocused_close;
     RrAppearance *a_hover_focused_close;
     RrAppearance *a_disabled_focused_close;
     RrAppearance *a_disabled_unfocused_close;
     RrAppearance *a_hover_focused_close;


@@ -145,22 +159,30 @@ struct _RrTheme {
     RrAppearance *a_disabled_unfocused_desk;
     RrAppearance *a_hover_focused_desk;
     RrAppearance *a_hover_unfocused_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_unfocused_unpressed_desk;
     RrAppearance *a_unfocused_pressed_desk;
     RrAppearance *a_focused_unpressed_desk;
     RrAppearance *a_focused_pressed_desk;
     RrAppearance *a_unfocused_unpressed_desk;
     RrAppearance *a_unfocused_pressed_desk;

+    RrAppearance *a_toggled_hover_focused_desk;
+    RrAppearance *a_toggled_hover_unfocused_desk;
+    RrAppearance *a_toggled_focused_unpressed_desk;
+    RrAppearance *a_toggled_focused_pressed_desk;
+    RrAppearance *a_toggled_unfocused_unpressed_desk;
+    RrAppearance *a_toggled_unfocused_pressed_desk;

     RrAppearance *a_disabled_focused_shade;
     RrAppearance *a_disabled_unfocused_shade;
     RrAppearance *a_hover_focused_shade;
     RrAppearance *a_hover_unfocused_shade;
     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_unfocused_unpressed_shade;
     RrAppearance *a_unfocused_pressed_shade;
     RrAppearance *a_focused_unpressed_shade;
     RrAppearance *a_focused_pressed_shade;
     RrAppearance *a_unfocused_unpressed_shade;
     RrAppearance *a_unfocused_pressed_shade;

+    RrAppearance *a_toggled_hover_focused_shade;
+    RrAppearance *a_toggled_hover_unfocused_shade;
+    RrAppearance *a_toggled_focused_unpressed_shade;
+    RrAppearance *a_toggled_focused_pressed_shade;
+    RrAppearance *a_toggled_unfocused_unpressed_shade;
+    RrAppearance *a_toggled_unfocused_pressed_shade;

     RrAppearance *a_disabled_focused_iconify;
     RrAppearance *a_disabled_unfocused_iconify;
     RrAppearance *a_hover_focused_iconify;
     RrAppearance *a_disabled_focused_iconify;
     RrAppearance *a_disabled_unfocused_iconify;
     RrAppearance *a_hover_focused_iconify;