X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=939098ea4c5271d816e1ed54ac7151f39e6bda81;hb=b77e40e1c7710323aa59a778338d8e18b591f718;hp=1f3892e5a120deba431a963c866eae2f7ca05336;hpb=2870457bf55ca2b755f73b67626532e02d9473b8;p=chaz%2Fopenbox diff --git a/render/color.c b/render/color.c index 1f3892e5..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,9 +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*/ + 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) +{ + 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; + 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]; }