use the new color hash to cache RrColors

diff --git a/render/color.c b/render/color.c
index f791b9c48582a16d2fe5581c9d9e9a5603824603..5fdce39148b9f7722cd0c1ba02e192a9863bca6d 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -1,5 +1,6 @@
 #include "render.h"
 #include "color.h"
+#include "instance.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -39,17 +40,27 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
     /* this should be replaced with something far cooler */
     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(RrColor, 1);
-        out->inst = inst;
-        out->r = xcol.red >> 8;
-        out->g = xcol.green >> 8;
-        out->b = xcol.blue >> 8;
-        out->gc = None;
-        out->pixel = xcol.pixel;
+    gint key;
+
+    key = (r << 24) + (g << 16) + (b << 8);
+    if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) {
+        out->refcount++;
+    } else {
+        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(RrColor, 1);
+            out->inst = inst;
+            out->r = xcol.red >> 8;
+            out->g = xcol.green >> 8;
+            out->b = xcol.blue >> 8;
+            out->gc = None;
+            out->pixel = xcol.pixel;
+            out->key = key;
+            out->refcount = 1;
+            g_hash_table_replace(RrColorHash(inst), &out->key, out);
+        }
     }
     return out;
 }
@@ -59,10 +70,13 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
 void RrColorFree(RrColor *c)
 {
     if (c) {
-        if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst),
-                                  &c->pixel, 1, 0);
-        if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc);
-        g_free(c);
+        if (--c->refcount < 1) {
+            g_hash_table_remove(RrColorHash(c->inst), &c->key);
+            if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst),
+                                      &c->pixel, 1, 0);
+            if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc);
+            g_free(c);
+        }
     }
 }
 

diff --git a/render/color.h b/render/color.h
index 246af1988cf5069f0253b7357538e1668e43b65d..64529292d94aa5269b1b7abcd509e9f7266fc796 100644 (file)
--- a/render/color.h
+++ b/render/color.h
@@ -15,6 +15,9 @@ struct _RrColor {
     int b;
     unsigned long pixel;
     GC gc;
+
+    gint key;
+    gint refcount;
 };
 
 void RrColorAllocateGC(RrColor *in);