X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=5e9f318817de214fdbf659b6b9ff3d098932c9a5;hb=5072931be0ff28cd9447926d50fe5ea202e2c370;hp=c11d7b0bdc8e7ebfcf3bef2f269c3b155ac69752;hpb=edcbed448ef2d341edbca47e938b4e86673a99a0;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index c11d7b0b..5e9f3188 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)
 }
 
@@ -27,15 +27,17 @@ TrueRenderControl::TrueRenderControl(int screen)
     _green_offset(0),
     _blue_offset(0)
 {
+  const ScreenInfo *info = display->screenInfo(_screen);
+  XImage *timage = XCreateImage(**display, info->visual(), info->depth(),
+                                ZPixmap, 0, NULL, 1, 1, 32, 0);
   printf("Initializing TrueColor RenderControl\n");
 
-  Visual *visual = display->screenInfo(_screen)->visual();
   unsigned long red_mask, green_mask, blue_mask;
 
   // find the offsets for each color in the visual's masks
-  red_mask = visual->red_mask;
-  green_mask = visual->green_mask;
-  blue_mask = visual->blue_mask;
+  red_mask = timage->red_mask;
+  green_mask = timage->green_mask;
+  blue_mask = timage->blue_mask;
 
   while (! (red_mask & 1))   { _red_offset++;   red_mask   >>= 1; }
   while (! (green_mask & 1)) { _green_offset++; green_mask >>= 1; }
@@ -45,58 +47,12 @@ TrueRenderControl::TrueRenderControl(int screen)
   while (red_mask)   { red_mask   >>= 1; _red_shift--;   }
   while (green_mask) { green_mask >>= 1; _green_shift--; }
   while (blue_mask)  { blue_mask  >>= 1; _blue_shift--;  }
+  XFree(timage);
 }
 
 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(
@@ -108,7 +64,7 @@ void TrueRenderControl::drawGradientBackground(
   const ScreenInfo *info = display->screenInfo(_screen);
   XImage *im = XCreateImage(**display, info->visual(), info->depth(),
                             ZPixmap, 0, NULL, w, h, 32, 0);
-  
+  im->byte_order = endian;
   pixel32 *data = new pixel32[sf.height()*sf.width()];
   pixel32 current;
 
@@ -130,9 +86,9 @@ void TrueRenderControl::drawGradientBackground(
     r = texture.borderColor().red();
     g = texture.borderColor().green();
     b = texture.borderColor().blue();
-    current = (r << 16)
-            + (g << 8)
-            + b;
+    current = (r << default_red_shift)
+            + (g << default_green_shift)
+            + (b << default_blue_shift);
     for (off = 0, x = 0; x < w; ++x, off++) {
       *(data + off) = current;
       *(data + off + ((h-1) * w)) = current;
@@ -199,9 +155,9 @@ void TrueRenderControl::verticalGradient(Surface &sf,
     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;
+    current = (r << default_red_shift)
+            + (g << default_green_shift)
+            + (b << default_blue_shift);
     for (int x = 0; x < sf.width(); ++x, ++data)
       *data = current;
   }
@@ -232,17 +188,17 @@ void TrueRenderControl::diagonalGradient(Surface &sf,
       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;
+      current = (r << default_red_shift)
+              + (g << default_green_shift)
+              + (b << default_blue_shift);
       *data = current;
     }
   }
 }
 
 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;
@@ -264,30 +220,46 @@ void TrueRenderControl::crossDiagonalGradient(Surface &sf,
       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;
+      current = (r << default_red_shift)
+              + (g << default_green_shift)
+              + (b << default_blue_shift);
       *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;
+  pixel16 *p = (pixel16*) data;
   switch (im->bits_per_pixel) {
   case 32:
-    return;
+    if ((_red_offset != default_red_shift) ||
+        (_blue_offset != default_blue_shift) ||
+        (_green_offset != default_green_shift)) {
+      printf("cross endian conversion\n");
+      for (y = 0; y < im->height; y++) {
+        for (x = 0; x < im->width; x++) {
+          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 += im->width;
+      } 
+   }
+   return;
   case 16:
     for (y = 0; y < im->height; y++) {
       for (x = 0; x < im->width; x++) {
-        r = (data[x] >> 16) & 0xFF;
+        r = (data[x] >> default_red_shift) & 0xFF;
         r = r >> _red_shift;
-        g = (data[x] >> 8) & 0xFF;
+        g = (data[x] >> default_green_shift) & 0xFF;
         g = g >> _green_shift;
-        b = data[x] & 0xFF;
+        b = (data[x] >> default_blue_shift) & 0xFF;
         b = b >> _blue_shift;
         p[x] = (r << _red_offset) + (g << _green_offset) + (b << _blue_offset);
       }
@@ -312,36 +284,38 @@ void TrueRenderControl::highlight(pixel32 *x, pixel32 *y, bool raised) const
     up = y;
     down = x;
   }
-  r = (*up >> 16) & 0xFF;
+  r = (*up >> default_red_shift) & 0xFF;
   r += r >> 1;
-  g = (*up >> 8) & 0xFF;
+  g = (*up >> default_green_shift) & 0xFF;
   g += g >> 1;
-  b = *up & 0xFF;
+  b = (*up >> default_blue_shift) & 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;
+  *up = (r << default_red_shift) + (g << default_green_shift)
+      + (b << default_blue_shift);
   
-  r = (*down >> 16) & 0xFF;
+  r = (*down >> default_red_shift) & 0xFF;
   r = (r >> 1) + (r >> 2);
-  g = (*down >> 8) & 0xFF;
+  g = (*down >> default_green_shift) & 0xFF;
   g = (g >> 1) + (g >> 2);
-  b = *down & 0xFF;
+  b = (*down >> default_blue_shift) & 0xFF;
   b = (b >> 1) + (b >> 2);
-  *down = (r << 16) + (g << 8) + b;
+  *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);
-  }
 }
 
 }