X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercolor.cc;h=5917b00732bba72a70ebb08c10946c3deaad1fba;hb=1e46a39dc305fe92b0c0eca1e60e76fded3e5214;hp=b5e037d382272e1a9cd026b09c31a8b0b8625f66;hpb=033e9843bcec8340c9e657fe0f0519f86075424b;p=chaz%2Fopenbox diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc index b5e037d3..5917b007 100644 --- a/otk/rendercolor.cc +++ b/otk/rendercolor.cc @@ -1,13 +1,13 @@ // -*- 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 + namespace otk { std::map *RenderColor::_cache = 0; @@ -52,6 +52,7 @@ void RenderColor::create() if (item) { _gc = item->gc; + _pixel = item->pixel; ++item->count; } else { XGCValues gcv; @@ -79,14 +80,16 @@ void RenderColor::create() 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 ...