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

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index cc46ebd9..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)
 }
 
@@ -102,7 +102,8 @@ 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;
+  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(),
@@ -110,30 +111,20 @@ void TrueRenderControl::drawGradientBackground(
   
   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;
+  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");
   }
-//XXX: end of vgrad
 
   if (texture.relief() == RenderTexture::Flat && texture.border()) {
     r = texture.borderColor().red();
@@ -156,19 +147,19 @@ void TrueRenderControl::drawGradientBackground(
     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);
+                  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);
+                  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);
+                  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,
@@ -176,7 +167,8 @@ void TrueRenderControl::drawGradientBackground(
     }
   }
 
-//XXX: any dithering should be done now
+  reduceDepth(im, data);
+
   im->data = (char*) data;
 
   sf.setPixmap(im);
@@ -186,6 +178,128 @@ void TrueRenderControl::drawGradientBackground(
   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;