X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=14017c781f7cc932fa571ad7bdc1073fc363b0cb;hb=2a195d71e20689fd90544543a6b049fae615a55f;hp=786a3b0997a8d4b11034724e94cbe8a1eff35d5d;hpb=25a5b729090f48d27f754016280b4a54de9eef21;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 786a3b09..14017c78 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -15,7 +15,7 @@ extern "C" {
 #  include <stdlib.h>
 #endif // HAVE_STDLIB_H
 
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
@@ -99,38 +99,249 @@ static inline void renderPixel(XImage *im, unsigned char *dp,
   }
 }
 
-void TrueRenderControl::drawBackground(Surface& sf,
-				       const RenderTexture &texture) const
+void TrueRenderControl::drawGradientBackground(
+     Surface &sf, const RenderTexture &texture) const
 {
-  assert(sf._screen == _screen);
-  
-  int w = sf.width(), h = sf.height();
+  unsigned int r,g,b;
+  int w = sf.width(), h = sf.height(), off, x;
 
   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);
+  pixel32 *data = new pixel32[sf.height()*sf.width()];
+  pixel32 current;
+
+  switch (texture.gradient()) {
+  case RenderTexture::Vertical:
+    verticalGradient(sf, texture, data);
+    break;
+  case RenderTexture::Diagonal:
+    diagonalGradient(sf, texture, data);
+    break;
+  case RenderTexture::CrossDiagonal:
+    crossDiagonalGradient(sf, texture, data);
+    break;
+  default:
+    printf("unhandled gradient\n");
+  }
+
+  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);
+    }
+  }
+
+  reduceDepth(im, data);
 
   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);}
+  XDestroyImage(im);
+}
+
+void TrueRenderControl::verticalGradient(Surface &sf,
+                                         const RenderTexture &texture,
+                                         pixel32 *data) const
+{
+  pixel32 current;
+  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 < sf.height(); ++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 < sf.width(); ++x, ++data)
+      *data = current;
+  }
+}
+
+void TrueRenderControl::diagonalGradient(Surface &sf,
+                                         const RenderTexture &texture,
+                                         pixel32 *data) const
+{
+  pixel32 current;
+  float drx, dgx, dbx, dry, dgy, dby;
+  unsigned int r,g,b;
+
+
+  for (int y = 0; y < sf.height(); ++y) {
+    drx = (float)(texture.secondary_color().red() - texture.color().red());
+    dry = drx/(float)sf.height();
+    drx/= (float)sf.width();
+
+    dgx = (float)(texture.secondary_color().green() - texture.color().green());
+    dgy = dgx/(float)sf.height();
+    dgx/= (float)sf.width();
+
+    dbx = (float)(texture.secondary_color().blue() - texture.color().blue());
+    dby = dbx/(float)sf.height();
+    dbx/= (float)sf.width();
+    for (int x = 0; x < sf.width(); ++x, ++data) {
+      r = texture.color().red() + ((int)(drx * x) + (int)(dry * y))/2;
+      g = texture.color().green() + ((int)(dgx * x) + (int)(dgy * y))/2;
+      b = texture.color().blue() + ((int)(dbx * x) + (int)(dby * y))/2;
+      current = (r << 16)
+              + (g << 8)
+              + b;
+      *data = current;
+    }
+  }
+}
+
+void TrueRenderControl::crossDiagonalGradient(Surface &sf,
+                                         const RenderTexture &texture,
+                                         pixel32 *data) const
+{
+  pixel32 current;
+  float drx, dgx, dbx, dry, dgy, dby;
+  unsigned int r,g,b;
+
+  for (int y = 0; y < sf.height(); ++y) {
+    drx = (float)(texture.secondary_color().red() - texture.color().red());
+    dry = drx/(float)sf.height();
+    drx/= (float)sf.width();
+
+    dgx = (float)(texture.secondary_color().green() - texture.color().green());
+    dgy = dgx/(float)sf.height();
+    dgx/= (float)sf.width();
+
+    dbx = (float)(texture.secondary_color().blue() - texture.color().blue());
+    dby = dbx/(float)sf.height();
+    dbx/= (float)sf.width();
+    for (int x = sf.width(); x > 0; --x, ++data) {
+      r = texture.color().red() + ((int)(drx * (x-1)) + (int)(dry * y))/2;
+      g = texture.color().green() + ((int)(dgx * (x-1)) + (int)(dgy * y))/2;
+      b = texture.color().blue() + ((int)(dbx * (x-1)) + (int)(dby * y))/2;
+      current = (r << 16)
+              + (g << 8)
+              + b;
+      *data = current;
+    }
+  }
+}
+void TrueRenderControl::reduceDepth(XImage *im, pixel32 *data) const
+{
+// since pixel32 is the largest possible pixel size, we can share the array
+  int r, g, b;
+  int x,y;
+  pixel16 *p = (pixel16 *)data;
+  switch (im->bits_per_pixel) {
+  case 32:
+    return;
+  case 16:
+    for (y = 0; y < im->height; y++) {
+      for (x = 0; x < im->width; x++) {
+        r = (data[x] >> 16) & 0xFF;
+        r = r >> _red_shift;
+        g = (data[x] >> 8) & 0xFF;
+        g = g >> _green_shift;
+        b = data[x] & 0xFF;
+        b = b >> _blue_shift;
+        p[x] = (r << _red_offset) + (g << _green_offset) + (b << _blue_offset);
+      }
+      data += im->width;
+      p += im->bytes_per_line/2;
+    }
+    break;
+  default:
+    printf("your bit depth is currently unhandled\n");
+  }
+}
+
+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) g = 255;
+  if (b > 255) b = 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
+{
+  assert(_screen == sf._screen);
+  assert(_screen == texture.color().screen());
+
+  if (texture.gradient() == RenderTexture::Solid) {
+    drawSolidBackground(sf, texture);
+  } else {
+    drawGradientBackground(sf, texture);
+  }
+}
+
 }