X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=6c3b896e7cf081136e940f288703a546b0e0bda9;hb=fabb6e8c1faa8339730cc7f56f84eb0a7e8b6c4f;hp=74dd057da2df0a3eb624f688cdcfd0f77a245fc8;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 74dd057d..6c3b896e 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -8,6 +8,7 @@
 #include "display.hh"
 #include "screeninfo.hh"
 #include "surface.hh"
+#include "rendertexture.hh"
 
 extern "C" {
 #ifdef    HAVE_STDLIB_H
@@ -98,34 +99,45 @@ static inline void renderPixel(XImage *im, unsigned char *dp,
   }
 }
 
-void TrueRenderControl::drawBackground(Surface *sf,
+void TrueRenderControl::drawBackground(Surface& sf,
 				       const RenderTexture &texture) const
 {
-  assert(sf);
-  
-  int w = sf->width(), h = sf->height();
-  XImage *im = sf->_im;
-  Pixmap pm = sf->_pm;
-  assert(im); assert(pm != None);
-
-  unsigned char *data = new unsigned char[im->bytes_per_line * h];
-  unsigned char *dp = data;
-  unsigned int bytes_per_pixel = im->bits_per_pixel/8;
-
-  for (int y = 0; y < h/3; ++y)
-    for (int x = 0; x < w; ++x, dp += bytes_per_pixel)
-      renderPixel(im, dp, (255*x/w) >> _red_shift << _red_offset);
-  for (int y = 0; y < h/3; ++y)
-    for (int x = 0; x < w; ++x, dp += bytes_per_pixel)
-      renderPixel(im, dp, (255*x/w) >> _green_shift << _green_offset);
-  for (int y = 0; y < h/3; ++y)
-    for (int x = 0; x < w; ++x, dp += bytes_per_pixel)
-      renderPixel(im, dp, (255*x/w) >> _blue_shift << _blue_offset);
-
-  im->data = (char*) data;
+  assert(_screen == sf._screen);
+  assert(_screen == texture.color().screen());
+
+  if (texture.gradient() == RenderTexture::Solid) {
+    drawSolidBackground(sf, texture);
+  } else {
+    int w = sf.width(), h = sf.height();
+
+    const ScreenInfo *info = display->screenInfo(_screen);
+    XImage *im = XCreateImage(**display, info->visual(), info->depth(),
+                              ZPixmap, 0, NULL, w, h, 32, 0);
   
-  XPutImage(**display, pm, DefaultGC(**display, _screen),
-            sf->_im, 0, 0, 0, 0, w, h);
+    unsigned char *data = new unsigned char[im->bytes_per_line * h];
+    unsigned char *dp = data;
+    unsigned int bytes_per_pixel = im->bits_per_pixel/8;
+
+    for (int y = 0; y < h/3; ++y)
+      for (int x = 0; x < w; ++x, dp += bytes_per_pixel)
+        renderPixel(im, dp, (255*x/w) >> _red_shift << _red_offset);
+    for (int y = 0; y < h/3; ++y)
+      for (int x = 0; x < w; ++x, dp += bytes_per_pixel)
+        renderPixel(im, dp, (255*x/w) >> _green_shift << _green_offset);
+    for (int y = 0; y < h/3; ++y)
+      for (int x = 0; x < w; ++x, dp += bytes_per_pixel)
+        renderPixel(im, dp, (255*x/w) >> _blue_shift << _blue_offset);
+
+    im->data = (char*) data;
+
+//  sf.setPixmap(im);
+    sf.setPixmap(texture.color());
+//  sf.setPixmap(RenderColor(_screen, 0xff, 0xff, 0));
+
+    delete [] im->data;
+    im->data = NULL;
+    XDestroyImage(im);
+  }
 }
 
 }