X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=d16bbf0cdd93b8e06cc2eee2664f2f6ea2fe5edf;hb=c34ef4028e504b8ce862b9c2e47b284ab66717dd;hp=b9bafe32fefd06f3d0ccd3d1e24de44cbe7591d8;hpb=a18c1697b1176c26e74267f2ac7a153a2cf2c442;p=chaz%2Fopenbox diff --git a/render/color.c b/render/color.c index b9bafe32..d16bbf0c 100644 --- a/render/color.c +++ b/render/color.c @@ -1,23 +1,22 @@ -#include -#include -#include #include "render.h" #include "color.h" -#include "../kernel/openbox.h" -XColor *pseudo_colors; -int pseudo_bpc; +#include +#include +#include -void color_allocate_gc(color_rgb *in) +void RrColorAllocateGC(RrColor *in) { XGCValues gcv; gcv.foreground = in->pixel; gcv.cap_style = CapProjecting; - in->gc = XCreateGC(ob_display, ob_root, GCForeground | GCCapStyle, &gcv); + in->gc = XCreateGC(RrDisplay(in->inst), + RrRootWindow(in->inst), + GCForeground | GCCapStyle, &gcv); } -color_rgb *color_parse(char *colorname) +RrColor *RrColorParse(const RrInstance *inst, gchar *colorname) { XColor xcol; @@ -28,64 +27,63 @@ color_rgb *color_parse(char *colorname) xcol.green = 0; xcol.blue = 0; xcol.pixel = 0; - if (!XParseColor(ob_display, render_colormap, colorname, &xcol)) { + if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) { g_warning("unable to parse color '%s'", colorname); return NULL; } - return color_new(xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8); + return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8); } -color_rgb *color_new(int r, int g, int b) +RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) { -/* this should be replaced with something far cooler */ - color_rgb *out; + /* this should be replaced with something far cooler */ + RrColor *out = NULL; XColor xcol; xcol.red = (r << 8) | r; xcol.green = (g << 8) | g; xcol.blue = (b << 8) | b; - if (XAllocColor(ob_display, render_colormap, &xcol)) { - out = g_new(color_rgb, 1); + if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) { + out = g_new(RrColor, 1); + out->inst = inst; out->r = xcol.red >> 8; out->g = xcol.green >> 8; out->b = xcol.blue >> 8; out->gc = None; out->pixel = xcol.pixel; - return out; } - return NULL; + return out; } /*XXX same color could be pointed to twice, this might have to be a refcount*/ -void color_free(color_rgb *c) +void RrColorFree(RrColor *c) { - if (c != NULL) { - if (c->gc != None) - XFreeGC(ob_display, c->gc); + if (c) { + if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc); g_free(c); } } -void reduce_depth(pixel32 *data, XImage *im) +void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) { int r, g, b; int x,y; - pixel32 *p32 = (pixel32 *) im->data; - pixel16 *p16 = (pixel16 *) im->data; + RrPixel32 *p32 = (RrPixel32 *) im->data; + RrPixel16 *p16 = (RrPixel16 *) im->data; unsigned char *p8 = (unsigned char *)im->data; switch (im->bits_per_pixel) { case 32: - if ((render_red_offset != default_red_offset) || - (render_blue_offset != default_blue_offset) || - (render_green_offset != default_green_offset)) { + if ((RrRedOffset(inst) != RrDefaultRedOffset) || + (RrBlueOffset(inst) != RrDefaultBlueOffset) || + (RrGreenOffset(inst) != RrDefaultGreenOffset)) { for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { - r = (data[x] >> default_red_offset) & 0xFF; - g = (data[x] >> default_green_offset) & 0xFF; - b = (data[x] >> default_blue_offset) & 0xFF; - p32[x] = (r << render_red_shift) - + (g << render_green_shift) - + (b << render_blue_shift); + r = (data[x] >> RrDefaultRedOffset) & 0xFF; + g = (data[x] >> RrDefaultGreenOffset) & 0xFF; + b = (data[x] >> RrDefaultBlueOffset) & 0xFF; + p32[x] = (r << RrRedOffset(inst)) + + (g << RrGreenOffset(inst)) + + (b << RrBlueOffset(inst)); } data += im->width; p32 += im->width; @@ -95,27 +93,28 @@ void reduce_depth(pixel32 *data, XImage *im) case 16: for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { - r = (data[x] >> default_red_offset) & 0xFF; - r = r >> render_red_shift; - g = (data[x] >> default_green_offset) & 0xFF; - g = g >> render_green_shift; - b = (data[x] >> default_blue_offset) & 0xFF; - b = b >> render_blue_shift; - p16[x] = (r << render_red_offset) - + (g << render_green_offset) - + (b << render_blue_offset); + 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); + p16[x] = (r << RrRedOffset(inst)) + + (g << RrGreenOffset(inst)) + + (b << RrBlueOffset(inst)); } data += im->width; p16 += im->bytes_per_line/2; } break; case 8: - g_assert(render_visual->class != TrueColor); + g_assert(RrVisual(inst)->class != TrueColor); for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { - p8[x] = pickColor(data[x] >> default_red_offset, - data[x] >> default_green_offset, - data[x] >> default_blue_offset)->pixel; + p8[x] = RrPickColor(inst, + data[x] >> RrDefaultRedOffset, + data[x] >> RrDefaultGreenOffset, + data[x] >> RrDefaultBlueOffset)->pixel; } data += im->width; p8 += im->bytes_per_line; @@ -123,24 +122,24 @@ void reduce_depth(pixel32 *data, XImage *im) break; default: - g_message("your bit depth is currently unhandled\n"); + g_warning("your bit depth is currently unhandled\n"); } } -XColor *pickColor(int r, int g, int b) +XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint 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]; + r = (r & 0xff) >> (8-RrPseudoBPC(inst)); + g = (g & 0xff) >> (8-RrPseudoBPC(inst)); + b = (b & 0xff) >> (8-RrPseudoBPC(inst)); + return &RrPseudoColors(inst)[(r << (2*RrPseudoBPC(inst))) + + (g << (1*RrPseudoBPC(inst))) + + b]; } static void swap_byte_order(XImage *im) { int x, y, di; - g_message("SWAPPING BYTE ORDER"); - di = 0; for (y = 0; y < im->height; ++y) { for (x = 0; x < im->height; ++x) { @@ -159,7 +158,7 @@ static void swap_byte_order(XImage *im) case 8: break; default: - g_message("your bit depth is currently unhandled\n"); + g_warning("your bit depth is currently unhandled"); } } di += im->bytes_per_line; @@ -171,28 +170,28 @@ static void swap_byte_order(XImage *im) im->byte_order = LSBFirst; } -void increase_depth(pixel32 *data, XImage *im) +void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) { int r, g, b; int x,y; - pixel32 *p32 = (pixel32 *) im->data; - pixel16 *p16 = (pixel16 *) im->data; + RrPixel32 *p32 = (RrPixel32 *) im->data; + RrPixel16 *p16 = (RrPixel16 *) im->data; unsigned char *p8 = (unsigned char *)im->data; - if (im->byte_order != render_endian) + if (im->byte_order != LSBFirst) swap_byte_order(im); switch (im->bits_per_pixel) { case 32: for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { - r = (p32[x] >> render_red_offset) & 0xff; - g = (p32[x] >> render_green_offset) & 0xff; - b = (p32[x] >> render_blue_offset) & 0xff; - data[x] = (r << default_red_offset) - + (g << default_green_offset) - + (b << default_blue_offset) - + (0xff << default_alpha_offset); + r = (p32[x] >> RrRedOffset(inst)) & 0xff; + g = (p32[x] >> RrGreenOffset(inst)) & 0xff; + b = (p32[x] >> RrBlueOffset(inst)) & 0xff; + data[x] = (r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (0xff << RrDefaultAlphaOffset); } data += im->width; p32 += im->bytes_per_line/4; @@ -201,63 +200,60 @@ void increase_depth(pixel32 *data, XImage *im) case 16: for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { - r = (p16[x] & render_red_mask) >> render_red_offset << - render_red_shift; - g = (p16[x] & render_green_mask) >> render_green_offset << - render_green_shift; - b = (p16[x] & render_blue_mask) >> render_blue_offset << - render_blue_shift; - data[x] = (r << default_red_offset) - + (g << default_green_offset) - + (b << default_blue_offset) - + (0xff << default_alpha_offset); + r = (p16[x] & RrRedMask(inst)) >> + RrRedOffset(inst) << + RrRedShift(inst); + g = (p16[x] & RrGreenMask(inst)) >> + RrGreenOffset(inst) << + RrGreenShift(inst); + b = (p16[x] & RrBlueMask(inst)) >> + RrBlueOffset(inst) << + RrBlueShift(inst); + data[x] = (r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (0xff << RrDefaultAlphaOffset); } data += im->width; p16 += im->bytes_per_line/2; } break; case 8: - g_assert(render_visual->class != TrueColor); + g_warning("this image bit depth is currently unhandled"); + break; + case 1: for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { - XColor icolor; - int ii, r, g, b; - gulong dev, closest = 0xffffffff, close = 0; + if (!(((p8[x / 8]) >> (x % 8)) & 0x1)) + data[x] = 0xff << RrDefaultAlphaOffset; /* black */ + else + data[x] = 0xffffffff; /* white */ + } + data += im->width; + p8 += im->bytes_per_line; + } + break; + default: + g_warning("this image bit depth is currently unhandled"); + } +} - icolor.pixel = p8[x]; - XQueryColor(ob_display, render_colormap, &icolor); +int RrColorRed(const RrColor *c) +{ + return c->r; +} - /* find the nearest color match */ - for (ii = 0; ii < pseudo_ncolors(); ii++) { - /* find deviations */ - r = (pseudo_colors[ii].red - icolor.red) & 0xff; - g = (pseudo_colors[ii].green - icolor.green) & 0xff; - b = (pseudo_colors[ii].blue - icolor.blue) & 0xff; - /* find a weighted absolute deviation */ - dev = (r * r) * (0xff - (icolor.red & 0xff)) + - (g * g) * (0xff - (icolor.green & 0xff)) + - (b * b) * (0xff - (icolor.blue & 0xff)); +int RrColorGreen(const RrColor *c) +{ + return c->g; +} - if (dev < closest) { - closest = dev; - close = ii; - } - } - data[x] = - (pseudo_colors[close].red & 0xff << - default_red_offset) + - (pseudo_colors[close].green & 0xff << - default_green_offset) + - (pseudo_colors[close].blue & 0xff << - default_blue_offset) + - (0xff << default_alpha_offset); - } - data += im->width; - p8 += im->bytes_per_line; - } +int RrColorBlue(const RrColor *c) +{ + return c->b; +} - break; - default: - g_message("your bit depth is currently unhandled\n"); - } +gulong RrColorPixel(const RrColor *c) +{ + return c->pixel; }