X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=a247673f4532ef9bfe69f0eade9750909996b71d;hb=7c1a00802326a608bc1baeb67731a9ab3eda8ba6;hp=48cd631e25a784ad442f272b526438af6072dc46;hpb=fffc89c226484d058dc31188163b0a6653ece0ec;p=chaz%2Fopenbox diff --git a/render/color.c b/render/color.c index 48cd631e..a247673f 100644 --- a/render/color.c +++ b/render/color.c @@ -1,3 +1,23 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + color.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens + Copyright (c) 2003 Derek Foreman + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "render.h" #include "color.h" #include "instance.h" @@ -29,12 +49,17 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname) xcol.blue = 0; xcol.pixel = 0; if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) { - g_warning("unable to parse color '%s'", colorname); - return NULL; + g_message("Unable to parse color '%s'", colorname); + return NULL; } return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8); } +/*#define NO_COLOR_CACHE*/ +#ifdef DEBUG +gint id; +#endif + RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) { /* this should be replaced with something far cooler */ @@ -42,10 +67,16 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) XColor xcol; gint key; + g_assert(r >= 0 && r < 256); + g_assert(g >= 0 && g < 256); + g_assert(b >= 0 && b < 256); + key = (r << 24) + (g << 16) + (b << 8); +#ifndef NO_COLOR_CACHE if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) { out->refcount++; } else { +#endif xcol.red = (r << 8) | r; xcol.green = (g << 8) | g; xcol.blue = (b << 8) | b; @@ -59,8 +90,13 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) out->pixel = xcol.pixel; out->key = key; out->refcount = 1; - g_hash_table_replace(RrColorHash(inst), &out->key, out); +#ifdef DEBUG + out->id = id++; +#endif +#ifndef NO_COLOR_CACHE + g_hash_table_insert(RrColorHash(inst), &out->key, out); } +#endif } return out; } @@ -69,7 +105,10 @@ void RrColorFree(RrColor *c) { if (c) { if (--c->refcount < 1) { +#ifndef NO_COLOR_CACHE + g_assert(g_hash_table_lookup(RrColorHash(c->inst), &c->key)); g_hash_table_remove(RrColorHash(c->inst), &c->key); +#endif if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst), &c->pixel, 1, 0); if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc); @@ -80,11 +119,11 @@ void RrColorFree(RrColor *c) void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) { - int r, g, b; - int x,y; + gint r, g, b; + gint x,y; RrPixel32 *p32 = (RrPixel32 *) im->data; RrPixel16 *p16 = (RrPixel16 *) im->data; - unsigned char *p8 = (unsigned char *)im->data; + RrPixel8 *p8 = (RrPixel8 *) im->data; switch (im->bits_per_pixel) { case 32: if ((RrRedOffset(inst) != RrDefaultRedOffset) || @@ -102,7 +141,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) data += im->width; p32 += im->width; } - } else im->data = (char*) data; + } else im->data = (gchar*) data; break; case 16: for (y = 0; y < im->height; y++) { @@ -120,23 +159,40 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) data += im->width; p16 += im->bytes_per_line/2; } - break; + break; case 8: - g_assert(RrVisual(inst)->class != TrueColor); - for (y = 0; y < im->height; y++) { - for (x = 0; x < im->width; x++) { - p8[x] = RrPickColor(inst, - data[x] >> RrDefaultRedOffset, - data[x] >> RrDefaultGreenOffset, - data[x] >> RrDefaultBlueOffset)->pixel; + if (RrVisual(inst)->class == TrueColor) { + for (y = 0; y < im->height; y++) { + for (x = 0; x < im->width; x++) { + 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); + p8[x] = (r << RrRedOffset(inst)) + + (g << RrGreenOffset(inst)) + + (b << RrBlueOffset(inst)); + } + data += im->width; + p8 += im->bytes_per_line; + } + } else { + for (y = 0; y < im->height; y++) { + for (x = 0; x < im->width; x++) { + p8[x] = RrPickColor(inst, + data[x] >> RrDefaultRedOffset, + data[x] >> RrDefaultGreenOffset, + data[x] >> RrDefaultBlueOffset)->pixel; + } + data += im->width; + p8 += im->bytes_per_line; + } } - data += im->width; - p8 += im->bytes_per_line; - } - - break; + break; default: - g_warning("your bit depth is currently unhandled\n"); + g_error("Your bit depth is currently unhandled\n"); + } } @@ -152,13 +208,13 @@ XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) static void swap_byte_order(XImage *im) { - int x, y, di; + gint x, y, di; di = 0; for (y = 0; y < im->height; ++y) { for (x = 0; x < im->height; ++x) { - char *c = &im->data[di + x * im->bits_per_pixel / 8]; - char t; + gchar *c = &im->data[di + x * im->bits_per_pixel / 8]; + gchar t; switch (im->bits_per_pixel) { case 32: @@ -170,9 +226,11 @@ static void swap_byte_order(XImage *im) c[0] = c[1]; c[1] = t; case 8: + case 1: break; default: - g_warning("your bit depth is currently unhandled"); + g_error("Your bit depth (%i) is currently unhandled", + im->bits_per_pixel); } } di += im->bytes_per_line; @@ -186,11 +244,11 @@ static void swap_byte_order(XImage *im) void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) { - int r, g, b; - int x,y; + gint r, g, b; + gint x,y; RrPixel32 *p32 = (RrPixel32 *) im->data; RrPixel16 *p16 = (RrPixel16 *) im->data; - unsigned char *p8 = (unsigned char *)im->data; + guchar *p8 = (guchar *)im->data; if (im->byte_order != LSBFirst) swap_byte_order(im); @@ -233,7 +291,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) } break; case 8: - g_warning("this image bit depth is currently unhandled"); + g_error("This image bit depth (%i) is currently unhandled", 8); break; case 1: for (y = 0; y < im->height; y++) { @@ -248,21 +306,22 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) } break; default: - g_warning("this image bit depth is currently unhandled"); + g_error("This image bit depth (%i) is currently unhandled", + im->bits_per_pixel); } } -int RrColorRed(const RrColor *c) +gint RrColorRed(const RrColor *c) { return c->r; } -int RrColorGreen(const RrColor *c) +gint RrColorGreen(const RrColor *c) { return c->g; } -int RrColorBlue(const RrColor *c) +gint RrColorBlue(const RrColor *c) { return c->b; } @@ -272,8 +331,7 @@ gulong RrColorPixel(const RrColor *c) return c->pixel; } -GC RrColorGC(RrColor *c) /* XXX make this const RrColor* when the GCs are in - a cache.. if possible? */ +GC RrColorGC(RrColor *c) { if (!c->gc) RrColorAllocateGC(c);