Fix negative ResizeRelative values with terminal windows (Fix bug 5228)

[chaz/openbox] / obrender / button.c

diff --git a/obrender/button.c b/obrender/button.c
index 5d3f92035c72cae5448c8e806e2ed3443d6f26d4..14a454ddda71b49ef89d4e784beec5404abe50e6 100644 (file)
--- a/obrender/button.c
+++ b/obrender/button.c
@@ -1,20 +1,18 @@
 #include "render.h"
 #include "button.h"
 #include "instance.h"
+#include "mask.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <string.h>
 
-static void RrButtonFreeReal(RrButton* b);
-
 RrButton *RrButtonNew (const RrInstance *inst)
 {
     RrButton *out = NULL;
 
     out = g_new(RrButton, 1);
     out->inst = inst;
-    out->ref = 1;
 
     /* no need to alloc colors, set them null (for freeing later) */
     out->focused_unpressed_color = NULL;
@@ -61,13 +59,6 @@ RrButton *RrButtonNew (const RrInstance *inst)
 }
 
 void RrButtonFree(RrButton *b)
-{
-    b->ref--;
-    if (b->ref <= 0)
-        RrButtonFreeReal(b);
-}
-
-void RrButtonFreeReal(RrButton* b)
 {
     /* colors */
     if (b->focused_unpressed_color) 
@@ -100,4 +91,27 @@ void RrButtonFreeReal(RrButton* b)
         RrColorFree(b->toggled_unfocused_unpressed_color);
 
     /* masks */
+    if (b->mask) RrPixmapMaskFree(b->mask);
+    if (b->pressed_mask) RrPixmapMaskFree(b->pressed_mask);
+    if (b->disabled_mask) RrPixmapMaskFree(b->disabled_mask);
+    if (b->hover_mask) RrPixmapMaskFree(b->hover_mask);
+    if (b->toggled_mask) RrPixmapMaskFree(b->toggled_mask);
+    if (b->toggled_hover_mask) RrPixmapMaskFree(b->toggled_hover_mask);
+    if (b->toggled_pressed_mask) RrPixmapMaskFree(b->toggled_pressed_mask);
+
+    /* appearances */
+    RrAppearanceFree(b->a_focused_unpressed);
+    RrAppearanceFree(b->a_unfocused_unpressed);
+    RrAppearanceFree(b->a_focused_pressed);
+    RrAppearanceFree(b->a_unfocused_pressed);
+    RrAppearanceFree(b->a_disabled_focused);
+    RrAppearanceFree(b->a_disabled_unfocused);
+    RrAppearanceFree(b->a_hover_focused);
+    RrAppearanceFree(b->a_hover_unfocused);
+    RrAppearanceFree(b->a_toggled_focused_unpressed);
+    RrAppearanceFree(b->a_toggled_unfocused_unpressed);
+    RrAppearanceFree(b->a_toggled_focused_pressed);
+    RrAppearanceFree(b->a_toggled_unfocused_pressed);
+    RrAppearanceFree(b->a_toggled_hover_focused);
+    RrAppearanceFree(b->a_toggled_hover_unfocused);
 }