add mising ()s

[chaz/openbox] / otk / rendercolor.cc

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index 1a95ded992c8063f5beb286271a6973695d81317..7a0b5fcc4fcbb0c0c32ae9338791e341709f8d51 100644 (file)
--- 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 <cstdio>
+
 namespace otk {
 
 std::map<unsigned long, RenderColor::CacheItem*> *RenderColor::_cache = 0;
@@ -29,6 +29,21 @@ 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;
   
@@ -37,6 +52,7 @@ RenderColor::RenderColor(int screen, unsigned char red,
 
   if (item) {
     _gc = item->gc;
+    _pixel = item->pixel;
     ++item->count;
   } else {
     XGCValues gcv;
@@ -45,9 +61,9 @@ RenderColor::RenderColor(int screen, unsigned char red,
     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.red = (_red << 8) | _red;
+    xcol.green = (_green << 8) | _green;
+    xcol.blue = (_blue << 8) | _blue;
     xcol.pixel = 0;
 
     if (! XAllocColor(**display, info->colormap(), &xcol)) {
@@ -56,21 +72,24 @@ RenderColor::RenderColor(int screen, unsigned char red,
       xcol.pixel = 0;
     }
 
-    gcv.foreground = xcol.pixel;
+    _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 ...