better matching of the menu titles/separators to the theme

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index 4c38dbd2f8ad25f665649717e79ac5ff9b5f070a..ade6f6c566f158f81272953ef309faf863c277eb 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -40,27 +40,27 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad,
                         RrReliefType *relief, RrBevelType *bevel,
                         gboolean *interlaced, gboolean *border,
                         gboolean allow_trans);
-static gboolean read_mask(ParseState *ps, gchar *maskname,
+static gboolean read_mask(ParseState *ps, const gchar *maskname,
                           RrPixmapMask **value);
 static RrPixel32* read_c_image(gint width, gint height, const guint8 *data);
 static void set_default_appearance(RrAppearance *a);
-static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]);
-static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[],
+static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]);
+static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
                          gint *integer, gint lower, gint upper);
-static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[],
-                            gchar **string);
-static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
+                            const gchar **string);
+static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            RrColor **color, gchar *alpha);
-    static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
+    static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            gint *x, gint *y,
                            gint lowx, gint lowy, gint upx, gint upy);
-static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[],
                             RrAppearance *a);
-static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[],
                                 RrAppearance *a, gboolean allow_trans);
 
 /* make a null terminated array out of a list of strings */
-#define L(args...) (gchar*[]){args,NULL}
+#define L(args...) (const gchar*[]){args,NULL}
 /* shortcut to the various find_* functions */
 #define FIND(type, args...) find_##type(&ps, root, args)
 
@@ -71,7 +71,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     ParseState ps;
     xmlNodePtr root;
     RrJustify winjust, mtitlejust;
-    gchar *str;
+    const gchar *str;
     RrTheme *theme;
 
     if (name) {
@@ -95,8 +95,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1);
     theme->a_hover_focused_max = RrAppearanceNew(inst, 1);
     theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1);
-    theme->a_toggled_focused_max = RrAppearanceNew(inst, 1);
-    theme->a_toggled_unfocused_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1);
     theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
     theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
     theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
@@ -111,7 +115,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_focused_handle = RrAppearanceNew(inst, 0);
     theme->a_unfocused_handle = RrAppearanceNew(inst, 0);
     theme->a_menu = RrAppearanceNew(inst, 0);
-    theme->a_menu_title = RrAppearanceNew(inst, 1);
+    theme->a_menu_title = RrAppearanceNew(inst, 0);
+    theme->a_menu_text_title = RrAppearanceNew(inst, 1);
     theme->a_menu_normal = RrAppearanceNew(inst, 0);
     theme->a_menu_disabled = RrAppearanceNew(inst, 0);
     theme->a_menu_selected = RrAppearanceNew(inst, 0);
@@ -263,20 +268,54 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
                        theme->titlebut_unfocused_unpressed_color->r,
                        theme->titlebut_unfocused_unpressed_color->g,
                        theme->titlebut_unfocused_unpressed_color->b);
-    if (!FIND(color, L("window","active","buttons","toggled","image"),
-              &theme->titlebut_toggled_focused_color, NULL))
-        theme->titlebut_toggled_focused_color =
+    if (!FIND(color,
+              L("window","active","buttons","toggled-pressed","image"),
+              &theme->titlebut_toggled_focused_pressed_color, NULL))
+        theme->titlebut_toggled_focused_pressed_color =
             RrColorNew(inst,
                        theme->titlebut_focused_pressed_color->r,
                        theme->titlebut_focused_pressed_color->g,
                        theme->titlebut_focused_pressed_color->b);
-    if (!FIND(color, L("window","inactive","buttons","toggled","image"),
-              &theme->titlebut_toggled_unfocused_color, NULL))
-        theme->titlebut_toggled_unfocused_color =
+    if (!FIND(color,
+              L("window","inactive","buttons","toggled-pressed","image"),
+              &theme->titlebut_toggled_unfocused_pressed_color, NULL))
+        theme->titlebut_toggled_unfocused_pressed_color =
             RrColorNew(inst,
                        theme->titlebut_unfocused_pressed_color->r,
                        theme->titlebut_unfocused_pressed_color->g,
                        theme->titlebut_unfocused_pressed_color->b);
+    if (!FIND(color,
+              L("window","active","buttons","toggled-unpressed","image"),
+              &theme->titlebut_toggled_focused_unpressed_color, NULL))
+        theme->titlebut_toggled_focused_unpressed_color =
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
+    if (!FIND(color,
+              L("window","inactive","buttons","toggled-unpressed","image"),
+              &theme->titlebut_toggled_unfocused_unpressed_color, NULL))
+        theme->titlebut_toggled_unfocused_unpressed_color =
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
+    if (!FIND(color,
+              L("window","active","buttons","toggled-hover","image"),
+              &theme->titlebut_toggled_hover_focused_color, NULL))
+        theme->titlebut_toggled_hover_focused_color =
+            RrColorNew(inst,
+                       theme->titlebut_toggled_focused_unpressed_color->r,
+                       theme->titlebut_toggled_focused_unpressed_color->g,
+                       theme->titlebut_toggled_focused_unpressed_color->b);
+    if (!FIND(color,
+              L("window","inactive","buttons","toggled-hover","image"),
+              &theme->titlebut_toggled_hover_unfocused_color, NULL))
+        theme->titlebut_toggled_hover_unfocused_color =
+            RrColorNew(inst,
+                       theme->titlebut_toggled_unfocused_unpressed_color->r,
+                       theme->titlebut_toggled_unfocused_unpressed_color->g,
+                       theme->titlebut_toggled_unfocused_unpressed_color->b);
     if (!FIND(color, L("menu","title","text","primary"),
               &theme->menu_title_color, NULL))
         theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
@@ -351,6 +390,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         if (!read_mask(&ps, "max_toggled.xbm",  &theme->max_toggled_mask))
             theme->max_toggled_mask =
                 RrPixmapMaskCopy(theme->max_pressed_mask);
+        if (!read_mask(&ps, "max_toggled_pressed.xbm",
+                       &theme->max_toggled_pressed_mask))
+            theme->max_toggled_pressed_mask =
+                RrPixmapMaskCopy(theme->max_toggled_mask);
+        if (!read_mask(&ps, "max_toggled_hover.xbm",
+                       &theme->max_toggled_hover_mask))
+            theme->max_toggled_hover_mask =
+                RrPixmapMaskCopy(theme->max_toggled_mask);
         if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask))
             theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
         if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask))
@@ -367,6 +414,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
+        theme->max_toggled_pressed_mask =
+            RrPixmapMaskCopy(theme->max_toggled_mask);
+        theme->max_toggled_hover_mask =
+            RrPixmapMaskCopy(theme->max_toggled_mask);
     }
 
     if (read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) {
@@ -400,6 +451,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask))
             theme->desk_toggled_mask =
                 RrPixmapMaskCopy(theme->desk_pressed_mask);
+        if (!read_mask(&ps, "desk_toggled_pressed.xbm",
+                       &theme->desk_toggled_pressed_mask))
+            theme->desk_toggled_pressed_mask =
+                RrPixmapMaskCopy(theme->desk_toggled_mask);
+        if (!read_mask(&ps, "desk_toggled_hover.xbm",
+                       &theme->desk_toggled_hover_mask))
+            theme->desk_toggled_hover_mask =
+                RrPixmapMaskCopy(theme->desk_toggled_mask);
         if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask))
             theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
         if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask))
@@ -417,6 +476,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
         theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
         theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
+        theme->desk_toggled_pressed_mask =
+            RrPixmapMaskCopy(theme->desk_toggled_mask);
+        theme->desk_toggled_hover_mask =
+            RrPixmapMaskCopy(theme->desk_toggled_mask);
     }
 
     if (read_mask(&ps, "shade.xbm", &theme->shade_mask)) {
@@ -425,6 +488,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask))
             theme->shade_toggled_mask =
                 RrPixmapMaskCopy(theme->shade_pressed_mask);
+        if (!read_mask(&ps, "shade_toggled_pressed.xbm",
+                       &theme->shade_toggled_pressed_mask))
+            theme->shade_toggled_pressed_mask =
+                RrPixmapMaskCopy(theme->shade_toggled_mask);
+        if (!read_mask(&ps, "shade_toggled_hover.xbm",
+                       &theme->shade_toggled_hover_mask))
+            theme->shade_toggled_hover_mask =
+                RrPixmapMaskCopy(theme->shade_toggled_mask);
         if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask))
             theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
         if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask))
@@ -442,6 +513,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
+        theme->shade_toggled_pressed_mask =
+            RrPixmapMaskCopy(theme->shade_toggled_mask);
+        theme->shade_toggled_hover_mask =
+            RrPixmapMaskCopy(theme->shade_toggled_mask);
     }
 
     if (read_mask(&ps, "close.xbm", &theme->close_mask)) {
@@ -493,7 +568,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         set_default_appearance(theme->a_unfocused_grip);
     if (!FIND(appearance, L("menu","entries"), theme->a_menu, FALSE))
         set_default_appearance(theme->a_menu);
-    if (!FIND(appearance, L("menu","title"), theme->a_menu_title, FALSE))
+    if (!FIND(appearance, L("menu","title"), theme->a_menu_title, TRUE))
         set_default_appearance(theme->a_menu_title);
     if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE))
         set_default_appearance(theme->a_menu_selected);
@@ -523,20 +598,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     if (!FIND(appearance, L("window","inactive","buttons","pressed"),
                          theme->a_unfocused_pressed_max, TRUE))
         set_default_appearance(theme->a_unfocused_pressed_max);
-    if (!FIND(appearance, L("window","active","buttons","toggled"),
-                         theme->a_toggled_focused_max, TRUE))
-    {
-        RrAppearanceFree(theme->a_toggled_focused_max);
-        theme->a_toggled_focused_max =
-            RrAppearanceCopy(theme->a_focused_pressed_max);
-    }
-    if (!FIND(appearance, L("window","inactive","buttons","toggled"),
-              theme->a_toggled_unfocused_max, TRUE))
-    {
-        RrAppearanceFree(theme->a_toggled_unfocused_max);
-        theme->a_toggled_unfocused_max =
-            RrAppearanceCopy(theme->a_unfocused_pressed_max);
-    }
     if (!FIND(appearance, L("window","active","buttons","unpressed"),
                          theme->a_focused_unpressed_max, TRUE))
         set_default_appearance(theme->a_focused_unpressed_max);
@@ -557,6 +618,48 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->a_hover_unfocused_max =
             RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     }
+    if (!FIND(appearance, L("window","active","buttons","toggled-pressed"),
+              theme->a_toggled_focused_pressed_max, TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_focused_pressed_max);
+        theme->a_toggled_focused_pressed_max =
+            RrAppearanceCopy(theme->a_focused_pressed_max);
+    }
+    if (!FIND(appearance, L("window","inactive","buttons","toggled-pressed"),
+              theme->a_toggled_unfocused_pressed_max, TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_unfocused_pressed_max);
+        theme->a_toggled_unfocused_pressed_max =
+            RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    }
+    if (!FIND(appearance, L("window","active","buttons","toggled-unpressed"),
+              theme->a_toggled_focused_unpressed_max, TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
+        theme->a_toggled_focused_unpressed_max =
+            RrAppearanceCopy(theme->a_focused_unpressed_max);
+    }
+    if (!FIND(appearance, L("window","inactive","buttons","toggled-unpressed"),
+              theme->a_toggled_unfocused_unpressed_max, TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
+        theme->a_toggled_unfocused_unpressed_max =
+            RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    }
+    if (!FIND(appearance, L("window","active","buttons","toggled-hover"),
+              theme->a_toggled_hover_focused_max, TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_hover_focused_max);
+        theme->a_toggled_hover_focused_max =
+            RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+    }
+    if (!FIND(appearance, L("window","inactive","buttons","toggled-hover"),
+              theme->a_toggled_hover_unfocused_max, TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
+        theme->a_toggled_hover_unfocused_max =
+            RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+    }
 
    theme->a_disabled_focused_close =
         RrAppearanceCopy(theme->a_disabled_focused_max);
@@ -582,10 +685,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         RrAppearanceCopy(theme->a_hover_focused_max);
     theme->a_hover_unfocused_desk =
         RrAppearanceCopy(theme->a_hover_unfocused_max); 
-    theme->a_toggled_focused_desk =
-        RrAppearanceCopy(theme->a_toggled_focused_max);
-    theme->a_toggled_unfocused_desk =
-        RrAppearanceCopy(theme->a_toggled_unfocused_max);
+    theme->a_toggled_focused_pressed_desk =
+        RrAppearanceCopy(theme->a_toggled_focused_pressed_max);
+    theme->a_toggled_unfocused_pressed_desk =
+        RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max);
+    theme->a_toggled_focused_unpressed_desk =
+        RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+    theme->a_toggled_unfocused_unpressed_desk =
+        RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+    theme->a_toggled_hover_focused_desk =
+        RrAppearanceCopy(theme->a_toggled_hover_focused_max);
+    theme->a_toggled_hover_unfocused_desk =
+        RrAppearanceCopy(theme->a_toggled_hover_unfocused_max);
     theme->a_unfocused_unpressed_desk =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_desk =
@@ -602,10 +713,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         RrAppearanceCopy(theme->a_hover_focused_max);
     theme->a_hover_unfocused_shade =
         RrAppearanceCopy(theme->a_hover_unfocused_max);
-    theme->a_toggled_focused_shade =
-        RrAppearanceCopy(theme->a_toggled_focused_max);
-    theme->a_toggled_unfocused_shade =
-        RrAppearanceCopy(theme->a_toggled_unfocused_max);
+    theme->a_toggled_focused_pressed_shade =
+        RrAppearanceCopy(theme->a_toggled_focused_pressed_max);
+    theme->a_toggled_unfocused_pressed_shade =
+        RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max);
+    theme->a_toggled_focused_unpressed_shade =
+        RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+    theme->a_toggled_unfocused_unpressed_shade =
+        RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+    theme->a_toggled_hover_focused_shade =
+        RrAppearanceCopy(theme->a_toggled_hover_focused_max);
+    theme->a_toggled_hover_unfocused_shade =
+        RrAppearanceCopy(theme->a_toggled_hover_unfocused_max);
     theme->a_unfocused_unpressed_shade =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_shade =
@@ -634,6 +753,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_icon->surface.grad =
         theme->a_clear->surface.grad =
         theme->a_clear_tex->surface.grad =
+        theme->a_menu_text_title->surface.grad =
         theme->a_menu_normal->surface.grad =
         theme->a_menu_disabled->surface.grad =
         theme->a_menu_text_normal->surface.grad =
@@ -693,18 +813,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_unfocused_label->texture[0].data.text.shadow_alpha =
         theme->title_unfocused_shadow_alpha;
 
-    theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
-    theme->a_menu_title->texture[0].data.text.justify = mtitlejust;
-    theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font;
-    theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
+    theme->a_menu_text_title->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_menu_text_title->texture[0].data.text.justify = mtitlejust;
+    theme->a_menu_text_title->texture[0].data.text.font =
+        theme->menu_title_font;
+    theme->a_menu_text_title->texture[0].data.text.color =
+        theme->menu_title_color;
 
     if (!FIND(shadow, L("menu","title","text","shadow","offset"),
-              theme->a_menu_title))
-        theme->a_menu_title->texture[0].data.text.shadow_offset_x =
-            theme->a_menu_title->texture[0].data.text.shadow_offset_y = 0;
-    theme->a_menu_title->texture[0].data.text.shadow_color =
+              theme->a_menu_text_title))
+        theme->a_menu_text_title->texture[0].data.text.shadow_offset_x =
+            theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = 0;
+    theme->a_menu_text_title->texture[0].data.text.shadow_color =
         theme->menu_title_shadow_color;
-    theme->a_menu_title->texture[0].data.text.shadow_alpha =
+    theme->a_menu_text_title->texture[0].data.text.shadow_alpha =
         theme->menu_title_shadow_alpha;
 
     theme->a_menu_text_normal->texture[0].type =
@@ -756,8 +878,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->a_disabled_unfocused_max->texture[0].type = 
         theme->a_hover_focused_max->texture[0].type = 
         theme->a_hover_unfocused_max->texture[0].type = 
-        theme->a_toggled_focused_max->texture[0].type = 
-        theme->a_toggled_unfocused_max->texture[0].type = 
+        theme->a_toggled_focused_pressed_max->texture[0].type = 
+        theme->a_toggled_unfocused_pressed_max->texture[0].type = 
+        theme->a_toggled_focused_unpressed_max->texture[0].type = 
+        theme->a_toggled_unfocused_unpressed_max->texture[0].type = 
+        theme->a_toggled_hover_focused_max->texture[0].type = 
+        theme->a_toggled_hover_unfocused_max->texture[0].type = 
         theme->a_focused_unpressed_max->texture[0].type = 
         theme->a_focused_pressed_max->texture[0].type = 
         theme->a_unfocused_unpressed_max->texture[0].type = 
@@ -774,8 +900,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->a_disabled_unfocused_desk->texture[0].type = 
         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_unfocused_desk->texture[0].type = 
+        theme->a_toggled_focused_pressed_desk->texture[0].type = 
+        theme->a_toggled_unfocused_pressed_desk->texture[0].type = 
+        theme->a_toggled_focused_unpressed_desk->texture[0].type = 
+        theme->a_toggled_unfocused_unpressed_desk->texture[0].type = 
+        theme->a_toggled_hover_focused_desk->texture[0].type = 
+        theme->a_toggled_hover_unfocused_desk->texture[0].type = 
         theme->a_focused_unpressed_desk->texture[0].type = 
         theme->a_focused_pressed_desk->texture[0].type = 
         theme->a_unfocused_unpressed_desk->texture[0].type = 
@@ -784,8 +914,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->a_disabled_unfocused_shade->texture[0].type = 
         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_unfocused_shade->texture[0].type = 
+        theme->a_toggled_focused_pressed_shade->texture[0].type = 
+        theme->a_toggled_unfocused_pressed_shade->texture[0].type = 
+        theme->a_toggled_focused_unpressed_shade->texture[0].type = 
+        theme->a_toggled_unfocused_unpressed_shade->texture[0].type = 
+        theme->a_toggled_hover_focused_shade->texture[0].type = 
+        theme->a_toggled_hover_unfocused_shade->texture[0].type = 
         theme->a_focused_unpressed_shade->texture[0].type = 
         theme->a_focused_pressed_shade->texture[0].type = 
         theme->a_unfocused_unpressed_shade->texture[0].type = 
@@ -813,9 +947,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_focused_unpressed_max->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = 
         theme->max_mask;
-    theme->a_toggled_focused_max->texture[0].data.mask.mask = 
-        theme->a_toggled_unfocused_max->texture[0].data.mask.mask =
+    theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask =
+        theme->max_toggled_pressed_mask;
+    theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask =
         theme->max_toggled_mask;
+    theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = 
+        theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask =
+        theme->max_toggled_hover_mask;
     theme->a_disabled_focused_close->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_close->texture[0].data.mask.mask = 
         theme->close_disabled_mask;
@@ -840,9 +980,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_focused_unpressed_desk->texture[0].data.mask.mask = 
         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_unfocused_desk->texture[0].data.mask.mask =
+    theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask =
+        theme->desk_toggled_pressed_mask;
+    theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask =
         theme->desk_toggled_mask;
+    theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = 
+        theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask =
+        theme->desk_toggled_hover_mask;
     theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = 
         theme->shade_disabled_mask;
@@ -855,9 +1001,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     theme->a_focused_unpressed_shade->texture[0].data.mask.mask = 
         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_unfocused_shade->texture[0].data.mask.mask =
+    theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask =
+        theme->shade_toggled_pressed_mask;
+    theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask =
         theme->shade_toggled_mask;
+    theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = 
+        theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask =
+        theme->shade_toggled_hover_mask;
     theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = 
         theme->iconify_disabled_mask;
@@ -897,14 +1049,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->a_hover_unfocused_shade->texture[0].data.mask.color = 
         theme->a_hover_unfocused_iconify->texture[0].data.mask.color = 
         theme->titlebut_hover_unfocused_color;
-    theme->a_toggled_focused_max->texture[0].data.mask.color = 
-        theme->a_toggled_focused_desk->texture[0].data.mask.color = 
-        theme->a_toggled_focused_shade->texture[0].data.mask.color = 
-        theme->titlebut_toggled_focused_color;
-    theme->a_toggled_unfocused_max->texture[0].data.mask.color = 
-        theme->a_toggled_unfocused_desk->texture[0].data.mask.color = 
-        theme->a_toggled_unfocused_shade->texture[0].data.mask.color = 
-        theme->titlebut_toggled_unfocused_color;
+    theme->a_toggled_hover_focused_max->texture[0].data.mask.color = 
+        theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = 
+        theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_hover_focused_color;
+    theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = 
+        theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = 
+        theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_hover_unfocused_color;
+    theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = 
+        theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_focused_pressed_color;
+    theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = 
+        theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_unfocused_pressed_color;
+    theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_focused_unpressed_color;
+    theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_toggled_unfocused_unpressed_desk->
+        texture[0].data.mask.color = 
+        theme->a_toggled_unfocused_unpressed_shade->
+        texture[0].data.mask.color = 
+        theme->titlebut_toggled_unfocused_unpressed_color;
     theme->a_focused_unpressed_max->texture[0].data.mask.color = 
         theme->a_focused_unpressed_close->texture[0].data.mask.color = 
         theme->a_focused_unpressed_desk->texture[0].data.mask.color = 
@@ -951,7 +1121,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
             MAX(theme->win_font_height,
                 RrFontHeight(theme->win_font_unfocused,
                              a->texture[0].data.text.shadow_offset_y));
-        a = theme->a_menu_title;
+        a = theme->a_menu_text_title;
         theme->menu_title_font_height =
             RrFontHeight(theme->menu_title_font,
                          a->texture[0].data.text.shadow_offset_y);
@@ -1004,12 +1174,16 @@ void RrThemeFree(RrTheme *theme)
         RrColorFree(theme->titlebut_disabled_unfocused_color);
         RrColorFree(theme->titlebut_hover_focused_color);
         RrColorFree(theme->titlebut_hover_unfocused_color);
-        RrColorFree(theme->titlebut_toggled_focused_color);
-        RrColorFree(theme->titlebut_toggled_unfocused_color);
         RrColorFree(theme->titlebut_focused_pressed_color);
         RrColorFree(theme->titlebut_unfocused_pressed_color);
         RrColorFree(theme->titlebut_focused_unpressed_color);
         RrColorFree(theme->titlebut_unfocused_unpressed_color);
+        RrColorFree(theme->titlebut_toggled_hover_focused_color);
+        RrColorFree(theme->titlebut_toggled_hover_unfocused_color);
+        RrColorFree(theme->titlebut_toggled_focused_pressed_color);
+        RrColorFree(theme->titlebut_toggled_unfocused_pressed_color);
+        RrColorFree(theme->titlebut_toggled_focused_unpressed_color);
+        RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color);
         RrColorFree(theme->menu_title_color);
         RrColorFree(theme->menu_color);
         RrColorFree(theme->menu_disabled_color);
@@ -1059,12 +1233,16 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_disabled_unfocused_max);
         RrAppearanceFree(theme->a_hover_focused_max);
         RrAppearanceFree(theme->a_hover_unfocused_max);
-        RrAppearanceFree(theme->a_toggled_focused_max);
-        RrAppearanceFree(theme->a_toggled_unfocused_max);
         RrAppearanceFree(theme->a_focused_unpressed_max);
         RrAppearanceFree(theme->a_focused_pressed_max);
         RrAppearanceFree(theme->a_unfocused_unpressed_max);
         RrAppearanceFree(theme->a_unfocused_pressed_max);
+        RrAppearanceFree(theme->a_toggled_hover_focused_max);
+        RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
+        RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_max);
+        RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
+        RrAppearanceFree(theme->a_toggled_unfocused_pressed_max);
         RrAppearanceFree(theme->a_disabled_focused_close);
         RrAppearanceFree(theme->a_disabled_unfocused_close);
         RrAppearanceFree(theme->a_hover_focused_close);
@@ -1077,22 +1255,30 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_disabled_unfocused_desk);
         RrAppearanceFree(theme->a_hover_focused_desk);
         RrAppearanceFree(theme->a_hover_unfocused_desk);
-        RrAppearanceFree(theme->a_toggled_focused_desk);
-        RrAppearanceFree(theme->a_toggled_unfocused_desk);
         RrAppearanceFree(theme->a_focused_unpressed_desk);
         RrAppearanceFree(theme->a_focused_pressed_desk);
         RrAppearanceFree(theme->a_unfocused_unpressed_desk);
         RrAppearanceFree(theme->a_unfocused_pressed_desk);
+        RrAppearanceFree(theme->a_toggled_hover_focused_desk);
+        RrAppearanceFree(theme->a_toggled_hover_unfocused_desk);
+        RrAppearanceFree(theme->a_toggled_focused_unpressed_desk);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_desk);
+        RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk);
+        RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk);
         RrAppearanceFree(theme->a_disabled_focused_shade);
         RrAppearanceFree(theme->a_disabled_unfocused_shade);
         RrAppearanceFree(theme->a_hover_focused_shade);
         RrAppearanceFree(theme->a_hover_unfocused_shade);
-        RrAppearanceFree(theme->a_toggled_focused_shade);
-        RrAppearanceFree(theme->a_toggled_unfocused_shade);
         RrAppearanceFree(theme->a_focused_unpressed_shade);
         RrAppearanceFree(theme->a_focused_pressed_shade);
         RrAppearanceFree(theme->a_unfocused_unpressed_shade);
         RrAppearanceFree(theme->a_unfocused_pressed_shade);
+        RrAppearanceFree(theme->a_toggled_hover_focused_shade);
+        RrAppearanceFree(theme->a_toggled_hover_unfocused_shade);
+        RrAppearanceFree(theme->a_toggled_focused_unpressed_shade);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_shade);
+        RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade);
+        RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade);
         RrAppearanceFree(theme->a_disabled_focused_iconify);
         RrAppearanceFree(theme->a_disabled_unfocused_iconify);
         RrAppearanceFree(theme->a_hover_focused_iconify);
@@ -1112,6 +1298,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_unfocused_handle);
         RrAppearanceFree(theme->a_menu);
         RrAppearanceFree(theme->a_menu_title);
+        RrAppearanceFree(theme->a_menu_text_title);
         RrAppearanceFree(theme->a_menu_normal);
         RrAppearanceFree(theme->a_menu_disabled);
         RrAppearanceFree(theme->a_menu_selected);
@@ -1131,7 +1318,7 @@ void RrThemeFree(RrTheme *theme)
     }
 }
 
-static gboolean read_mask(ParseState *ps, gchar *maskname,
+static gboolean read_mask(ParseState *ps, const gchar *maskname,
                           RrPixmapMask **value)
 {
     gboolean ret = FALSE;
@@ -1245,7 +1432,7 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad,
     }
 }
 
-static xmlNodePtr find_node(xmlNodePtr n, gchar *names[])
+static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[])
 {
     gint i;
 
@@ -1254,7 +1441,7 @@ static xmlNodePtr find_node(xmlNodePtr n, gchar *names[])
     return n;
 }
 
-static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
                          gint *integer, gint lower, gint upper)
 {
     gint i;
@@ -1269,8 +1456,8 @@ static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[],
-                            gchar **string)
+static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
+                            const gchar **string)
 {
     if ((n = find_node(n, names))) {
         *string = parse_string(ps->doc, n);
@@ -1279,7 +1466,7 @@ static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            RrColor **color, gchar *alpha)
 {
     if ((n = find_node(n, names))) {
@@ -1299,7 +1486,7 @@ static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            gint *x, gint *y,
                            gint lowx, gint upx, gint lowy, gint upy)
 {
@@ -1316,7 +1503,7 @@ static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[],
                             RrAppearance *a)
 {
     return find_point(ps, n, names,
@@ -1325,7 +1512,7 @@ static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[],
                       -20, 20, -20, 20);
 }
 
-static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[],
                                 RrAppearance *a, gboolean allow_trans)
 {
     xmlNodePtr n2;