alpha3

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index 68d9888f8df71c4f6d3cfbd5a1a8d119c005e66a..cfbc5f9ce868f850c7dabe4477d25e996296a071 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -133,11 +133,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             mjust = RR_JUSTIFY_CENTER;
     }
 
-    /* load the title layout */
-    if (!read_string(db, "window.title.layout", &font_str))
-        font_str = "NLIMC";
-    theme->title_layout = g_strdup(font_str);
-
     /* load direct dimensions */
     if (!read_int(db, "menuOverlap", &theme->menu_overlap) ||
        theme->menu_overlap < 0 || theme->menu_overlap > 20)
@@ -184,12 +179,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                     "window.button.pressed.focus.picColor",
                     &theme->titlebut_focused_pressed_color))
        theme->titlebut_focused_pressed_color =
-            theme->titlebut_focused_unpressed_color;
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
     if (!read_color(db, inst,
                     "window.button.pressed.unfocus.picColor",
                     &theme->titlebut_unfocused_pressed_color))
        theme->titlebut_unfocused_pressed_color =
-            theme->titlebut_unfocused_unpressed_color;
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
     if (!read_color(db, inst,
                     "window.button.disabled.focus.picColor",
                     &theme->titlebut_disabled_focused_color))
@@ -198,17 +199,23 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     if (!read_color(db, inst,
                     "window.button.disabled.unfocus.picColor",
                     &theme->titlebut_disabled_unfocused_color))
-       theme->titlebut_hover_unfocused_color = RrColorNew(inst, 0, 0, 0);
+       theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
                     "window.button.hover.focus.picColor",
                     &theme->titlebut_hover_focused_color))
        theme->titlebut_hover_focused_color =
-            theme->titlebut_focused_unpressed_color;
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
     if (!read_color(db, inst,
                     "window.button.hover.unfocus.picColor",
                     &theme->titlebut_hover_unfocused_color))
        theme->titlebut_hover_unfocused_color =
-            theme->titlebut_unfocused_unpressed_color;
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
     if (!read_color(db, inst,
                     "menu.title.textColor", &theme->menu_title_color))
         theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
@@ -458,7 +465,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_hover_focused_iconify =
         RrAppearanceCopy(theme->a_hover_focused_max);
     theme->a_hover_unfocused_iconify =
-        RrAppearanceCopy(theme->a_hover_focused_max);
+        RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_unfocused_unpressed_iconify =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_iconify =
@@ -694,6 +701,10 @@ void RrThemeFree(RrTheme *theme)
         RrColorFree(theme->cb_focused_color);
         RrColorFree(theme->title_unfocused_color);
         RrColorFree(theme->title_focused_color);
+        RrColorFree(theme->titlebut_disabled_focused_color);
+        RrColorFree(theme->titlebut_disabled_unfocused_color);
+        RrColorFree(theme->titlebut_hover_focused_color);
+        RrColorFree(theme->titlebut_hover_unfocused_color);
         RrColorFree(theme->titlebut_unfocused_pressed_color);
         RrColorFree(theme->titlebut_focused_pressed_color);
         RrColorFree(theme->titlebut_unfocused_unpressed_color);
@@ -716,8 +727,6 @@ void RrThemeFree(RrTheme *theme)
         RrFontClose(theme->mtitlefont);
         RrFontClose(theme->mfont);
 
-        g_free(theme->title_layout);
-
         RrAppearanceFree(theme->a_disabled_focused_max);
         RrAppearanceFree(theme->a_disabled_unfocused_max);
         RrAppearanceFree(theme->a_hover_focused_max);