grow to edge is a move and a resize, oops

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index b485685379c390c427b3900dcadaaf6af2ffaa85..f791b9c48582a16d2fe5581c9d9e9a5603824603 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -1,8 +1,9 @@
+#include "render.h"
+#include "color.h"
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <string.h>
-#include "render.h"
-#include "color.h"
 
 void RrColorAllocateGC(RrColor *in)
 {
@@ -58,6 +59,8 @@ 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);
     }
@@ -80,9 +83,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;
@@ -121,7 +124,7 @@ 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");
     }
 }
 
@@ -139,8 +142,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) {
@@ -159,7 +160,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;
@@ -179,7 +180,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) {
@@ -220,7 +221,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++) {
@@ -235,6 +236,34 @@ 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) /* XXX make this const RrColor* when the GCs are in
+                            a cache.. if possible? */
+{
+    if (!c->gc)
+        RrColorAllocateGC(c);
+    return c->gc;
+}