X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=ec7bc46157e0b1c88003b0dfdc01d1e446a306c9;hb=4ef15148365c223b8e810611a10dc27dc5fba355;hp=41d9cd6c025c36e1c5752ff71593fc9787334db7;hpb=9a47b042de1ca670da3219dbd2b97e98bc2376ed;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 41d9cd6c..ec7bc461 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 #include "truerendercontrol.hh"
 #include "display.hh"
@@ -53,66 +51,20 @@ TrueRenderControl::TrueRenderControl(int screen)
 TrueRenderControl::~TrueRenderControl()
 {
   printf("Destroying TrueColor RenderControl\n");
-
-
-}
-
-
-static inline void renderPixel(XImage *im, unsigned char *dp,
-			       unsigned long pixel)
-{
-  unsigned int bpp = im->bits_per_pixel + (im->byte_order == MSBFirst ? 1 : 0);
-
-  switch (bpp) {
-  case  8: //  8bpp
-    *dp++ = pixel;
-    break;
-  case 16: // 16bpp LSB
-    *dp++ = pixel;
-    *dp++ = pixel >> 8;
-    break;
-  case 17: // 16bpp MSB
-    *dp++ = pixel >> 8;
-    *dp++ = pixel;
-    break;
-  case 24: // 24bpp LSB
-    *dp++ = pixel;
-    *dp++ = pixel >> 8;
-    *dp++ = pixel >> 16;
-    break;
-  case 25: // 24bpp MSB
-    *dp++ = pixel >> 16;
-    *dp++ = pixel >> 8;
-    *dp++ = pixel;
-    break;
-  case 32: // 32bpp LSB
-    *dp++ = pixel;
-    *dp++ = pixel >> 8;
-    *dp++ = pixel >> 16;
-    *dp++ = pixel >> 24;
-    break;
-  case 33: // 32bpp MSB
-    *dp++ = pixel >> 24;
-    *dp++ = pixel >> 16;
-    *dp++ = pixel >> 8;
-    *dp++ = pixel;
-    break;
-  default:
-    assert(false); // wtf?
-  }
 }
 
 void TrueRenderControl::drawGradientBackground(
      Surface &sf, const RenderTexture &texture) const
 {
   unsigned int r,g,b;
-  int w = sf.width(), h = sf.height(), off, x;
+  int w = sf.size().width(), h = sf.size().height();
+  int off, x;
 
   const ScreenInfo *info = display->screenInfo(_screen);
   XImage *im = XCreateImage(**display, info->visual(), info->depth(),
                             ZPixmap, 0, NULL, w, h, 32, 0);
-  im->byte_order = LSBFirst;
-  pixel32 *data = new pixel32[sf.height()*sf.width()];
+  im->byte_order = endian;
+  pixel32 *data = new pixel32[h*w];
   pixel32 current;
 
   switch (texture.gradient()) {
@@ -188,24 +140,25 @@ void TrueRenderControl::verticalGradient(Surface &sf,
   pixel32 current;
   float dr, dg, db;
   unsigned int r,g,b;
+  int w = sf.size().width(), h = sf.size().height();
 
   dr = (float)(texture.secondary_color().red() - texture.color().red());
-  dr/= (float)sf.height();
+  dr/= (float)h;
 
   dg = (float)(texture.secondary_color().green() - texture.color().green());
-  dg/= (float)sf.height();
+  dg/= (float)h;
 
   db = (float)(texture.secondary_color().blue() - texture.color().blue());
-  db/= (float)sf.height();
+  db/= (float)h;
 
-  for (int y = 0; y < sf.height(); ++y) {
+  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 << default_red_shift)
             + (g << default_green_shift)
             + (b << default_blue_shift);
-    for (int x = 0; x < sf.width(); ++x, ++data)
+    for (int x = 0; x < w; ++x, ++data)
       *data = current;
   }
 }
@@ -217,21 +170,21 @@ void TrueRenderControl::diagonalGradient(Surface &sf,
   pixel32 current;
   float drx, dgx, dbx, dry, dgy, dby;
   unsigned int r,g,b;
+  int w = sf.size().width(), h = sf.size().height();
 
-
-  for (int y = 0; y < sf.height(); ++y) {
+  for (int y = 0; y < h; ++y) {
     drx = (float)(texture.secondary_color().red() - texture.color().red());
-    dry = drx/(float)sf.height();
-    drx/= (float)sf.width();
+    dry = drx/(float)h;
+    drx/= (float)w;
 
     dgx = (float)(texture.secondary_color().green() - texture.color().green());
-    dgy = dgx/(float)sf.height();
-    dgx/= (float)sf.width();
+    dgy = dgx/(float)h;
+    dgx/= (float)w;
 
     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) {
+    dby = dbx/(float)h;
+    dbx/= (float)w;
+    for (int x = 0; x < w; ++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;
@@ -244,26 +197,27 @@ void TrueRenderControl::diagonalGradient(Surface &sf,
 }
 
 void TrueRenderControl::crossDiagonalGradient(Surface &sf,
-                                         const RenderTexture &texture,
-                                         pixel32 *data) const
+                                              const RenderTexture &texture,
+                                              pixel32 *data) const
 {
   pixel32 current;
   float drx, dgx, dbx, dry, dgy, dby;
   unsigned int r,g,b;
+  int w = sf.size().width(), h = sf.size().height();
 
-  for (int y = 0; y < sf.height(); ++y) {
+  for (int y = 0; y < h; ++y) {
     drx = (float)(texture.secondary_color().red() - texture.color().red());
-    dry = drx/(float)sf.height();
-    drx/= (float)sf.width();
+    dry = drx/(float)h;
+    drx/= (float)w;
 
     dgx = (float)(texture.secondary_color().green() - texture.color().green());
-    dgy = dgx/(float)sf.height();
-    dgx/= (float)sf.width();
+    dgy = dgx/(float)h;
+    dgx/= (float)w;
 
     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) {
+    dby = dbx/(float)h;
+    dbx/= (float)w;
+    for (int x = w; 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;
@@ -274,12 +228,13 @@ void TrueRenderControl::crossDiagonalGradient(Surface &sf,
     }
   }
 }
+
 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;
+  pixel16 *p = (pixel16*) data;
   switch (im->bits_per_pixel) {
   case 32:
     if ((_red_offset != default_red_shift) ||
@@ -291,7 +246,8 @@ void TrueRenderControl::reduceDepth(XImage *im, pixel32 *data) const
           r = (data[x] >> default_red_shift) & 0xFF;
           g = (data[x] >> default_green_shift) & 0xFF;
           b = (data[x] >> default_blue_shift) & 0xFF;
-          data[x] = (r << _red_offset) + (g << _green_offset) + (b << _blue_offset);
+          data[x] = (r << _red_offset) + (g << _green_offset) +
+            (b << _blue_offset);
         }
         data += im->width;
       } 
@@ -350,17 +306,17 @@ void TrueRenderControl::highlight(pixel32 *x, pixel32 *y, bool raised) const
   *down = (r << default_red_shift) + (g << default_green_shift)
         + (b << default_blue_shift);
 }
+
 void TrueRenderControl::drawBackground(Surface& sf,
 				       const RenderTexture &texture) const
 {
   assert(_screen == sf._screen);
   assert(_screen == texture.color().screen());
 
-  if (texture.gradient() == RenderTexture::Solid) {
+  if (texture.gradient() == RenderTexture::Solid)
     drawSolidBackground(sf, texture);
-  } else {
+  else
     drawGradientBackground(sf, texture);
-  }
 }
 
 }