X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.cc;h=cc2255030d660f3aca605fedd0f17c9d1eb0cd5c;hb=e71fb6c66e2b08e1acca087448d99a226aa077f0;hp=9fff018c3a67d79060d70ae269b6ec6b65cfd8f4;hpb=555facb9c737be20cd923abc15875af0281a8927;p=chaz%2Fopenbox

diff --git a/otk/surface.cc b/otk/surface.cc
index 9fff018c..cc225503 100644
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -46,14 +46,11 @@ void Surface::setPixmap(const RenderColor &color)
   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)