X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=6a74007f352d93003203304c665b53489a26016e;hb=b45a68cc30121ad2c5cd3b795a6b5e8572425316;hp=05a1d676775d6ef03dbf5723c0ae6245dcb37463;hpb=31c20197e585bee0d48a7643bf73a0b358ad6297;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 05a1d676..6a74007f 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -102,47 +102,121 @@ 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();
+  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);
+  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;
+  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;
+    }
+  }
+
+  if (texture.relief() != RenderTexture::Flat) {
+    if (texture.bevel() == RenderTexture::Bevel1) {
+      for (off = 1, x = 1; x < w - 1; ++x, off++)
+        highlight(data + off,
+                data + off + (h-1) * w,
+                texture.relief()==RenderTexture::Raised);
+      for (off = 0, x = 0; x < h; ++x, off++)
+        highlight(data + off * w,
+                data + off * w + w - 1,
+                texture.relief()==RenderTexture::Raised);
+    }
+
+    if (texture.bevel() == RenderTexture::Bevel2) {
+      for (off = 2, x = 2; x < w - 2; ++x, off++)
+        highlight(data + off + w,
+                data + off + (h-2) * w,
+                texture.relief()==RenderTexture::Raised);
+      for (off = 1, x = 1; x < h-1; ++x, off++)
+        highlight(data + off * w + 1,
+                  data + off * w + w - 2,
+                  texture.relief()==RenderTexture::Raised);
     }
+  }
 
-    im->data = (char*) data;
+//XXX: any dithering should be done now
+  im->data = (char*) data;
 
-    sf.setPixmap(im);
+  sf.setPixmap(im);
 
-    delete [] im->data;
-    im->data = NULL;
-    XDestroyImage(im);
+  delete [] im->data;
+  im->data = NULL;
+  XDestroyImage(im);
 }
 
+void TrueRenderControl::highlight(pixel32 *x, pixel32 *y, bool raised) const
+{
+  int r, g, b;
+
+  pixel32 *up, *down;
+  if (raised) {
+    up = x;
+    down = y;
+  } else {
+    up = y;
+    down = x;
+  }
+  r = (*up >> 16) & 0xFF;
+  r += r >> 1;
+  g = (*up >> 8) & 0xFF;
+  g += g >> 1;
+  b = *up & 0xFF;
+  b += b >> 1;
+  if (r > 255) r = 255;
+  if (g > 255) r = 255;
+  if (b > 255) r = 255;
+  *up = (r << 16) + (g << 8) + b;
+  
+  r = (*down >> 16) & 0xFF;
+  r = (r >> 1) + (r >> 2);
+  g = (*down >> 8) & 0xFF;
+  g = (g >> 1) + (g >> 2);
+  b = *down & 0xFF;
+  b = (b >> 1) + (b >> 2);
+  *down = (r << 16) + (g << 8) + b;
+}
 void TrueRenderControl::drawBackground(Surface& sf,
 				       const RenderTexture &texture) const
 {