diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-09-02 08:37:52 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-09-02 08:37:52 +0000 |
| commit | 92feea765a59a7b3ab3b3c0babda4bfd0cf91d7f (patch) | |
| tree | 7ed092fc7e85a1ed9b69bc4d3634e7911c93e476 /render | |
| parent | 2755cf85fc7d0f088a060f59e4d31b112daeb81d (diff) | |
move some internal functions from render.h to instance.h
add a color hash table to the RrInstance
Diffstat (limited to 'render')
| -rw-r--r-- | render/instance.c | 8 | ||||
| -rw-r--r-- | render/instance.h | 6 | ||||
| -rw-r--r-- | render/render.h | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/render/instance.c b/render/instance.c index 26ea63c8..f037a024 100644 --- a/render/instance.c +++ b/render/instance.c @@ -18,6 +18,8 @@ RrInstance* RrInstanceNew (Display *display, gint screen) definst->pseudo_colors = NULL; + definst->color_hash = g_hash_table_new(g_int_hash, g_int_equal); + switch (definst->visual->class) { case TrueColor: RrTrueColorSetup(definst); @@ -157,6 +159,7 @@ void RrInstanceFree (RrInstance *inst) if (inst) { if (inst == definst) definst = NULL; g_free(inst->pseudo_colors); + g_hash_table_destroy(inst->color_hash); } } @@ -244,3 +247,8 @@ XColor *RrPseudoColors (const RrInstance *inst) { return (inst ? inst : definst)->pseudo_colors; } + +GHashTable* RrColorHash (const RrInstance *inst) +{ + return (inst ? inst : definst)->color_hash; +} diff --git a/render/instance.h b/render/instance.h index 53e89d30..dcc5cb86 100644 --- a/render/instance.h +++ b/render/instance.h @@ -26,6 +26,12 @@ struct _RrInstance { gint pseudo_bpc; XColor *pseudo_colors; + + GHashTable *color_hash; }; +guint RrPseudoBPC (const RrInstance *inst); +XColor* RrPseudoColors (const RrInstance *inst); +GHashTable* RrColorHash (const RrInstance *inst); + #endif diff --git a/render/render.h b/render/render.h index 88590713..abdf03bb 100644 --- a/render/render.h +++ b/render/render.h @@ -164,8 +164,6 @@ gint RrBlueShift (const RrInstance *inst); gint RrRedMask (const RrInstance *inst); gint RrGreenMask (const RrInstance *inst); gint RrBlueMask (const RrInstance *inst); -guint RrPseudoBPC (const RrInstance *inst); -XColor* RrPseudoColors (const RrInstance *inst); RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); RrColor *RrColorParse (const RrInstance *inst, gchar *colorname); |