move some internal functions from render.h to instance.h

add a color hash table to the RrInstance

diff --git a/render/instance.c b/render/instance.c
index 26ea63c8b6a0ff8ae4504808845ddb4bc14f0469..f037a024c85156b1e1d01e5d685f56710ee11133 100644 (file)
--- 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 53e89d3063675fc72510b8ca3f38b4456ebff097..dcc5cb861635729d508a453916cb59db1bb83a4a 100644 (file)
--- 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 88590713e87f14e7d7d9e9b10b64c7f6350c4d9d..abdf03bb02e3d1cd7ae0c2f8731209e91393b8a4 100644 (file)
--- 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);