From bd59576748db274c1a5e6ffece5df51d7d700b23 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 21 Jun 2003 01:56:14 +0000 Subject: [PATCH] rename color_rgb to RrColor --- render/color.c | 12 ++++++------ render/color.h | 2 +- render/render.h | 22 +++++++++++----------- render/theme.c | 6 +++--- render/theme.h | 22 +++++++++++----------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/render/color.c b/render/color.c index 145550f3..345736a3 100644 --- a/render/color.c +++ b/render/color.c @@ -7,7 +7,7 @@ XColor *pseudo_colors; int pseudo_bpc; -void color_allocate_gc(color_rgb *in) +void color_allocate_gc(RrColor *in) { XGCValues gcv; @@ -18,7 +18,7 @@ void color_allocate_gc(color_rgb *in) GCForeground | GCCapStyle, &gcv); } -color_rgb *RrColorParse(const RrInstance *inst, gchar *colorname) +RrColor *RrColorParse(const RrInstance *inst, gchar *colorname) { XColor xcol; @@ -36,16 +36,16 @@ color_rgb *RrColorParse(const RrInstance *inst, gchar *colorname) return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8); } -color_rgb *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) +RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) { /* this should be replaced with something far cooler */ - color_rgb *out = NULL; + RrColor *out = NULL; XColor xcol; xcol.red = (r << 8) | r; xcol.green = (g << 8) | g; xcol.blue = (b << 8) | b; if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) { - out = g_new(color_rgb, 1); + out = g_new(RrColor, 1); out->inst = inst; out->r = xcol.red >> 8; out->g = xcol.green >> 8; @@ -58,7 +58,7 @@ color_rgb *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) /*XXX same color could be pointed to twice, this might have to be a refcount*/ -void RrColorFree(color_rgb *c) +void RrColorFree(RrColor *c) { if (c) { if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc); diff --git a/render/color.h b/render/color.h index 2ed23ddd..ba9fb22b 100644 --- a/render/color.h +++ b/render/color.h @@ -31,7 +31,7 @@ struct _RrColor { GC gc; }; -void color_allocate_gc(color_rgb *in); +void color_allocate_gc(RrColor *in); XColor *pickColor(const RrInstance *inst, gint r, gint g, gint b); void reduce_depth(const RrInstance *inst, pixel32 *data, XImage *im); void increase_depth(const RrInstance *inst, pixel32 *data, XImage *im); diff --git a/render/render.h b/render/render.h index c6bd3556..fb48bd5f 100644 --- a/render/render.h +++ b/render/render.h @@ -16,7 +16,7 @@ typedef struct _RrTextureRGBA RrTextureRGBA; typedef struct _RrTextureText RrTextureText; typedef struct _RrPixmapMask RrPixmapMask; typedef struct _RrInstance RrInstance; -typedef struct _RrColor color_rgb; /* XXX ugly */ +typedef struct _RrColor RrColor; typedef guint32 pixel32; /* XXX prefix */ typedef guint16 pixel16; @@ -62,11 +62,11 @@ struct _RrSurface { RrSurfaceColorType grad; RrReliefType relief; RrBevelType bevel; - color_rgb *primary; - color_rgb *secondary; - color_rgb *border_color; - color_rgb *bevel_dark; - color_rgb *bevel_light; + RrColor *primary; + RrColor *secondary; + RrColor *border_color; + RrColor *bevel_dark; + RrColor *bevel_light; gboolean interlaced; gboolean border; RrAppearance *parent; @@ -81,7 +81,7 @@ struct _RrTextureText { gint shadow; gchar tint; guchar offset; - color_rgb *color; + RrColor *color; gchar *string; }; @@ -94,7 +94,7 @@ struct _RrPixmapMask { }; struct _RrTextureMask { - color_rgb *color; + RrColor *color; RrPixmapMask *mask; }; @@ -153,9 +153,9 @@ gint RrBlueMask (const RrInstance *inst); guint RrPseudoBPC (const RrInstance *inst); XColor* RrPseudoColors (const RrInstance *inst); -color_rgb *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); -color_rgb *RrColorParse (const RrInstance *inst, gchar *colorname); -void RrColorFree (color_rgb *in); +RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); +RrColor *RrColorParse (const RrInstance *inst, gchar *colorname); +void RrColorFree (RrColor *in); RrAppearance *RrAppearanceNew (const RrInstance *inst, gint numtex); RrAppearance *RrAppearanceCopy (RrAppearance *a); diff --git a/render/theme.c b/render/theme.c index 991dfd1c..ad727432 100644 --- a/render/theme.c +++ b/render/theme.c @@ -11,7 +11,7 @@ static XrmDatabase loaddb(char *theme); static gboolean read_int(XrmDatabase db, char *rname, int *value); static gboolean read_string(XrmDatabase db, char *rname, char **value); static gboolean read_color(XrmDatabase db, const RrInstance *inst, - gchar *rname, color_rgb **value); + gchar *rname, RrColor **value); static gboolean read_mask(XrmDatabase db, const RrInstance *inst, gchar *rname, gchar *theme, RrPixmapMask **value); @@ -767,7 +767,7 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value) } static gboolean read_color(XrmDatabase db, const RrInstance *inst, - gchar *rname, color_rgb **value) + gchar *rname, RrColor **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname); @@ -776,7 +776,7 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - color_rgb *c = RrColorParse(inst, retvalue.addr); + RrColor *c = RrColorParse(inst, retvalue.addr); if (c != NULL) { *value = c; ret = TRUE; diff --git a/render/theme.h b/render/theme.h index a60d5cac..e3c62c2b 100644 --- a/render/theme.h +++ b/render/theme.h @@ -24,17 +24,17 @@ struct _RrTheme { gint grip_width; /* style settings - colors */ - color_rgb *b_color; - color_rgb *cb_focused_color; - color_rgb *cb_unfocused_color; - color_rgb *title_focused_color; - color_rgb *title_unfocused_color; - color_rgb *titlebut_focused_color; - color_rgb *titlebut_unfocused_color; - color_rgb *menu_title_color; - color_rgb *menu_color; - color_rgb *menu_disabled_color; - color_rgb *menu_hilite_color; + RrColor *b_color; + RrColor *cb_focused_color; + RrColor *cb_unfocused_color; + RrColor *title_focused_color; + RrColor *title_unfocused_color; + RrColor *titlebut_focused_color; + RrColor *titlebut_unfocused_color; + RrColor *menu_title_color; + RrColor *menu_color; + RrColor *menu_disabled_color; + RrColor *menu_hilite_color; /* style settings - fonts */ gint winfont_height; -- 2.45.2