M otk/truerendercontrol.cc → otk/truerendercontrol.cc

@@ -99,44 +99,60 @@ assert(false); // wtf?
   }
 }
 
-void TrueRenderControl::drawBackground(Surface& sf,
-				       const RenderTexture &texture) const
+void TrueRenderControl::drawGradientBackground(
+     Surface &sf, const RenderTexture &texture) const
 {
-  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);
   
-    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;
+    pixel32 *data = new pixel32[sf.height()*sf.width()];
+    pixel32 current;
+    pixel32 *dp = data;
+    float dr, dg, db;
+    unsigned int r,g,b;
 
-    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);
+    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);
-    sf.setPixmap(texture.color());
-//  sf.setPixmap(RenderColor(_screen, 0xff, 0xff, 0));
+    sf.setPixmap(im);
 
     delete [] im->data;
     im->data = NULL;
     XDestroyImage(im);
+}
+
+void TrueRenderControl::drawBackground(Surface& sf,
+				       const RenderTexture &texture) const
+{
+  assert(_screen == sf._screen);
+  assert(_screen == texture.color().screen());
+
+  if (texture.gradient() == RenderTexture::Solid) {
+    drawSolidBackground(sf, texture);
+  } else {
+    drawGradientBackground(sf, texture);
   }
 }
 

M otk/truerendercontrol.hh → otk/truerendercontrol.hh

@@ -4,9 +4,27 @@ #define __truerendercontrol_hh
 
 #include "rendercontrol.hh"
 
+extern "C" {
+
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#else
+#  ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#  endif
+#endif
+
+}
+
 #include <vector>
 
 namespace otk {
+
+#ifdef HAVE_STDINT_H
+typedef uint32_t pixel32;
+#else
+typedef u_int32_t pixel32;
+#endif
 
 class TrueRenderControl : public RenderControl {
 private:
@@ -26,6 +44,8 @@ TrueRenderControl(int screen);
   virtual ~TrueRenderControl();
 
   virtual void drawBackground(Surface& sf, const RenderTexture &texture) const;
+  virtual void drawGradientBackground(Surface &sf,
+                                      const RenderTexture &texture) const;
 };
 
 }