From 918efe8e49ba95b093ba6ba4f893370669483bcd Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 30 Aug 2007 23:11:38 -0400 Subject: READ_COLOR macros done, RrColorCopy added, indentation fixed. --- obrender/render.h | 1 + 1 file changed, 1 insertion(+) (limited to 'obrender/render.h') diff --git a/obrender/render.h b/obrender/render.h index 37ffa553..1ec47a26 100644 --- a/obrender/render.h +++ b/obrender/render.h @@ -303,6 +303,7 @@ gint RrGreenMask (const RrInstance *inst); gint RrBlueMask (const RrInstance *inst); RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); +RrColor *RrColorCopy (RrColor *c); RrColor *RrColorParse (const RrInstance *inst, gchar *colorname); void RrColorFree (RrColor *in); -- cgit v1.2.3 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/render.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'obrender/render.h') diff --git a/obrender/render.h b/obrender/render.h index 1ec47a26..a8a8fe36 100644 --- a/obrender/render.h +++ b/obrender/render.h @@ -46,6 +46,7 @@ typedef struct _RrColor RrColor; typedef struct _RrImage RrImage; typedef struct _RrImagePic RrImagePic; typedef struct _RrImageCache RrImageCache; +typedef struct _RrButton RrButton; typedef guint32 RrPixel32; typedef guint16 RrPixel16; @@ -220,6 +221,8 @@ struct _RrTexture { struct _RrAppearance { const RrInstance *inst; + + gint ref; RrSurface surface; gint textures; @@ -314,6 +317,7 @@ 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 RrAppearanceRemoveTextures(RrAppearance *a); @@ -321,6 +325,9 @@ void RrAppearanceAddTextures(RrAppearance *a, gint numtex); /*! Always call this when changing the type of a texture in an appearance */ void RrAppearanceClearTextures(RrAppearance *a); +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); -- 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/render.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'obrender/render.h') diff --git a/obrender/render.h b/obrender/render.h index a8a8fe36..dad3c540 100644 --- a/obrender/render.h +++ b/obrender/render.h @@ -222,8 +222,6 @@ struct _RrTexture { struct _RrAppearance { const RrInstance *inst; - gint ref; - RrSurface surface; gint textures; RrTexture *texture; @@ -317,7 +315,6 @@ 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 RrAppearanceRemoveTextures(RrAppearance *a); -- cgit v1.2.3 From 8058df3f7ce153e31cfebaa696a7e892999acb2b Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Wed, 12 Dec 2007 18:02:38 -0500 Subject: Buttons seem to work! --- obrender/render.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'obrender/render.h') diff --git a/obrender/render.h b/obrender/render.h index dad3c540..d8d47c9d 100644 --- a/obrender/render.h +++ b/obrender/render.h @@ -272,6 +272,52 @@ struct _RrImage { gpointer destroy_data; }; +struct _RrButton { + const RrInstance *inst; + + /* 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; + +}; + /* these are the same on all endian machines because it seems to be dependant on the endianness of the gfx card, not the cpu. */ #define RrDefaultAlphaOffset 24 -- cgit v1.2.3