alloc colors only when needed, and free them properly on destruction
Dana Jansens danakj@orodu.net
1 files changed,
27 insertions(+),
11 deletions(-)
jump to
M
otk/rendercolor.cc
→
otk/rendercolor.cc
@@ -28,9 +28,8 @@ : _screen(screen),
_red(red), _green(green), _blue(blue), - _gc(0) + _allocated(false) { - create(); } RenderColor::RenderColor(int screen, RGB rgb)@@ -38,12 +37,11 @@ : _screen(screen),
_red(rgb.r), _green(rgb.g), _blue(rgb.b), - _gc(0) + _allocated(false) { - create(); } -void RenderColor::create() +void RenderColor::create() const { unsigned long color = _blue | _green << 8 | _red << 16;@@ -84,6 +82,20 @@ item = new CacheItem(_gc, _pixel);
_cache[_screen][color] = item; ++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()@@ -91,13 +103,17 @@ {
unsigned long color = _blue | _green << 8 | _red << 16; CacheItem *item = _cache[_screen][color]; - assert(item); // it better be in the cache ... + + if (item) { + if (--item->count <= 0) { + // remove from the cache + XFreeGC(**display, _gc); + _cache[_screen][color] = 0; + delete item; - if (--item->count <= 0) { - // remove from the cache - XFreeGC(**display, _gc); - _cache[_screen][color] = 0; - delete item; + const ScreenInfo *info = display->screenInfo(_screen); + XFreeColors(**display, info->colormap(), &_pixel, 1, 0); + } } }