X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercolor.cc;h=e5cbb7cba45d8b99a55387adde6a59b27c5729f9;hb=d2adccbe2880e7d5b2cb39d833877cfddeff11f4;hp=31823341c7e61bfae81851544ceca1eef2a59c43;hpb=a0738a0197b23d1bb2b2a58ae8d82a998fbf2d99;p=chaz%2Fopenbox

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index 31823341..e5cbb7cb 100644
--- a/otk/rendercolor.cc
+++ b/otk/rendercolor.cc
@@ -5,6 +5,7 @@
 #include "rendercolor.hh"
 #include "display.hh"
 #include "screeninfo.hh"
+#include "rendercontrol.hh"
 
 #include <cstdio>
 
@@ -28,9 +29,9 @@ RenderColor::RenderColor(int screen, unsigned char red,
     _red(red),
     _green(green),
     _blue(blue),
-    _gc(0)
+    _allocated(false),
+    _created(false)
 {
-  create();
 }
 
 RenderColor::RenderColor(int screen, RGB rgb)
@@ -38,12 +39,12 @@ 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;
   
@@ -61,16 +62,12 @@ void RenderColor::create()
     const ScreenInfo *info = display->screenInfo(_screen);
 
     XColor xcol;    // convert from 0-0xff to 0-0xffff
-    xcol.red = _red << 8 | _red;
-    xcol.green = _green << 8 | _green;
-    xcol.blue = _blue << 8 | _blue;
-    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;
-    }
+    xcol.red = (_red << 8) | _red;
+    xcol.green = (_green << 8) | _green;
+    xcol.blue = (_blue << 8) | _blue;
+
+    display->renderControl(_screen)->allocateColor(&xcol);
+    _allocated = true;
 
     _pixel = xcol.pixel;
     gcv.foreground = _pixel;
@@ -84,20 +81,41 @@ void RenderColor::create()
     _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...
+
+    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);
+      }
+    }
   }
 }