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

alloc colors only when needed, and free them properly on destruction

Browse source
This commit is contained in:
Dana Jansens 2003-02-13 04:50:57 +00:00
parent 8ad1d0bb99
commit e451c08ac5
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
otk/rendercolor.cc
View file

@ -28,9 +28,8 @@ RenderColor::RenderColor(int screen, unsigned char red,
_red(red), _red(red),
_green(green), _green(green),
_blue(blue), _blue(blue),
_gc(0) _allocated(false)
{ {
create();
} }
RenderColor::RenderColor(int screen, RGB rgb) RenderColor::RenderColor(int screen, RGB rgb)
@ -38,12 +37,11 @@ RenderColor::RenderColor(int screen, RGB rgb)
_red(rgb.r), _red(rgb.r),
_green(rgb.g), _green(rgb.g),
_blue(rgb.b), _blue(rgb.b),
_gc(0) _allocated(false)
{ {
create();
} }
void RenderColor::create() void RenderColor::create() const
{ {
unsigned long color = _blue | _green << 8 | _red << 16; unsigned long color = _blue | _green << 8 | _red << 16;
@ -84,6 +82,20 @@ void RenderColor::create()
_cache[_screen][color] = item; _cache[_screen][color] = item;
++item->count; ++item->count;
} }
_allocated = true;
}
unsigned long RenderColor::pixel() const
{
if (!_allocated) create();
return _pixel;
}
GC RenderColor::gc() const
{
if (!_allocated) create();
return _gc;
} }
RenderColor::~RenderColor() RenderColor::~RenderColor()
@ -91,13 +103,17 @@ RenderColor::~RenderColor()
unsigned long color = _blue | _green << 8 | _red << 16; unsigned long color = _blue | _green << 8 | _red << 16;
CacheItem *item = _cache[_screen][color]; CacheItem *item = _cache[_screen][color];
assert(item); // it better be in the cache ...
if (item) {
if (--item->count <= 0) { if (--item->count <= 0) {
// remove from the cache // remove from the cache
XFreeGC(**display, _gc); XFreeGC(**display, _gc);
_cache[_screen][color] = 0; _cache[_screen][color] = 0;
delete item; delete item;
const ScreenInfo *info = display->screenInfo(_screen);
XFreeColors(**display, info->colormap(), &_pixel, 1, 0);
}
} }
} }