nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the new color hash to cache RrColors

Browse source
This commit is contained in:
Dana Jansens 2003-09-02 08:38:03 +00:00
parent 92feea765a
commit ac9d8c58cb
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
render/color.c
View file

@ -1,5 +1,6 @@
#include "render.h" #include "render.h"
#include "color.h" #include "color.h"
#include "instance.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -39,17 +40,27 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
/* this should be replaced with something far cooler */ /* this should be replaced with something far cooler */
RrColor *out = NULL; RrColor *out = NULL;
XColor xcol; XColor xcol;
xcol.red = (r << 8) | r; gint key;
xcol.green = (g << 8) | g;
xcol.blue = (b << 8) | b; key = (r << 24) + (g << 16) + (b << 8);
if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) { if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) {
out = g_new(RrColor, 1); out->refcount++;
out->inst = inst; } else {
out->r = xcol.red >> 8; xcol.red = (r << 8) | r;
out->g = xcol.green >> 8; xcol.green = (g << 8) | g;
out->b = xcol.blue >> 8; xcol.blue = (b << 8) | b;
out->gc = None; if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) {
out->pixel = xcol.pixel; 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;
g_hash_table_replace(RrColorHash(inst), &out->key, out);
}
} }
return out; return out;
} }
@ -59,10 +70,13 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
void RrColorFree(RrColor *c) void RrColorFree(RrColor *c)
{ {
if (c) { if (c) {
if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst), if (--c->refcount < 1) {
&c->pixel, 1, 0); g_hash_table_remove(RrColorHash(c->inst), &c->key);
if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc); if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst),
g_free(c); &c->pixel, 1, 0);
if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc);
g_free(c);
}
} }
} }

3
render/color.h
View file

@ -15,6 +15,9 @@ struct _RrColor {
int b; int b;
unsigned long pixel; unsigned long pixel;
GC gc; GC gc;
gint key;
gint refcount;
}; };
void RrColorAllocateGC(RrColor *in); void RrColorAllocateGC(RrColor *in);