X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=6c3b896e7cf081136e940f288703a546b0e0bda9;hb=fabb6e8c1faa8339730cc7f56f84eb0a7e8b6c4f;hp=95a0a41650ca56e4d0bda2dd12f098e948d9d718;hpb=9f705c02b9c412c053fc12a2ebdc5cebe83400c8;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index 95a0a416..6c3b896e 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -8,6 +8,7 @@
 #include "display.hh"
 #include "screeninfo.hh"
 #include "surface.hh"
+#include "rendertexture.hh"
 
 extern "C" {
 #ifdef    HAVE_STDLIB_H
@@ -20,7 +21,7 @@ extern "C" {
 
 namespace otk {
 
-TrueRenderControl::TrueRenderControl(const ScreenInfo *screen)
+TrueRenderControl::TrueRenderControl(int screen)
   : RenderControl(screen),
     _red_offset(0),
     _green_offset(0),
@@ -28,27 +29,22 @@ TrueRenderControl::TrueRenderControl(const ScreenInfo *screen)
 {
   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 = screen->visual()->red_mask;
-  green_mask = screen->visual()->green_mask;
-  blue_mask = screen->visual()->blue_mask;
+  red_mask = visual->red_mask;
+  green_mask = visual->green_mask;
+  blue_mask = visual->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--;  }
 }
 
 TrueRenderControl::~TrueRenderControl()
@@ -58,6 +54,7 @@ TrueRenderControl::~TrueRenderControl()
 
 }
 
+
 static inline void renderPixel(XImage *im, unsigned char *dp,
 			       unsigned long pixel)
 {
@@ -102,41 +99,45 @@ static inline void renderPixel(XImage *im, unsigned char *dp,
   }
 }
 
-void TrueRenderControl::render(Surface *sf)
+void TrueRenderControl::drawBackground(Surface& sf,
+				       const RenderTexture &texture) const
 {
-  assert(sf);
-  
-  int w = sf->width(), h = sf->height();
+  assert(_screen == sf._screen);
+  assert(_screen == texture.color().screen());
 
-  XImage *im = XCreateImage(**display, _screen->visual(), _screen->depth(),
-			    ZPixmap, 0, NULL, w, h, 32, 0);
+  if (texture.gradient() == RenderTexture::Solid) {
+    drawSolidBackground(sf, texture);
+  } else {
+    int w = sf.width(), h = sf.height();
 
-  unsigned char *data = new unsigned char[im->bytes_per_line * h];
-  unsigned char *dp = data;
-
-  for (int y = 0; y < h/3; ++y)
-    for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _red_color_table[255*x/w] << _red_offset);
-  for (int y = 0; y < h/3; ++y)
-    for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _green_color_table[255*x/w] << _green_offset);
-  for (int y = 0; y < h/3; ++y)
-    for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _blue_color_table[255*x/w] << _blue_offset);
-
-  printf("\nDone %d %d\n", im->bytes_per_line * h, dp - data);
-
-  im->data = (char*) data;
+    const ScreenInfo *info = display->screenInfo(_screen);
+    XImage *im = XCreateImage(**display, info->visual(), info->depth(),
+                              ZPixmap, 0, NULL, w, h, 32, 0);
   
-  if (!sf->_pm)
-    sf->_pm = XCreatePixmap(**display, _screen->rootWindow(), w, h,
-			    _screen->depth());
-  XPutImage(**display, sf->_pm, DefaultGC(**display, _screen->screen()),
-            im, 0, 0, 0, 0, w, h);
-
-  //delete [] image->data;
-  //image->data = NULL;
-  XDestroyImage(im);
+    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);
+
+    im->data = (char*) data;
+
+//  sf.setPixmap(im);
+    sf.setPixmap(texture.color());
+//  sf.setPixmap(RenderColor(_screen, 0xff, 0xff, 0));
+
+    delete [] im->data;
+    im->data = NULL;
+    XDestroyImage(im);
+  }
 }
 
 }