better handling of maximizing, wrt changing decorations on the windows, and showing...

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index 564fb7cf8edbfba6aad93a5060a09e7f98155a66..d16bbf0cdd93b8e06cc2eee2664f2f6ea2fe5edf 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -1,11 +1,9 @@
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <string.h>
 #include "render.h"
 #include "color.h"
 
-XColor *pseudo_colors;
-int pseudo_bpc;
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <string.h>
 
 void RrColorAllocateGC(RrColor *in)
 {
@@ -83,9 +81,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 +122,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 +140,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 +158,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 +178,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 +219,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 +234,26 @@ 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;
+}