X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercolor.cc;h=7a0b5fcc4fcbb0c0c32ae9338791e341709f8d51;hb=6b1381d69daf7c325d4a8165a8b0006d0dce85a5;hp=36f941c6734d220285407c9423135ac5f8d4f0a8;hpb=1b5d52c71669ad1837437deaadc061d8d7cfdd85;p=chaz%2Fopenbox

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index 36f941c6..7a0b5fcc 100644
--- 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;
@@ -47,8 +47,6 @@ 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];
 
@@ -63,9 +61,9 @@ 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.red = (_red << 8) | _red;
+    xcol.green = (_green << 8) | _green;
+    xcol.blue = (_blue << 8) | _blue;
     xcol.pixel = 0;
 
     if (! XAllocColor(**display, info->colormap(), &xcol)) {
@@ -95,8 +93,6 @@ RenderColor::~RenderColor()
   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);