X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=939098ea4c5271d816e1ed54ac7151f39e6bda81;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=0d3f81321a6c64c129b9e57e51c9cdc376a08f52;hpb=0a69cfc6d2cf672634e95d5eb2015434dd924abc;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index 0d3f8132..939098ea 100644
--- a/render/color.c
+++ b/render/color.c
@@ -3,6 +3,10 @@
 #include "render.h"
 #include "color.h"
 #include "../kernel/openbox.h"
+
+XColor *pseudo_colors;
+int pseudo_bpc;
+
 void color_allocate_gc(color_rgb *in)
 {
     XGCValues gcv;
@@ -54,18 +58,20 @@ color_rgb *color_new(int r, int g, int b)
 
 void color_free(color_rgb *c)
 {
-    if (c->gc != None)
-        XFreeGC(ob_display, c->gc);
-    g_free(c);
+    if (c != NULL) {
+        if (c->gc != None)
+            XFreeGC(ob_display, c->gc);
+        g_free(c);
+    }
 }
 
 void reduce_depth(pixel32 *data, XImage *im)
 {
-    /* since pixel32 is the largest possible pixel size, we can share the
-       array*/
     int r, g, b;
     int x,y;
-    pixel16 *p = (pixel16*) data;
+    pixel32 *p32 = (pixel32 *) im->data;
+    pixel16 *p16 = (pixel16 *) im->data;
+    unsigned char *p8 = (unsigned char *)im->data;
     switch (im->bits_per_pixel) {
     case 32:
         if ((render_red_offset != default_red_shift) ||
@@ -76,12 +82,14 @@ void reduce_depth(pixel32 *data, XImage *im)
                     r = (data[x] >> default_red_shift) & 0xFF;
                     g = (data[x] >> default_green_shift) & 0xFF;
                     b = (data[x] >> default_blue_shift) & 0xFF;
-                    data[x] = (r << render_red_offset) + (g << render_green_offset) +
-                        (b << render_blue_offset);
+                    p32[x] = (r << render_red_offset)
+                           + (g << render_green_offset)
+                           + (b << render_blue_offset);
                 }
                 data += im->width;
+                p32 += im->width;
             } 
-        }
+        } else im->data = (char*) data;
         break;
     case 16:
         for (y = 0; y < im->height; y++) {
@@ -92,15 +100,35 @@ void reduce_depth(pixel32 *data, XImage *im)
                 g = g >> render_green_shift;
                 b = (data[x] >> default_blue_shift) & 0xFF;
                 b = b >> render_blue_shift;
-                p[x] = (r << render_red_offset)
+                p16[x] = (r << render_red_offset)
                     + (g << render_green_offset)
                     + (b << render_blue_offset);
             }
             data += im->width;
-            p += im->bytes_per_line/2;
+            p16 += im->bytes_per_line/2;
         }
-        break;
+    break;
+    case 8:
+        g_assert(render_visual->class != TrueColor);
+        for (y = 0; y < im->height; y++) {
+            for (x = 0; x < im->width; x++) {
+                p8[x] = pickColor(data[x] >> default_red_shift,
+                       data[x] >> default_green_shift,
+                       data[x] >> default_blue_shift)->pixel;
+        }
+        data += im->width;
+        p8 += im->bytes_per_line;
+  }
+
+    break;
     default:
         g_message("your bit depth is currently unhandled\n");
     }
 }
+XColor *pickColor(int r, int g, int b) 
+{
+  r = (r & 0xff) >> (8-pseudo_bpc);
+  g = (g & 0xff) >> (8-pseudo_bpc);
+  b = (b & 0xff) >> (8-pseudo_bpc);
+  return &pseudo_colors[(r << (2*pseudo_bpc)) + (g << (1*pseudo_bpc)) + b];
+}