load and set the titles justification

[chaz/openbox] / otk / surface.cc

diff --git a/otk/surface.cc b/otk/surface.cc
index 3f5624d7f089192d8ca8e15581d3942570ab01c4..cc2255030d660f3aca605fedd0f17c9d1eb0cd5c 100644 (file)
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -26,29 +26,36 @@ Surface::Surface(int screen, const Size &size)
 Surface::~Surface()
 {
   destroyObjects();
-  delete [] _pixel_data;
+  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 = 0; // XXX set this from the color and shift amounts!
-  for (unsigned int i = 0, s = _size.width() * _size.height(); i < s; ++i) {
-    unsigned char *p = (unsigned char*)&_pixel_data[i];
-    *p = (unsigned char) (val >> 24);
-    *++p = (unsigned char) (val >> 16);
-    *++p = (unsigned char) (val >> 8);
-    *++p = (unsigned char) val;
-  }
+  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());