X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=42589dd3e5f8adb2fd8e6f77337ab72826570545;hb=a91a6f97daeb058f346246081e1c83a788787f9b;hp=49ed964391c72a3017239343a7df722588414051;hpb=3fa13524288087a1d259e48f0dc5f65eeffd11fb;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 49ed9643..42589dd3 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -1,148 +1,114 @@
 // -*- 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"
 #include "screeninfo.hh"
-#include "widget.hh"
+#include "surface.hh"
+#include "rendertexture.hh"
 
 extern "C" {
-#ifdef    HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
+#include <cstdlib>
+
 namespace otk {
 
-TrueRenderControl::TrueRenderControl(const ScreenInfo *screen)
-  : RenderControl(screen)
+TrueRenderControl::TrueRenderControl(int screen)
+  : RenderControl(screen),
+    _red_offset(0),
+    _green_offset(0),
+    _blue_offset(0)
 {
   printf("Initializing TrueColor RenderControl\n");
 
+  const ScreenInfo *info = display->screenInfo(_screen);
+  XImage *timage = XCreateImage(**display, info->visual(), info->depth(),
+                                ZPixmap, 0, NULL, 1, 1, 32, 0);
+
   unsigned long red_mask, green_mask, blue_mask;
 
   // find the offsets for each color in the visual's masks
-  red_mask = screen->visual()->red_mask;
-  green_mask = screen->visual()->green_mask;
-  blue_mask = screen->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 (! (red_mask & 1))   { _red_offset++;   red_mask   >>= 1; }
   while (! (green_mask & 1)) { _green_offset++; green_mask >>= 1; }
-  while (! (blue_mask & 1)) { _blue_offset++; blue_mask >>= 1; }
+  while (! (blue_mask & 1))  { _blue_offset++;  blue_mask  >>= 1; }
 
-  // scale available colorspace to match our 256x256x256 cube
-  _red_bits = 255 / red_mask;
-  _green_bits = 255 / green_mask;
-  _blue_bits = 255 / blue_mask;
-
-  for (int i = 0; i < 256; i++) {
-    _red_color_table[i] = i / _red_bits;
-    _green_color_table[i] = i / _green_bits;
-    _blue_color_table[i] = i / _blue_bits;
-  }
+  _red_shift = _green_shift = _blue_shift = 8;
+  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)
+void TrueRenderControl::reduceDepth(Surface &sf, XImage *im) const
 {
-  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;
+  // since pixel32 is the largest possible pixel size, we can share the array
+  int r, g, b;
+  int x,y;
+  pixel32 *data = sf.pixelData();
+  pixel32 *ret = (pixel32*)malloc(im->width * im->height * 4);
+  pixel16 *p = (pixel16*) ret;
+  switch (im->bits_per_pixel) {
+  case 32:
+    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;
+          ret[x] = (r << _red_offset) + (g << _green_offset) +
+            (b << _blue_offset);
+        }
+        data += im->width;
+      } 
+    } else {
+      memcpy(ret, data, im->width * im->height * 4);
+    }
     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;
+  case 16:
+    for (y = 0; y < im->height; y++) {
+      for (x = 0; x < im->width; x++) {
+        r = (data[x] >> default_red_shift) & 0xFF;
+        r = r >> _red_shift;
+        g = (data[x] >> default_green_shift) & 0xFF;
+        g = g >> _green_shift;
+        b = (data[x] >> default_blue_shift) & 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:
-    assert(false); // wtf?
+    printf("your bit depth is currently unhandled\n");
   }
+  im->data = (char*)ret;
 }
 
-void TrueRenderControl::render(Widget *wi)
+void TrueRenderControl::allocateColor(XColor *color) const
 {
-  assert(wi);
-  
-  XGCValues gcv;
-  gcv.cap_style = CapProjecting;
-
-  int w = 255, h = 31;
-  Pixmap p = XCreatePixmap(**display, wi->window(), w, h, _screen->depth());
-  XImage *im = XCreateImage(**display, _screen->visual(), _screen->depth(),
-			    ZPixmap, 0, NULL, w, h, 32, 0);
-  //GC gc = XCreateGC(**display, _screen->rootWindow(), GCCapStyle, &gcv);
-
-  // XXX  + 1?
-  unsigned char *data = new unsigned char[im->bytes_per_line * h];
-  unsigned char *dp = data;
-
-  for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-    renderPixel(im, dp, 0);
-  for (int y = 0; y < 10; ++y)
-    for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _red_color_table[x] << _red_offset);
-  for (int y = 0; y < 10; ++y)
-    for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _green_color_table[x] << _green_offset);
-  for (int y = 0; y < 10; ++y)
-    for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _blue_color_table[x] << _blue_offset);
-
-  printf("\nDone %d %d\n", im->bytes_per_line * h, dp - data);
-
-  im->data = (char*) data;
-  
-  XPutImage(**display, p, DefaultGC(**display, _screen->screen()),
-            im, 0, 0, 0, 0, w, h);
-
-  //delete [] image->data;
-  //image->data = NULL;
-  XDestroyImage(im);
-
-  XSetWindowBackgroundPixmap(**display, wi->window(), p);
-  XClearWindow(**display, wi->window());
-
-  XFreePixmap(**display, p);
+  const ScreenInfo *info = display->screenInfo(_screen);
+  if (!XAllocColor(**display, info->colormap(), color)) {
+    fprintf(stderr, "TrueRenderControl: color alloc error: rgb:%x/%x/%x\n",
+            color->red & 0xff, color->green & 0xff, color->blue & 0xff);
+    color->pixel = 0;
+  }
 }
 
 }