X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=dd9c76536a3a6e05169879885016d11483038959;hb=d8919a9bf837da29c5ca4726c8ebc429127b955b;hp=a60fc7b1218d1d3ef24d1cc4e418d98d96fb6f9a;hpb=3905872982478e4e0ae05f4ce114a8025a2389ee;p=chaz%2Fopenbox

diff --git a/render/theme.c b/render/theme.c
index a60fc7b1..dd9c7653 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -48,7 +48,7 @@ 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, const gchar *names[],
-                            const gchar **string);
+                            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, const gchar *names[],
@@ -72,7 +72,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     ParseState ps;
     xmlNodePtr root;
     RrJustify winjust, mtitlejust;
-    const gchar *str;
+    gchar *str;
     RrTheme *theme;
 
     if (name) {
@@ -154,6 +154,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
             winjust = RR_JUSTIFY_RIGHT;
         else if (strcmp(str, "center") == 0)
             winjust = RR_JUSTIFY_CENTER;
+        g_free(str);
     }
 
     if (menu_title_font) {
@@ -168,6 +169,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
             mtitlejust = RR_JUSTIFY_RIGHT;
         else if (strcmp(str, "center") == 0)
             mtitlejust = RR_JUSTIFY_CENTER;
+        g_free(str);
     }
 
     if (menu_item_font) {
@@ -685,14 +687,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     {
         RrAppearanceFree(theme->a_toggled_hover_focused_max);
         theme->a_toggled_hover_focused_max =
-            RrAppearanceCopy(theme->a_toggled_focused_pressed_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_pressed_max);
+            RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
     }
 
    theme->a_disabled_focused_close =
@@ -1121,10 +1123,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         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->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 = 
@@ -1191,6 +1191,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb);
         RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub);
         theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub);
+        theme->label_height += theme->label_height % 2;
 
         /* this would be nice I think, since padding.width can now be 0,
            but it breaks frame.c horribly and I don't feel like fixing that
@@ -1258,16 +1259,22 @@ void RrThemeFree(RrTheme *theme)
 
         RrPixmapMaskFree(theme->max_mask);
         RrPixmapMaskFree(theme->max_toggled_mask);
+        RrPixmapMaskFree(theme->max_toggled_hover_mask);
+        RrPixmapMaskFree(theme->max_toggled_pressed_mask);
         RrPixmapMaskFree(theme->max_disabled_mask);
         RrPixmapMaskFree(theme->max_hover_mask);
         RrPixmapMaskFree(theme->max_pressed_mask);
         RrPixmapMaskFree(theme->desk_mask);
         RrPixmapMaskFree(theme->desk_toggled_mask);
+        RrPixmapMaskFree(theme->desk_toggled_hover_mask);
+        RrPixmapMaskFree(theme->desk_toggled_pressed_mask);
         RrPixmapMaskFree(theme->desk_disabled_mask);
         RrPixmapMaskFree(theme->desk_hover_mask);
         RrPixmapMaskFree(theme->desk_pressed_mask);
         RrPixmapMaskFree(theme->shade_mask);
         RrPixmapMaskFree(theme->shade_toggled_mask);
+        RrPixmapMaskFree(theme->shade_toggled_hover_mask);
+        RrPixmapMaskFree(theme->shade_toggled_pressed_mask);
         RrPixmapMaskFree(theme->shade_disabled_mask);
         RrPixmapMaskFree(theme->shade_hover_mask);
         RrPixmapMaskFree(theme->shade_pressed_mask);
@@ -1516,7 +1523,7 @@ static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
 }
 
 static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
-                            const gchar **string)
+                            gchar **string)
 {
     if ((n = find_node(n, names))) {
         *string = parse_string(ps->doc, n);