X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercolor.cc;h=36f941c6734d220285407c9423135ac5f8d4f0a8;hb=46441f7d60c008b11a170516734ae7a5932a738e;hp=99dd3341bd25c606416e6c5e5f189bb780712bd1;hpb=0348a2f3abd2334f5f5812c5fb45c1b4fffb46a5;p=chaz%2Fopenbox

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index 99dd3341..36f941c6 100644
--- a/otk/rendercolor.cc
+++ b/otk/rendercolor.cc
@@ -29,14 +29,32 @@ RenderColor::RenderColor(int screen, unsigned char red,
     _green(green),
     _blue(blue),
     _gc(0)
+{
+  create();
+}
+
+RenderColor::RenderColor(int screen, RGB rgb)
+  : _screen(screen),
+    _red(rgb.r),
+    _green(rgb.g),
+    _blue(rgb.b),
+    _gc(0)
+{
+  create();
+}
+
+void RenderColor::create()
 {
   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;
@@ -56,22 +74,29 @@ RenderColor::RenderColor(int screen, unsigned char red,
       xcol.pixel = 0;
     }
 
-    gcv.foreground = xcol.pixel;
-    _gc = XCreateGC(**display, info->rootWindow(), GCForeground, &gcv);
+    _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 ...
 
+  printf("DESTROY COLOR: %lx %d\n", color, item->count);
+  
   if (--item->count <= 0) {
     // remove from the cache
     XFreeGC(**display, _gc);