X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=41fcc7102f2ad3e92dee21738e222aa2dec5006c;hb=9cf44b41c3f2e2715ed862016a610f5ab9be0e9c;hp=9f053e978bf985902d66059ccf5cc4eb3a17381b;hpb=335e8acbfc5d2824f1fd2cb67a5add8e1ed40b06;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index 9f053e97..41fcc710 100644
--- a/render/color.c
+++ b/render/color.c
@@ -1,7 +1,8 @@
 /* -*- 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) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
    Copyright (c) 2003        Derek Foreman
 
    This program is free software; you can redistribute it and/or modify
@@ -48,7 +49,7 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname)
     xcol.blue = 0;
     xcol.pixel = 0;
     if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) {
-        g_warning("unable to parse color '%s'", colorname);
+        g_message("Unable to parse color '%s'", colorname);
         return NULL;
     }
     return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
@@ -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) ||
@@ -135,7 +140,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
                 }
                 data += im->width;
                 p32 += im->width;
-            } 
+            }
         } else im->data = (gchar*) data;
         break;
     case 16:
@@ -154,27 +159,44 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
             data += im->width;
             p16 += im->bytes_per_line/2;
         }
-    break;
+        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;
+        break;
     default:
-        g_warning("your bit depth is currently unhandled\n");
+        g_error("Your bit depth is currently unhandled\n");
+
     }
 }
 
-XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) 
+XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b)
 {
   r = (r & 0xff) >> (8-RrPseudoBPC(inst));
   g = (g & 0xff) >> (8-RrPseudoBPC(inst));
@@ -204,9 +226,11 @@ static void swap_byte_order(XImage *im)
                 c[0] = c[1];
                 c[1] = t;
             case 8:
+            case 1:
                 break;
             default:
-                g_warning("your bit depth is currently unhandled");
+                g_error("Your bit depth (%i) is currently unhandled",
+                        im->bits_per_pixel);
             }
         }
         di += im->bytes_per_line;
@@ -267,7 +291,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         }
         break;
     case 8:
-        g_warning("this image bit depth is currently unhandled");
+        g_error("This image bit depth (%i) is currently unhandled", 8);
         break;
     case 1:
         for (y = 0; y < im->height; y++) {
@@ -282,7 +306,8 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         }
         break;
     default:
-        g_warning("this image bit depth is currently unhandled");
+        g_error("This image bit depth (%i) is currently unhandled",
+                im->bits_per_pixel);
     }
 }