// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
#include "rendercolor.hh"
#include "display.hh"
#include "screeninfo.hh"
+#include <cstdio>
+
namespace otk {
std::map<unsigned long, RenderColor::CacheItem*> *RenderColor::_cache = 0;
_red(red),
_green(green),
_blue(blue),
- _gc(0)
+ _allocated(false),
+ _created(false)
{
- create();
}
RenderColor::RenderColor(int screen, RGB rgb)
_red(rgb.r),
_green(rgb.g),
_blue(rgb.b),
- _gc(0)
+ _allocated(false),
+ _created(false)
{
- create();
}
-void RenderColor::create()
+void RenderColor::create() const
{
unsigned long color = _blue | _green << 8 | _red << 16;
- printf("CREATE COLOR: %lx\n", color);
-
// try get a gc from the cache
CacheItem *item = _cache[_screen][color];
if (item) {
_gc = item->gc;
+ _pixel = item->pixel;
++item->count;
} else {
XGCValues gcv;
const ScreenInfo *info = display->screenInfo(_screen);
XColor xcol; // convert from 0-0xff to 0-0xffff
- xcol.red = _red; xcol.red |= xcol.red << 8;
- xcol.green = _green; xcol.green |= xcol.green << 8;
- xcol.blue = _blue; xcol.blue |= xcol.blue << 8;
+ xcol.red = (_red << 8) | _red;
+ xcol.green = (_green << 8) | _green;
+ xcol.blue = (_blue << 8) | _blue;
xcol.pixel = 0;
- if (! XAllocColor(**display, info->colormap(), &xcol)) {
+ if (!XAllocColor(**display, info->colormap(), &xcol)) {
fprintf(stderr, "RenderColor: color alloc error: rgb:%x/%x/%x\n",
_red, _green, _blue);
xcol.pixel = 0;
- }
+ } else
+ _allocated = true;
_pixel = xcol.pixel;
gcv.foreground = _pixel;
assert(_gc);
// insert into the cache
- item = new CacheItem(_gc);
+ item = new CacheItem(_gc, _pixel);
_cache[_screen][color] = item;
++item->count;
}
+
+ _created = true;
+}
+
+unsigned long RenderColor::pixel() const
+{
+ if (!_created) create();
+ return _pixel;
+}
+
+GC RenderColor::gc() const
+{
+ if (!_created) create();
+ return _gc;
}
RenderColor::~RenderColor()
{
unsigned long color = _blue | _green << 8 | _red << 16;
- CacheItem *item = _cache[_screen][color];
- assert(item); // it better be in the cache ...
+ if (_created) {
+ CacheItem *item = _cache[_screen][color];
+ assert(item); // better be...
- printf("DESTROY COLOR: %lx %d\n", color, item->count);
-
- 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;
+
+ if (_allocated) {
+ const ScreenInfo *info = display->screenInfo(_screen);
+ XFreeColors(**display, info->colormap(), &_pixel, 1, 0);
+ }
+ }
}
}