X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.cc;h=9dfb88898043faaac22541e4060c4bbb03e63649;hb=afb8a28120b21569934202968283e65a173c3bd8;hp=c02526f30644485edca8105e01f4146fd0840397;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox

diff --git a/otk/surface.cc b/otk/surface.cc
index c02526f3..9dfb8889 100644
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -7,6 +7,7 @@
 #include "surface.hh"
 #include "display.hh"
 #include "screeninfo.hh"
+#include "rendercolor.hh"
 
 extern "C" {
 #include <X11/Xutil.h>
@@ -14,24 +15,12 @@ extern "C" {
 
 namespace otk {
 
-Surface::Surface(int screen)
-  : _screen(screen),
-    _size(1, 1),
-    _im(0),
-    _pm(None),
-    _xftdraw(0)
-{
-  createObjects();
-}
-
 Surface::Surface(int screen, const Point &size)
   : _screen(screen),
     _size(size),
-    _im(0),
-    _pm(None),
+    _pixmap(None),
     _xftdraw(0)
 {
-  createObjects();
 }
 
 Surface::~Surface()
@@ -39,45 +28,53 @@ Surface::~Surface()
   destroyObjects();
 }
 
-void Surface::createObjects()
+void Surface::setPixmap(const RenderColor &color)
 {
-  assert(!_im); assert(_pm == None); assert(!_xftdraw);
-
-  const ScreenInfo *info = display->screenInfo(_screen);
-  
-  _im = XCreateImage(**display, info->visual(), info->depth(),
-		     ZPixmap, 0, NULL, _size.x(), _size.y(), 32, 0);
-
-  _pm = XCreatePixmap(**display, info->rootWindow(), _size.x(), _size.y(),
-		      info->depth());
+  if (_pixmap == None)
+    createObjects();
 
-  _xftdraw = XftDrawCreate(**display, _pm, info->visual(), info->colormap());
+  XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
+                 _size.x(), _size.y());
 }
 
-void Surface::destroyObjects()
+void Surface::setPixmap(XImage *image)
 {
-  assert(_im); assert(_pm != None); assert(_xftdraw);
+  assert(image->width == _size.x());
+  assert(image->height == _size.y());
+  
+  if (_pixmap == None)
+    createObjects();
 
-  // do the delete ourselves cuz we alloc it with new not malloc
-  delete [] _im->data;
-  _im->data = NULL;
-  XDestroyImage(_im);
-  _im = 0;
+  XPutImage(**display, _pixmap, DefaultGC(**display, _screen),
+            image, 0, 0, 0, 0, _size.x(), _size.y());
+}
 
-  XFreePixmap(**display, _pm);
-  _pm = None;
+void Surface::createObjects()
+{
+  assert(_pixmap == None); assert(!_xftdraw);
 
-  XftDrawDestroy(_xftdraw);
-  _xftdraw = 0;
+  const ScreenInfo *info = display->screenInfo(_screen);
+  
+  _pixmap = XCreatePixmap(**display, info->rootWindow(),
+                          _size.x(), _size.y(), info->depth());
+  assert(_pixmap != None);
+    
+  _xftdraw = XftDrawCreate(**display, _pixmap,
+                           info->visual(), info->colormap());
+  assert(_xftdraw);
 }
 
-void Surface::setSize(int w, int h)
+void Surface::destroyObjects()
 {
-  if (w == _size.x() && h == _size.y()) return; // no change
-  
-  _size.setPoint(w, h);
-  destroyObjects();
-  createObjects();
+  if (_xftdraw) {
+    XftDrawDestroy(_xftdraw);
+    _xftdraw = 0;
+  }
+
+  if (_pixmap != None) {
+    XFreePixmap(**display, _pixmap);
+    _pixmap = None;
+  }
 }
 
 }