set the log domain for each plugin properly

[chaz/openbox] / otk / surface.cc

diff --git a/otk/surface.cc b/otk/surface.cc
index 60e6824cd50e037fe63d8180710adb68badb0970..cc2255030d660f3aca605fedd0f17c9d1eb0cd5c 100644 (file)
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -1,8 +1,6 @@
 // -*- 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 "surface.hh"
 #include "display.hh"
@@ -11,6 +9,7 @@
 
 extern "C" {
 #include <X11/Xutil.h>
+#include <cstring>
 }
 
 namespace otk {
@@ -18,6 +17,7 @@ namespace otk {
 Surface::Surface(int screen, const Size &size)
   : _screen(screen),
     _size(size),
+    _pixel_data(new pixel32[size.width()*size.height()]),
     _pixmap(None),
     _xftdraw(0)
 {
@@ -26,19 +26,36 @@ Surface::Surface(int screen, const Size &size)
 Surface::~Surface()
 {
   destroyObjects();
+  freePixelData();
+}
+
+void Surface::freePixelData()
+{
+  if (_pixel_data) {
+    delete [] _pixel_data;
+    _pixel_data = 0;
+  }
 }
 
 void Surface::setPixmap(const RenderColor &color)
 {
+  assert(_pixel_data);
   if (_pixmap == None)
     createObjects();
-
+  
   XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
                  _size.width(), _size.height());
+
+  pixel32 val = (color.red() << default_red_shift) |
+    (color.green() << default_green_shift) |
+    (color.blue() << default_blue_shift);
+  for (unsigned int i = 0, s = _size.width() * _size.height(); i < s; ++i)
+    _pixel_data[i] = val;
 }
 
 void Surface::setPixmap(XImage *image)
 {
+  assert(_pixel_data);
   assert(image->width == _size.width());
   assert(image->height == _size.height());