X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=939098ea4c5271d816e1ed54ac7151f39e6bda81;hb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;hp=10ad5e3b95cec7657ccd229fa4822dcb2f29448e;hpb=de307661b6ce96e61e20a123b00297dbc57d5d85;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index 10ad5e3b..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;
@@ -17,7 +21,7 @@ color_rgb *color_parse(char *colorname)
     XColor xcol;
 
     g_assert(colorname != NULL);
-    // get rgb values from colorname                                  
+    /* get rgb values from colorname */
 
     xcol.red = 0;
     xcol.green = 0;
@@ -50,56 +54,81 @@ color_rgb *color_new(int r, int g, int b)
     return NULL;
 }
 
-//XXX same color could be pointed to twice, this might have to be a refcount
+/*XXX same color could be pointed to twice, this might have to be a refcount*/
 
 void color_free(color_rgb *c)
 {
-    if (c->gc != None)
-        XFreeGC(ob_display, c->gc);
-    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;
-  switch (im->bits_per_pixel) {
-  case 32:
-    if ((render_red_offset != default_red_shift) ||
-        (render_blue_offset != default_blue_shift) ||
-        (render_green_offset != default_green_shift)) {
-      for (y = 0; y < im->height; y++) {
-        for (x = 0; x < im->width; x++) {
-          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);
+    int r, g, b;
+    int x,y;
+    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) ||
+            (render_blue_offset != default_blue_shift) ||
+            (render_green_offset != default_green_shift)) {
+            for (y = 0; y < im->height; y++) {
+                for (x = 0; x < im->width; x++) {
+                    r = (data[x] >> default_red_shift) & 0xFF;
+                    g = (data[x] >> default_green_shift) & 0xFF;
+                    b = (data[x] >> default_blue_shift) & 0xFF;
+                    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++) {
+            for (x = 0; x < im->width; x++) {
+                r = (data[x] >> default_red_shift) & 0xFF;
+                r = r >> render_red_shift;
+                g = (data[x] >> default_green_shift) & 0xFF;
+                g = g >> render_green_shift;
+                b = (data[x] >> default_blue_shift) & 0xFF;
+                b = b >> render_blue_shift;
+                p16[x] = (r << render_red_offset)
+                    + (g << render_green_offset)
+                    + (b << render_blue_offset);
+            }
+            data += im->width;
+            p16 += im->bytes_per_line/2;
+        }
+    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;
-  case 16:
-    for (y = 0; y < im->height; y++) {
-      for (x = 0; x < im->width; x++) {
-        r = (data[x] >> default_red_shift) & 0xFF;
-        r = r >> render_red_shift;
-        g = (data[x] >> default_green_shift) & 0xFF;
-        g = g >> render_green_shift;
-        b = (data[x] >> default_blue_shift) & 0xFF;
-        b = b >> render_blue_shift;
-        p[x] = (r << render_red_offset)
-             + (g << render_green_offset)
-             + (b << render_blue_offset);
-      }
-      data += im->width;
-      p += im->bytes_per_line/2;
+    default:
+        g_message("your bit depth is currently unhandled\n");
     }
-    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];
 }