X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=485b3d664a0f9cb3dec93912ede0bcf4d16838bc;hb=7043ce904bd0699df4c2d2c94333d911a06b7445;hp=d16bbf0cdd93b8e06cc2eee2664f2f6ea2fe5edf;hpb=5be0a82a353b67160142134de1cc51fa31d72759;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index d16bbf0c..485b3d66 100644
--- a/render/color.c
+++ b/render/color.c
@@ -1,5 +1,25 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   color.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "render.h"
 #include "color.h"
+#include "instance.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -34,33 +54,61 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname)
     return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
 }
 
+/*#define NO_COLOR_CACHE*/
+#ifdef DEBUG
+gint id;
+#endif
+
 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);
+#ifndef NO_COLOR_CACHE
+    if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) {
+        out->refcount++;
+    } else {
+#endif
+        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;
+#ifdef DEBUG
+            out->id = id++;
+#endif
+#ifndef NO_COLOR_CACHE
+            g_hash_table_insert(RrColorHash(inst), &out->key, out);
+        }
+#endif
     }
     return out;
 }
 
-/*XXX same color could be pointed to twice, this might have to be a refcount*/
-
 void RrColorFree(RrColor *c)
 {
     if (c) {
-        if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc);
-        g_free(c);
+        if (--c->refcount < 1) {
+#ifndef NO_COLOR_CACHE
+            g_assert(g_hash_table_lookup(RrColorHash(c->inst), &c->key));
+            g_hash_table_remove(RrColorHash(c->inst), &c->key);
+#endif
+            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);
+        }
     }
 }
 
@@ -257,3 +305,10 @@ gulong RrColorPixel(const RrColor *c)
 {
     return c->pixel;
 }
+
+GC RrColorGC(RrColor *c)
+{
+    if (!c->gc)
+        RrColorAllocateGC(c);
+    return c->gc;
+}