#include "display.hh"
#include "screeninfo.hh"
+extern "C" {
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+}
+
namespace otk {
std::map<unsigned long, RenderColor::CacheItem*> *RenderColor::_cache = 0;
create();
}
-RenderColor::RenderColor(int screen, unsigned char red,
- unsigned char green, unsigned char blue)
- : _screen(screen),
- _red(red),
- _green(green),
- _blue(blue),
- _gc(0)
-{
- create();
-}
-
RenderColor::RenderColor(int screen, RGB rgb)
: _screen(screen),
_red(rgb.r),
if (item) {
_gc = item->gc;
+ _pixel = item->pixel;
++item->count;
} else {
XGCValues gcv;
xcol.pixel = 0;
}
- gcv.foreground = xcol.pixel;
+ _pixel = xcol.pixel;
+ gcv.foreground = _pixel;
gcv.cap_style = CapProjecting;
_gc = XCreateGC(**display, info->rootWindow(),
GCForeground | GCCapStyle, &gcv);
assert(_gc);
// insert into the cache
- _cache[_screen][color] = new CacheItem(_gc);
+ item = new CacheItem(_gc, _pixel);
+ _cache[_screen][color] = item;
+ ++item->count;
}
}
RenderColor::~RenderColor()
{
unsigned long color = _blue | _green << 8 | _red << 16;
-
+
CacheItem *item = _cache[_screen][color];
assert(item); // it better be in the cache ...