fixes for transients

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index c53a366e9eb30cfb1de481ff64bf0db4b24f460e..600fc335553299ab8f6efdb0d38a489d60ea9e8a 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    color.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
    Copyright (c) 2003        Derek Foreman
 
@@ -66,6 +67,10 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
     XColor xcol;
     gint key;
 
+    g_assert(r >= 0 && r < 256);
+    g_assert(g >= 0 && g < 256);
+    g_assert(b >= 0 && b < 256);
+
     key = (r << 24) + (g << 16) + (b << 8);
 #ifndef NO_COLOR_CACHE
     if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) {
@@ -118,7 +123,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
     gint x,y;
     RrPixel32 *p32 = (RrPixel32 *) im->data;
     RrPixel16 *p16 = (RrPixel16 *) im->data;
-    guchar *p8 = (guchar *)im->data;
+    RrPixel8  *p8  = (RrPixel8 *)  im->data;
     switch (im->bits_per_pixel) {
     case 32:
         if ((RrRedOffset(inst) != RrDefaultRedOffset) ||
@@ -156,16 +161,33 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         }
         break;
     case 8:
-        g_assert(RrVisual(inst)->class != TrueColor);
-        for (y = 0; y < im->height; y++) {
-            for (x = 0; x < im->width; x++) {
-                p8[x] = RrPickColor(inst,
-                                    data[x] >> RrDefaultRedOffset,
-                                    data[x] >> RrDefaultGreenOffset,
-                                    data[x] >> RrDefaultBlueOffset)->pixel;
+        if (RrVisual(inst)->class == TrueColor) {
+            for (y = 0; y < im->height; y++) {
+                for (x = 0; x < im->width; x++) {
+                    r = (data[x] >> RrDefaultRedOffset) & 0xFF;
+                    r = r >> RrRedShift(inst);
+                    g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
+                    g = g >> RrGreenShift(inst);
+                    b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
+                    b = b >> RrBlueShift(inst);
+                    p8[x] = (r << RrRedOffset(inst))
+                        + (g << RrGreenOffset(inst))
+                        + (b << RrBlueOffset(inst));
+                }
+                data += im->width;
+                p8 += im->bytes_per_line;
+            }
+        } else {
+            for (y = 0; y < im->height; y++) {
+                for (x = 0; x < im->width; x++) {
+                    p8[x] = RrPickColor(inst,
+                                        data[x] >> RrDefaultRedOffset,
+                                        data[x] >> RrDefaultGreenOffset,
+                                        data[x] >> RrDefaultBlueOffset)->pixel;
+                }
+                data += im->width;
+                p8 += im->bytes_per_line;
             }
-            data += im->width;
-            p8 += im->bytes_per_line;
         }
         break;
     default: