From: Dave Foster Date: Thu, 20 Sep 2007 19:30:18 +0000 (-0400) Subject: Adding RrButton to libobrender, ref counted appearances. X-Git-Tag: mikabox-3.4.7.2~32^2~7 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ae37a1bf8877fd0e8d2cf8f8152c831f609b95f7;p=mikachu%2Fopenbox.git Adding RrButton to libobrender, ref counted appearances. --- diff --git a/Makefile.am b/Makefile.am index 34ee07e4..65203479 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,8 @@ render_libobrender_la_LIBADD = \ $(XML_LIBS) render_libobrender_la_SOURCES = \ gettext.h \ + render/button.h \ + render/button.c \ render/color.h \ render/color.c \ render/font.h \ diff --git a/render/button.c b/render/button.c new file mode 100644 index 00000000..5d3f9203 --- /dev/null +++ b/render/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 */ +} diff --git a/render/button.h b/render/button.h new file mode 100644 index 00000000..75459642 --- /dev/null +++ b/render/button.h @@ -0,0 +1,59 @@ +#ifndef __button_h +#define __button_h + +#include "render.h" + +#include +#include +#include + +struct _RrButton { + const RrInstance *inst; + + /* reference count */ + gint ref; + + /* colors */ + RrColor *focused_unpressed_color; + RrColor *unfocused_unpressed_color; + RrColor *focused_pressed_color; + RrColor *unfocused_pressed_color; + RrColor *disabled_focused_color; + RrColor *disabled_unfocused_color; + RrColor *hover_focused_color; + RrColor *hover_unfocused_color; + RrColor *toggled_hover_focused_color; + RrColor *toggled_hover_unfocused_color; + RrColor *toggled_focused_pressed_color; + RrColor *toggled_unfocused_pressed_color; + RrColor *toggled_focused_unpressed_color; + RrColor *toggled_unfocused_unpressed_color; + + /* masks */ + RrPixmapMask *mask; + RrPixmapMask *pressed_mask; + RrPixmapMask *disabled_mask; + RrPixmapMask *hover_mask; + RrPixmapMask *toggled_mask; + RrPixmapMask *toggled_hover_mask; + RrPixmapMask *toggled_pressed_mask; + + /* textures */ + RrAppearance *a_focused_unpressed; + RrAppearance *a_unfocused_unpressed; + RrAppearance *a_focused_pressed; + RrAppearance *a_unfocused_pressed; + RrAppearance *a_disabled_focused; + RrAppearance *a_disabled_unfocused; + RrAppearance *a_hover_focused; + RrAppearance *a_hover_unfocused; + RrAppearance *a_toggled_focused_unpressed; + RrAppearance *a_toggled_unfocused_unpressed; + RrAppearance *a_toggled_focused_pressed; + RrAppearance *a_toggled_unfocused_pressed; + RrAppearance *a_toggled_hover_focused; + RrAppearance *a_toggled_hover_unfocused; + +}; + +#endif /* __button_h */ diff --git a/render/render.c b/render/render.c index 4119dc7f..c116162c 100644 --- a/render/render.c +++ b/render/render.c @@ -170,6 +170,7 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex) out = g_new0(RrAppearance, 1); out->inst = inst; + out->ref = 1; out->textures = numtex; out->surface.bevel_light_adjust = 128; out->surface.bevel_dark_adjust = 64; @@ -186,6 +187,15 @@ void RrAppearanceAddTextures(RrAppearance *a, gint numtex) if (numtex) a->texture = g_new0(RrTexture, numtex); } +/* shallow copy means up the ref count and return it */ +RrAppearance *RrAppearanceCopyShallow(RrAppearance *orig) +{ + orig->ref++; + return orig; +} + +/* deep copy of orig, means reset ref to 1 on copy + * and copy each thing memwise. */ RrAppearance *RrAppearanceCopy(RrAppearance *orig) { RrSurface *spo, *spc; @@ -193,6 +203,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) gint i; copy->inst = orig->inst; + copy->ref = 1; spo = &(orig->surface); spc = &(copy->surface); @@ -276,34 +287,43 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) return copy; } +/* now decrements ref counter, and frees only if ref <= 0 */ void RrAppearanceFree(RrAppearance *a) { gint i; - if (a) { - RrSurface *p; - if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap); - if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw); - for (i = 0; i < a->textures; ++i) - if (a->texture[i].type == RR_TEXTURE_RGBA) { - g_free(a->texture[i].data.rgba.cache); - a->texture[i].data.rgba.cache = NULL; - } - if (a->textures) - g_free(a->texture); - p = &a->surface; - RrColorFree(p->primary); - RrColorFree(p->secondary); - RrColorFree(p->border_color); - RrColorFree(p->interlace_color); - RrColorFree(p->bevel_dark); - RrColorFree(p->bevel_light); - RrColorFree(p->split_primary); - RrColorFree(p->split_secondary); - g_free(p->pixel_data); - p->pixel_data = NULL; - g_free(a); - } + if (!a) return; + + /* decrement ref counter */ + if (a->ref-- > 0) + return; + + /* if we're here we have no more refs to this appearance, free it */ + RrSurface *p; + if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap); + if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw); + for (i = 0; i < a->textures; ++i) + if (a->texture[i].type == RR_TEXTURE_RGBA) { + g_free(a->texture[i].data.rgba.cache); + a->texture[i].data.rgba.cache = NULL; + } + if (a->textures) + g_free(a->texture); + p = &a->surface; + RrColorFree(p->primary); + RrColorFree(p->secondary); + RrColorFree(p->border_color); + RrColorFree(p->interlace_color); + RrColorFree(p->bevel_dark); + RrColorFree(p->bevel_light); + RrColorFree(p->split_primary); + RrColorFree(p->split_secondary); + g_free(p->pixel_data); + p->pixel_data = NULL; + g_free(a); + + /* set a to NULL so its testable afterwards if it still exists */ + a = NULL; } diff --git a/render/render.h b/render/render.h index 1d4718c9..f6475eaa 100644 --- a/render/render.h +++ b/render/render.h @@ -42,6 +42,7 @@ typedef struct _RrTextureLineArt RrTextureLineArt; typedef struct _RrPixmapMask RrPixmapMask; typedef struct _RrInstance RrInstance; typedef struct _RrColor RrColor; +typedef struct _RrButton RrButton; typedef guint32 RrPixel32; typedef guint16 RrPixel16; @@ -189,6 +190,8 @@ struct _RrTexture { struct _RrAppearance { const RrInstance *inst; + + gint ref; RrSurface surface; gint textures; @@ -243,10 +246,14 @@ gulong RrColorPixel (const RrColor *c); GC RrColorGC (RrColor *c); RrAppearance *RrAppearanceNew (const RrInstance *inst, gint numtex); +RrAppearance *RrAppearanceCopyShallow (RrAppearance *a); RrAppearance *RrAppearanceCopy (RrAppearance *a); void RrAppearanceFree (RrAppearance *a); void RrAppearanceAddTextures(RrAppearance *a, gint numtex); +RrButton *RrButtonNew (const RrInstance *inst); +void RrButtonFree(RrButton *b); + RrFont *RrFontOpen (const RrInstance *inst, const gchar *name, gint size, RrFontWeight weight, RrFontSlant slant); RrFont *RrFontOpenDefault (const RrInstance *inst);