# include <stdlib.h>
#endif // HAVE_STDLIB_H
-#include "gettext.h"
+#include "../src/gettext.h"
#define _(str) gettext(str)
}
_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; }
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(
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;
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;
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;
}
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;
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);
}
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);
- }
}
}
projects / chaz / openbox / blobdiff