From 6d30d66efb028fbafb58712aa5b71cadfeef2e32 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 20 Sep 2007 15:30:18 -0400 Subject: Adding RrButton to libobrender, ref counted appearances. --- obrender/button.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 obrender/button.c (limited to 'obrender/button.c') diff --git a/obrender/button.c b/obrender/button.c new file mode 100644 index 00000000..5d3f9203 --- /dev/null +++ b/obrender/button.c @@ -0,0 +1,103 @@ +#include "render.h" +#include "button.h" +#include "instance.h" + +#include +#include +#include + +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; + out->unfocused_unpressed_color = NULL; + out->focused_pressed_color = NULL; + out->unfocused_pressed_color = NULL; + out->disabled_focused_color = NULL; + out->disabled_unfocused_color = NULL; + out->hover_focused_color = NULL; + out->hover_unfocused_color = NULL; + out->toggled_hover_focused_color = NULL; + out->toggled_hover_unfocused_color = NULL; + out->toggled_focused_pressed_color = NULL; + out->toggled_unfocused_pressed_color = NULL; + out->toggled_focused_unpressed_color = NULL; + out->toggled_unfocused_unpressed_color = NULL; + + /* same with masks */ + out->mask = NULL; + out->pressed_mask = NULL; + out->disabled_mask = NULL; + out->hover_mask = NULL; + out->toggled_mask = NULL; + out->toggled_hover_mask = NULL; + out->toggled_pressed_mask = NULL; + + /* allocate appearances */ + out->a_focused_unpressed = RrAppearanceNew(inst, 1); + out->a_unfocused_unpressed = RrAppearanceNew(inst, 1); + out->a_focused_pressed = RrAppearanceNew(inst, 1); + out->a_unfocused_pressed = RrAppearanceNew(inst, 1); + out->a_disabled_focused = RrAppearanceNew(inst, 1); + out->a_disabled_unfocused = RrAppearanceNew(inst, 1); + out->a_hover_focused = RrAppearanceNew(inst, 1); + out->a_hover_unfocused = RrAppearanceNew(inst, 1); + out->a_toggled_focused_unpressed = RrAppearanceNew(inst, 1); + out->a_toggled_unfocused_unpressed = RrAppearanceNew(inst, 1); + out->a_toggled_focused_pressed = RrAppearanceNew(inst, 1); + out->a_toggled_unfocused_pressed = RrAppearanceNew(inst, 1); + out->a_toggled_hover_focused = RrAppearanceNew(inst, 1); + out->a_toggled_hover_unfocused = RrAppearanceNew(inst, 1); + + return out; +} + +void RrButtonFree(RrButton *b) +{ + b->ref--; + if (b->ref <= 0) + RrButtonFreeReal(b); +} + +void RrButtonFreeReal(RrButton* b) +{ + /* colors */ + if (b->focused_unpressed_color) + RrColorFree(b->focused_unpressed_color); + if (b->unfocused_unpressed_color) + RrColorFree(b->unfocused_unpressed_color); + if (b->focused_pressed_color) + RrColorFree(b->focused_pressed_color); + if (b->unfocused_pressed_color) + RrColorFree(b->unfocused_pressed_color); + if (b->disabled_focused_color) + RrColorFree(b->disabled_focused_color); + if (b->disabled_unfocused_color) + RrColorFree(b->disabled_unfocused_color); + if (b->hover_focused_color) + RrColorFree(b->hover_focused_color); + if (b->hover_unfocused_color) + RrColorFree(b->hover_unfocused_color); + if (b->toggled_hover_focused_color) + RrColorFree(b->toggled_hover_focused_color); + if (b->toggled_hover_unfocused_color) + RrColorFree(b->toggled_hover_unfocused_color); + if (b->toggled_focused_pressed_color) + RrColorFree(b->toggled_focused_pressed_color); + if (b->toggled_unfocused_pressed_color) + RrColorFree(b->toggled_unfocused_pressed_color); + if (b->toggled_focused_unpressed_color) + RrColorFree(b->toggled_focused_unpressed_color); + if (b->toggled_unfocused_unpressed_color) + RrColorFree(b->toggled_unfocused_unpressed_color); + + /* masks */ +} -- cgit v1.2.3 From 0ae3388b6a6cef0f33f26369ccc3cdd5687ea930 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 20 Sep 2007 22:36:52 -0400 Subject: Button proper freeing/newing. --- obrender/button.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) (limited to 'obrender/button.c') diff --git a/obrender/button.c b/obrender/button.c index 5d3f9203..399888dc 100644 --- a/obrender/button.c +++ b/obrender/button.c @@ -6,15 +6,12 @@ #include #include -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; @@ -60,14 +57,7 @@ RrButton *RrButtonNew (const RrInstance *inst) return out; } -void RrButtonFree(RrButton *b) -{ - b->ref--; - if (b->ref <= 0) - RrButtonFreeReal(b); -} - -void RrButtonFreeReal(RrButton* b) +void RrButtonFree(RrButton* b) { /* colors */ if (b->focused_unpressed_color) @@ -100,4 +90,27 @@ void RrButtonFreeReal(RrButton* b) RrColorFree(b->toggled_unfocused_unpressed_color); /* masks */ + if (mask) RrPixmapMaskFree(mask); + if (pressed_mask) RrPixmapMaskFree(pressed_mask); + if (disabled_mask) RrPixmapMaskFree(disabled_mask); + if (hover_mask) RrPixmapMaskFree(hover_mask); + if (toggled_mask) RrPixmapMaskFree(toggled_mask); + if (toggled_hover_mask) RrPixmapMaskFree(toggled_hover_mask); + if (toggled_pressed_mask) RrPixmapMaskFree(toggled_pressed_mask); + + /* appearances */ + RrAppearanceFree(a_focused_unpressed); + RrAppearanceFree(a_unfocused_unpressed); + RrAppearanceFree(a_focused_pressed); + RrAppearanceFree(a_unfocused_pressed); + RrAppearanceFree(a_disabled_focused); + RrAppearanceFree(a_disabled_unfocused); + RrAppearanceFree(a_hover_focused); + RrAppearanceFree(a_hover_unfocused); + RrAppearanceFree(a_toggled_focused_unpressed); + RrAppearanceFree(a_toggled_unfocused_unpressed); + RrAppearanceFree(a_toggled_focused_pressed); + RrAppearanceFree(a_toggled_unfocused_pressed); + RrAppearanceFree(a_toggled_hover_focused); + RrAppearanceFree(a_toggled_hover_unfocused); } -- cgit v1.2.3 From f250c9dc2b8d1424f593f9dec096b3f83fb3ef2f Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Fri, 7 Dec 2007 14:00:47 -0500 Subject: Button structure. --- obrender/button.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'obrender/button.c') diff --git a/obrender/button.c b/obrender/button.c index 399888dc..0c92abe4 100644 --- a/obrender/button.c +++ b/obrender/button.c @@ -57,7 +57,7 @@ RrButton *RrButtonNew (const RrInstance *inst) return out; } -void RrButtonFree(RrButton* b) +void RrButtonFree(RrButton *b) { /* colors */ if (b->focused_unpressed_color) @@ -90,27 +90,27 @@ void RrButtonFree(RrButton* b) RrColorFree(b->toggled_unfocused_unpressed_color); /* masks */ - if (mask) RrPixmapMaskFree(mask); - if (pressed_mask) RrPixmapMaskFree(pressed_mask); - if (disabled_mask) RrPixmapMaskFree(disabled_mask); - if (hover_mask) RrPixmapMaskFree(hover_mask); - if (toggled_mask) RrPixmapMaskFree(toggled_mask); - if (toggled_hover_mask) RrPixmapMaskFree(toggled_hover_mask); - if (toggled_pressed_mask) RrPixmapMaskFree(toggled_pressed_mask); + 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(a_focused_unpressed); - RrAppearanceFree(a_unfocused_unpressed); - RrAppearanceFree(a_focused_pressed); - RrAppearanceFree(a_unfocused_pressed); - RrAppearanceFree(a_disabled_focused); - RrAppearanceFree(a_disabled_unfocused); - RrAppearanceFree(a_hover_focused); - RrAppearanceFree(a_hover_unfocused); - RrAppearanceFree(a_toggled_focused_unpressed); - RrAppearanceFree(a_toggled_unfocused_unpressed); - RrAppearanceFree(a_toggled_focused_pressed); - RrAppearanceFree(a_toggled_unfocused_pressed); - RrAppearanceFree(a_toggled_hover_focused); - RrAppearanceFree(a_toggled_hover_unfocused); + 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); } -- cgit v1.2.3 From a621e7a4fc9de355e4ef25afca745e2197c5fd47 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 11 Jan 2008 22:34:23 -0500 Subject: fix 80 cols and clean up the button color loading function --- obrender/button.c | 1 + 1 file changed, 1 insertion(+) (limited to 'obrender/button.c') diff --git a/obrender/button.c b/obrender/button.c index 0c92abe4..14a454dd 100644 --- a/obrender/button.c +++ b/obrender/button.c @@ -1,6 +1,7 @@ #include "render.h" #include "button.h" #include "instance.h" +#include "mask.h" #include #include -- cgit v1.2.3