add a keyboard plugin

[chaz/openbox] / otk / rendercolor.cc

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index c8a8c788b91eee01842053dbf32b64f865d9e6fa..5da218ea92f84f101620240714e270ab89be83e8 100644 (file)
--- 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>
 
@@ -27,23 +28,21 @@ RenderColor::RenderColor(int screen, unsigned char red,
   : _screen(screen),
     _red(red),
     _green(green),
-    _blue(blue),
-    _allocated(false),
-    _created(false)
+    _blue(blue)
 {
+  create();
 }
 
 RenderColor::RenderColor(int screen, RGB rgb)
   : _screen(screen),
     _red(rgb.r),
     _green(rgb.g),
-    _blue(rgb.b),
-    _allocated(false),
-    _created(false)
+    _blue(rgb.b)
 {
+  create();
 }
 
-void RenderColor::create() const
+void RenderColor::create()
 {
   unsigned long color = _blue | _green << 8 | _red << 16;
   
@@ -64,14 +63,8 @@ void RenderColor::create() const
     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;
-    } else
-      _allocated = true;
+    display->renderControl(_screen)->allocateColor(&xcol);
 
     _pixel = xcol.pixel;
     gcv.foreground = _pixel;
@@ -85,41 +78,23 @@ void RenderColor::create() const
     _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;
 
-  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 (_allocated) {
-        const ScreenInfo *info = display->screenInfo(_screen);
-        XFreeColors(**display, info->colormap(), &_pixel, 1, 0);
-      }
-    }
+  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);
   }
 }