correctly show pressed state when pressing toggled buttons, bug #2311

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index bb6a1232b8ad764657d838300a2df41732f6aca8..ffd37c02d13a67793f6b67e98a841b26804e1d3b 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -500,17 +500,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     /* read buttons textures */
     if (!read_appearance(db, inst,
                          "window.active.button.disabled.bg",
-                        theme->a_disabled_focused_max,
+                         theme->a_disabled_focused_max,
                          TRUE))
         set_default_appearance(theme->a_disabled_focused_max);
     if (!read_appearance(db, inst,
                          "window.inactive.button.disabled.bg",
-                        theme->a_disabled_unfocused_max,
+                         theme->a_disabled_unfocused_max,
                          TRUE))
         set_default_appearance(theme->a_disabled_unfocused_max);
     if (!read_appearance(db, inst,
                          "window.active.button.pressed.bg",
-                        theme->a_focused_pressed_max,
+                         theme->a_focused_pressed_max,
                          TRUE))
         set_default_appearance(theme->a_focused_pressed_max);
     if (!read_appearance(db, inst,
@@ -591,6 +591,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_hover_unfocused_max); 
     theme->a_toggled_focused_desk =
         RrAppearanceCopy(theme->a_toggled_focused_max);
+    theme->a_toggled_focused_pressed_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
     theme->a_toggled_unfocused_desk =
         RrAppearanceCopy(theme->a_toggled_unfocused_max);
     theme->a_unfocused_unpressed_desk =
@@ -611,6 +613,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_toggled_focused_shade =
         RrAppearanceCopy(theme->a_toggled_focused_max);
+    theme->a_toggled_focused_pressed_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
     theme->a_toggled_unfocused_shade =
         RrAppearanceCopy(theme->a_toggled_unfocused_max);
     theme->a_unfocused_unpressed_shade =
@@ -718,6 +722,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_hover_focused_desk->texture[0].type = 
         theme->a_hover_unfocused_desk->texture[0].type = 
         theme->a_toggled_focused_desk->texture[0].type = 
+        theme->a_toggled_focused_pressed_desk->texture[0].type =
         theme->a_toggled_unfocused_desk->texture[0].type = 
         theme->a_focused_unpressed_desk->texture[0].type = 
         theme->a_focused_pressed_desk->texture[0].type = 
@@ -728,6 +733,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_hover_focused_shade->texture[0].type = 
         theme->a_hover_unfocused_shade->texture[0].type = 
         theme->a_toggled_focused_shade->texture[0].type = 
+        theme->a_toggled_focused_pressed_shade->texture[0].type = 
         theme->a_toggled_unfocused_shade->texture[0].type = 
         theme->a_focused_unpressed_shade->texture[0].type = 
         theme->a_focused_pressed_shade->texture[0].type = 
@@ -784,6 +790,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
         theme->desk_mask;
     theme->a_toggled_focused_desk->texture[0].data.mask.mask = 
+        theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask =
         theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
         theme->desk_toggled_mask;
     theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
@@ -799,6 +806,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
         theme->shade_mask;
     theme->a_toggled_focused_shade->texture[0].data.mask.mask = 
+        theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
         theme->shade_toggled_mask;
     theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
@@ -857,7 +865,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_focused_pressed_max->texture[0].data.mask.color = 
         theme->a_focused_pressed_close->texture[0].data.mask.color = 
         theme->a_focused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color =
         theme->a_focused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = 
         theme->a_focused_pressed_iconify->texture[0].data.mask.color =
         theme->titlebut_focused_pressed_color;
     theme->a_unfocused_unpressed_max->texture[0].data.mask.color = 
@@ -914,7 +924,7 @@ void RrThemeFree(RrTheme *theme)
     if (theme) {
         g_free(theme->path);
         g_free(theme->name);
-
+        
         RrColorFree(theme->b_color);
         RrColorFree(theme->cb_unfocused_color);
         RrColorFree(theme->cb_focused_color);
@@ -990,6 +1000,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_hover_focused_desk);
         RrAppearanceFree(theme->a_hover_unfocused_desk);
         RrAppearanceFree(theme->a_toggled_focused_desk);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_desk);
         RrAppearanceFree(theme->a_toggled_unfocused_desk);
         RrAppearanceFree(theme->a_focused_unpressed_desk);
         RrAppearanceFree(theme->a_focused_pressed_desk);
@@ -1000,6 +1011,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_hover_focused_shade);
         RrAppearanceFree(theme->a_hover_unfocused_shade);
         RrAppearanceFree(theme->a_toggled_focused_shade);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_shade);
         RrAppearanceFree(theme->a_toggled_unfocused_shade);
         RrAppearanceFree(theme->a_focused_unpressed_shade);
         RrAppearanceFree(theme->a_focused_pressed_shade);
@@ -1212,7 +1224,7 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
             *relief = RR_RELIEF_FLAT;
         else
             *relief = RR_RELIEF_RAISED;
-       
+
         *border = FALSE;
         if (*relief == RR_RELIEF_FLAT) {
             if (strstr(tex, "border") != NULL)