all repos — openbox @ 632b2af7a8283eff025456d3bb39a362311f4182

openbox fork - make it a bit more like ryudo 

fix mem leaks/crashes
Dana Jansens danakj@orodu.net
commit

632b2af7a8283eff025456d3bb39a362311f4182

parent

2eb5721416309089d855ec8362d4ec131f595c21

2 files changed, 22 insertions(+), 6 deletions(-)

jump to
M render/theme.c → render/theme.c 
@@ -184,12 +184,18 @@ if (!read_color(db, inst,
                     "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 +204,23 @@ RrColorNew(inst, 0xff, 0xff, 0xff);
     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);

@@ -694,6 +706,10 @@ RrColorFree(theme->cb_unfocused_color);
         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);
M render/theme.h → render/theme.h 
@@ -29,7 +29,7 @@ RrColor *cb_unfocused_color;
     RrColor *title_focused_color;
     RrColor *title_unfocused_color;
     RrColor *titlebut_disabled_focused_color;
-    RrColor *titlebut_disabled_unfocused_color; 
+    RrColor *titlebut_disabled_unfocused_color;
     RrColor *titlebut_hover_focused_color;
     RrColor *titlebut_hover_unfocused_color;
     RrColor *titlebut_focused_pressed_color;