// -*- 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 "rendercontrol.hh"
+
+#include <cstdio>
namespace otk {
: _screen(screen),
_red(red),
_green(green),
- _blue(blue),
- _gc(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)
+ _blue(blue)
{
create();
}
: _screen(screen),
_red(rgb.r),
_green(rgb.g),
- _blue(rgb.b),
- _gc(0)
+ _blue(rgb.b)
{
create();
}
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.pixel = 0;
-
- if (! XAllocColor(**display, info->colormap(), &xcol)) {
- fprintf(stderr, "RenderColor: color alloc error: rgb:%x/%x/%x\n",
- _red, _green, _blue);
- xcol.pixel = 0;
- }
-
- gcv.foreground = xcol.pixel;
+ xcol.red = (_red << 8) | _red;
+ xcol.green = (_green << 8) | _green;
+ xcol.blue = (_blue << 8) | _blue;
+
+ display->renderControl(_screen)->allocateColor(&xcol);
+
+ _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 ...
+ CacheItem *item = _cache[_screen][color];
+ assert(item); // better be...
+
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);
}
}