X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=358911e155941cbb637f27f975e3e45e62f5230a;hb=261d3193c5258126fda8234a3305180066f0f939;hp=564fb7cf8edbfba6aad93a5060a09e7f98155a66;hpb=33ec08ea2253a1692cac221f49dadda339371f66;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index 564fb7cf..358911e1 100644
--- a/render/color.c
+++ b/render/color.c
@@ -1,11 +1,10 @@
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <string.h>
 #include "render.h"
 #include "color.h"
+#include "instance.h"
 
-XColor *pseudo_colors;
-int pseudo_bpc;
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <string.h>
 
 void RrColorAllocateGC(RrColor *in)
 {
@@ -41,28 +40,41 @@ 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;
 }
 
-/*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) {
+            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);
+        }
     }
 }
 
@@ -83,9 +95,9 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
                     r = (data[x] >> RrDefaultRedOffset) & 0xFF;
                     g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
                     b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
-                    p32[x] = (r << RrRedShift(inst))
-                           + (g << RrGreenShift(inst))
-                           + (b << RrBlueShift(inst));
+                    p32[x] = (r << RrRedOffset(inst))
+                           + (g << RrGreenOffset(inst))
+                           + (b << RrBlueOffset(inst));
                 }
                 data += im->width;
                 p32 += im->width;
@@ -124,17 +136,17 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
 
     break;
     default:
-        g_message("your bit depth is currently unhandled\n");
+        g_warning("your bit depth is currently unhandled\n");
     }
 }
 
 XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) 
 {
-  r = (r & 0xff) >> (8-pseudo_bpc);
-  g = (g & 0xff) >> (8-pseudo_bpc);
-  b = (b & 0xff) >> (8-pseudo_bpc);
-  return &RrPseudoColors(inst)[(r << (2*pseudo_bpc)) +
-                               (g << (1*pseudo_bpc)) +
+  r = (r & 0xff) >> (8-RrPseudoBPC(inst));
+  g = (g & 0xff) >> (8-RrPseudoBPC(inst));
+  b = (b & 0xff) >> (8-RrPseudoBPC(inst));
+  return &RrPseudoColors(inst)[(r << (2*RrPseudoBPC(inst))) +
+                               (g << (1*RrPseudoBPC(inst))) +
                                b];
 }
 
@@ -142,8 +154,6 @@ static void swap_byte_order(XImage *im)
 {
     int x, y, di;
 
-    g_message("SWAPPING BYTE ORDER");
-
     di = 0;
     for (y = 0; y < im->height; ++y) {
         for (x = 0; x < im->height; ++x) {
@@ -162,7 +172,7 @@ static void swap_byte_order(XImage *im)
             case 8:
                 break;
             default:
-                g_message("your bit depth is currently unhandled\n");
+                g_warning("your bit depth is currently unhandled");
             }
         }
         di += im->bytes_per_line;
@@ -182,7 +192,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
     RrPixel16 *p16 = (RrPixel16 *) im->data;
     unsigned char *p8 = (unsigned char *)im->data;
 
-    if (im->byte_order != RrEndian)
+    if (im->byte_order != LSBFirst)
         swap_byte_order(im);
 
     switch (im->bits_per_pixel) {
@@ -223,7 +233,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         }
         break;
     case 8:
-        g_message("this image bit depth is currently unhandled\n");
+        g_warning("this image bit depth is currently unhandled");
         break;
     case 1:
         for (y = 0; y < im->height; y++) {
@@ -238,6 +248,33 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         }
         break;
     default:
-        g_message("this image bit depth is currently unhandled\n");
+        g_warning("this image bit depth is currently unhandled");
     }
 }
+
+int RrColorRed(const RrColor *c)
+{
+    return c->r;
+}
+
+int RrColorGreen(const RrColor *c)
+{
+    return c->g;
+}
+
+int RrColorBlue(const RrColor *c)
+{
+    return c->b;
+}
+
+gulong RrColorPixel(const RrColor *c)
+{
+    return c->pixel;
+}
+
+GC RrColorGC(RrColor *c)
+{
+    if (!c->gc)
+        RrColorAllocateGC(c);
+    return c->gc;
+}