X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=0d3f81321a6c64c129b9e57e51c9cdc376a08f52;hb=07a52aeaff0d8f429d9a740f49a85f22d51cf597;hp=0cf7b226b2529d5fe4705ba455aa27199ce17130;hpb=fdabd3daf9c631f53408d82c9168705dc6a2832a;p=chaz%2Fopenbox diff --git a/render/color.c b/render/color.c index 0cf7b226..0d3f8132 100644 --- a/render/color.c +++ b/render/color.c @@ -17,7 +17,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,11 +50,57 @@ 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); + 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); + } + data += im->width; + } + } + 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; + } + break; + default: + g_message("your bit depth is currently unhandled\n"); + } }