remove the border on the handle

[chaz/openbox] / otk / truerendercontrol.cc

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 6c3b896e7cf081136e940f288703a546b0e0bda9..ecc5d347196533d3d70a4f66d851cf5cb4bf76a5 100644 (file)
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -99,6 +99,69 @@ 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(), off, x, y;
+
+  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;
+//XXX: move this to seperate vgrad function
+  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 (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 (x = 0; x < w; ++x, dp ++)
+      *dp = current;
+  }
+//XXX: end of vgrad
+
+  if (texture.relief() == RenderTexture::Flat && texture.border()) {
+    r = texture.borderColor().red();
+    g = texture.borderColor().green();
+    b = texture.borderColor().blue();
+    current = (r << 16)
+            + (g << 8)
+            + b;
+    for (off = 0, x = 0; x < w; ++x, off++) {
+       *(data + off) = current;
+       *(data + off + ((h-1) * w)) = current;
+    }
+    for (off = 0, x = 0; x < h; ++x, off++) {
+       *(data + (off * w)) = current;
+       *(data + (off * w) + w - 1) = current;
+    }
+  }
+
+//XXX: any dithering should be done now
+  im->data = (char*) data;
+
+  sf.setPixmap(im);
+
+  delete [] im->data;
+  im->data = NULL;
+  XDestroyImage(im);
+}
+
 void TrueRenderControl::drawBackground(Surface& sf,
                                       const RenderTexture &texture) const
 {
@@ -108,35 +171,7 @@ void TrueRenderControl::drawBackground(Surface& sf,
   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;
-
-    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);
+    drawGradientBackground(sf, texture);
   }
 }