set the log domain for each plugin properly

[chaz/openbox] / otk / rendercolor.cc

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index bfc8d46104356135af96b526528b72c985a12871..5da218ea92f84f101620240714e270ab89be83e8 100644 (file)
--- a/otk/rendercolor.cc
+++ b/otk/rendercolor.cc
@@ -1,12 +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 "rendercontrol.hh"
+
+#include <cstdio>
 
 namespace otk {
 
@@ -27,8 +28,7 @@ RenderColor::RenderColor(int screen, unsigned char red,
   : _screen(screen),
     _red(red),
     _green(green),
-    _blue(blue),
-    _gc(0)
+    _blue(blue)
 {
   create();
 }
@@ -37,8 +37,7 @@ RenderColor::RenderColor(int screen, RGB rgb)
   : _screen(screen),
     _red(rgb.r),
     _green(rgb.g),
-    _blue(rgb.b),
-    _gc(0)
+    _blue(rgb.b)
 {
   create();
 }
@@ -52,6 +51,7 @@ void RenderColor::create()
 
   if (item) {
     _gc = item->gc;
+    _pixel = item->pixel;
     ++item->count;
   } else {
     XGCValues gcv;
@@ -60,40 +60,41 @@ void RenderColor::create()
     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);
   }
 }