X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.cc;h=42589dd3e5f8adb2fd8e6f77337ab72826570545;hb=77a46782db2996c0bc662c0f6d191df7a39c2cce;hp=05a1d676775d6ef03dbf5723c0ae6245dcb37463;hpb=31c20197e585bee0d48a7643bf73a0b358ad6297;p=chaz%2Fopenbox diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc index 05a1d676..42589dd3 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" @@ -11,14 +9,12 @@ #include "rendertexture.hh" extern "C" { -#ifdef HAVE_STDLIB_H -# include -#endif // HAVE_STDLIB_H - -#include "gettext.h" +#include "../src/gettext.h" #define _(str) gettext(str) } +#include + namespace otk { TrueRenderControl::TrueRenderControl(int screen) @@ -29,13 +25,16 @@ TrueRenderControl::TrueRenderControl(int screen) { printf("Initializing TrueColor RenderControl\n"); - Visual *visual = display->screenInfo(_screen)->visual(); + 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 = 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,114 +44,70 @@ 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) +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; - 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; + // 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 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::drawGradientBackground( - Surface &sf, const RenderTexture &texture) const +void TrueRenderControl::allocateColor(XColor *color) const { - int w = sf.width(), h = sf.height(); - - const ScreenInfo *info = display->screenInfo(_screen); - XImage *im = XCreateImage(**display, info->visual(), info->depth(), - ZPixmap, 0, NULL, w, h, 32, 0); - - pixel32 *data = new pixel32[sf.height()*sf.width()]; - pixel32 current; - pixel32 *dp = data; - 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 < 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 (int x = 0; x < w; ++x, dp ++) - *dp = current; - } - - im->data = (char*) data; - - sf.setPixmap(im); - - delete [] im->data; - im->data = NULL; - XDestroyImage(im); -} - -void TrueRenderControl::drawBackground(Surface& sf, - const RenderTexture &texture) const -{ - assert(_screen == sf._screen); - assert(_screen == texture.color().screen()); - - if (texture.gradient() == RenderTexture::Solid) { - drawSolidBackground(sf, texture); - } else { - drawGradientBackground(sf, texture); + 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; } }