X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.cc;h=cc2255030d660f3aca605fedd0f17c9d1eb0cd5c;hb=b6ad10764e75923ecb55d3dce96415eb991c64ec;hp=99fa82b04bf7e329569c7e71278378d7c2782b00;hpb=d8d9b42777ace234f3471918e1210062578f8188;p=chaz%2Fopenbox

diff --git a/otk/surface.cc b/otk/surface.cc
index 99fa82b0..cc225503 100644
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -1,23 +1,23 @@
 // -*- 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"
 #include "screeninfo.hh"
-#include "gccache.hh"
+#include "rendercolor.hh"
 
 extern "C" {
 #include <X11/Xutil.h>
+#include <cstring>
 }
 
 namespace otk {
 
-Surface::Surface(int screen, const Point &size)
+Surface::Surface(int screen, const Size &size)
   : _screen(screen),
     _size(size),
+    _pixel_data(new pixel32[size.width()*size.height()]),
     _pixmap(None),
     _xftdraw(0)
 {
@@ -26,29 +26,44 @@ Surface::Surface(int screen, const Point &size)
 Surface::~Surface()
 {
   destroyObjects();
+  freePixelData();
 }
 
-void Surface::setPixmap(const Color &color)
+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());
 
-  Pen p(color);
-  XFillRectangle(**display, _pixmap, p.gc(), 0, 0,
-                 _size.x(), _size.y());
+  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)
 {
-  printf("SET PIXMAP\n");
-  assert(image->width == _size.x());
-  assert(image->height == _size.y());
+  assert(_pixel_data);
+  assert(image->width == _size.width());
+  assert(image->height == _size.height());
   
   if (_pixmap == None)
     createObjects();
 
   XPutImage(**display, _pixmap, DefaultGC(**display, _screen),
-            image, 0, 0, 0, 0, _size.x(), _size.y());
+            image, 0, 0, 0, 0, _size.width(), _size.height());
 }
 
 void Surface::createObjects()
@@ -58,10 +73,12 @@ void Surface::createObjects()
   const ScreenInfo *info = display->screenInfo(_screen);
   
   _pixmap = XCreatePixmap(**display, info->rootWindow(),
-                          _size.x(), _size.y(), info->depth());
+                          _size.width(), _size.height(), info->depth());
+  assert(_pixmap != None);
     
   _xftdraw = XftDrawCreate(**display, _pixmap,
                            info->visual(), info->colormap());
+  assert(_xftdraw);
 }
 
 void Surface::destroyObjects()