X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.cc;h=b7aadd0ff5f004a94d6d519e3a96f5bfc2c74a72;hb=1e58c863bbaddd2f2dbebfde740ca842e8837a1c;hp=aabbf85af8bc4d9042734367f6e8d666cbc6fc06;hpb=99cd843fc6dc7a7f55b6c90fd1162f233853aad2;p=chaz%2Fopenbox

diff --git a/otk/surface.cc b/otk/surface.cc
index aabbf85a..b7aadd0f 100644
--- 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,21 +26,38 @@ 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((unsigned)image->width == _size.width());
-  assert((unsigned)image->height == _size.height());
+  assert(_pixel_data);
+  assert(image->width == _size.width());
+  assert(image->height == _size.height());
   
   if (_pixmap == None)
     createObjects();