X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=485b3d664a0f9cb3dec93912ede0bcf4d16838bc;hb=7043ce904bd0699df4c2d2c94333d911a06b7445;hp=b485685379c390c427b3900dcadaaf6af2ffaa85;hpb=16066ed282bbc70aa3cefa81a674a8c6e8fe69b8;p=chaz%2Fopenbox diff --git a/render/color.c b/render/color.c index b4856853..485b3d66 100644 --- a/render/color.c +++ b/render/color.c @@ -1,8 +1,29 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + color.c for the Openbox window manager + Copyright (c) 2003 Ben 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" + #include #include #include -#include "render.h" -#include "color.h" void RrColorAllocateGC(RrColor *in) { @@ -33,33 +54,61 @@ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname) 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 */ RrColor *out = NULL; XColor xcol; - xcol.red = (r << 8) | r; - xcol.green = (g << 8) | g; - xcol.blue = (b << 8) | b; - 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; + gint key; + + 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; + 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; + out->key = key; + out->refcount = 1; +#ifdef DEBUG + out->id = id++; +#endif +#ifndef NO_COLOR_CACHE + g_hash_table_insert(RrColorHash(inst), &out->key, out); + } +#endif } return out; } -/*XXX same color could be pointed to twice, this might have to be a refcount*/ - void RrColorFree(RrColor *c) { if (c) { - if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc); - g_free(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); + g_free(c); + } } } @@ -80,9 +129,9 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) r = (data[x] >> RrDefaultRedOffset) & 0xFF; g = (data[x] >> RrDefaultGreenOffset) & 0xFF; b = (data[x] >> RrDefaultBlueOffset) & 0xFF; - p32[x] = (r << RrRedShift(inst)) - + (g << RrGreenShift(inst)) - + (b << RrBlueShift(inst)); + p32[x] = (r << RrRedOffset(inst)) + + (g << RrGreenOffset(inst)) + + (b << RrBlueOffset(inst)); } data += im->width; p32 += im->width; @@ -121,7 +170,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) break; default: - g_message("your bit depth is currently unhandled\n"); + g_warning("your bit depth is currently unhandled\n"); } } @@ -139,8 +188,6 @@ 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 +206,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; @@ -179,7 +226,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) RrPixel16 *p16 = (RrPixel16 *) im->data; unsigned char *p8 = (unsigned char *)im->data; - if (im->byte_order != RrEndian) + if (im->byte_order != LSBFirst) swap_byte_order(im); switch (im->bits_per_pixel) { @@ -220,7 +267,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) } break; case 8: - g_message("this image bit depth is currently unhandled\n"); + g_warning("this image bit depth is currently unhandled"); break; case 1: for (y = 0; y < im->height; y++) { @@ -235,6 +282,33 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) } break; default: - g_message("this image bit depth is currently unhandled\n"); + g_warning("this image bit depth is currently unhandled"); } } + +int RrColorRed(const RrColor *c) +{ + return c->r; +} + +int RrColorGreen(const RrColor *c) +{ + return c->g; +} + +int RrColorBlue(const RrColor *c) +{ + return c->b; +} + +gulong RrColorPixel(const RrColor *c) +{ + return c->pixel; +} + +GC RrColorGC(RrColor *c) +{ + if (!c->gc) + RrColorAllocateGC(c); + return c->gc; +}