compiles with the new render subsystem...

[chaz/openbox] / otk / truerendercontrol.cc

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index dc52bc37bb43a088cb4b6036839a625516b0e961..05a1d676775d6ef03dbf5723c0ae6245dcb37463 100644 (file)
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -8,8 +8,7 @@
 #include "display.hh"
 #include "screeninfo.hh"
 #include "surface.hh"
-
-#include "rendercolor.hh"
+#include "rendertexture.hh"
 
 extern "C" {
 #ifdef    HAVE_STDLIB_H
@@ -100,39 +99,61 @@ static inline void renderPixel(XImage *im, unsigned char *dp,
   }
 }
 
+void TrueRenderControl::drawGradientBackground(
+     Surface &sf, const RenderTexture &texture) const
+{
+    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);
+  
+    pixel32 *data = new pixel32[sf.height()*sf.width()];
+    pixel32 current;
+    pixel32 *dp = data;
+    float dr, dg, db;
+    unsigned int r,g,b;
+
+    dr = (float)(texture.secondary_color().red() - texture.color().red());
+    dr/= (float)sf.height();
+
+    dg = (float)(texture.secondary_color().green() - texture.color().green());
+    dg/= (float)sf.height();
+
+    db = (float)(texture.secondary_color().blue() - texture.color().blue());
+    db/= (float)sf.height();
+
+    for (int y = 0; y < h; ++y) {
+      r = texture.color().red() + (int)(dr * y);
+      g = texture.color().green() + (int)(dg * y);
+      b = texture.color().blue() + (int)(db * y);
+      current = (r << 16)
+              + (g << 8)
+              + b;
+      for (int x = 0; x < w; ++x, dp ++)
+        *dp = current;
+    }
+
+    im->data = (char*) data;
+
+    sf.setPixmap(im);
+
+    delete [] im->data;
+    im->data = NULL;
+    XDestroyImage(im);
+}
+
 void TrueRenderControl::drawBackground(Surface& sf,
                                       const RenderTexture &texture) const
 {
-  (void)texture;
+  assert(_screen == sf._screen);
+  assert(_screen == texture.color().screen());
 
-  assert(sf._screen == _screen);
-  
-  int w = sf.width(), h = sf.height();
+  if (texture.gradient() == RenderTexture::Solid) {
+    drawSolidBackground(sf, texture);
+  } else {
+    drawGradientBackground(sf, texture);
+  }
+}
 
-  const ScreenInfo *info = display->screenInfo(_screen);
-  XImage *im = XCreateImage(**display, info->visual(), info->depth(),
-                            ZPixmap, 0, NULL, w, h, 32, 0);
-  
-  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(RenderColor(_screen, 0xff, 0xff, 0));
-
-  delete [] im->data;
-  im->data = NULL;
-  XDestroyImage(im);}
 }