// -*- 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"
Surface &sf, const RenderTexture &texture) const
{
unsigned int r,g,b;
- unsigned int w = sf.size().width(), h = sf.size().height();
- unsigned int off, x;
+ int w = sf.size().width(), h = sf.size().height();
+ int off, x;
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[h*w];
- pixel32 current;
switch (texture.gradient()) {
case RenderTexture::Vertical:
- verticalGradient(sf, texture, data);
+ verticalGradient(sf, texture);
break;
case RenderTexture::Diagonal:
- diagonalGradient(sf, texture, data);
+ diagonalGradient(sf, texture);
break;
case RenderTexture::CrossDiagonal:
- crossDiagonalGradient(sf, texture, data);
+ crossDiagonalGradient(sf, texture);
break;
default:
printf("unhandled gradient\n");
}
+ pixel32 *data = sf.pixelData();
+ pixel32 current;
+
if (texture.relief() == RenderTexture::Flat && texture.border()) {
r = texture.borderColor().red();
g = texture.borderColor().green();
if (texture.relief() != RenderTexture::Flat) {
if (texture.bevel() == RenderTexture::Bevel1) {
- if (w >= 1 && h >= 1) {
- for (off = 1, x = 1; x < w - 1; ++x, off++)
- highlight(data + off,
- data + off + (h-1) * w,
- texture.relief()==RenderTexture::Raised);
- for (off = 0, x = 0; x < h; ++x, off++)
- highlight(data + off * w,
- data + off * w + w - 1,
- texture.relief()==RenderTexture::Raised);
- }
+ for (off = 1, x = 1; x < w - 1; ++x, off++)
+ highlight(data + off,
+ data + off + (h-1) * w,
+ texture.relief()==RenderTexture::Raised);
+ for (off = 0, x = 0; x < h; ++x, off++)
+ highlight(data + off * w,
+ data + off * w + w - 1,
+ texture.relief()==RenderTexture::Raised);
}
if (texture.bevel() == RenderTexture::Bevel2) {
- if (w >= 2 && h >= 2) {
- for (off = 2, x = 2; x < w - 2; ++x, off++)
- highlight(data + off + w,
- data + off + (h-2) * w,
- texture.relief()==RenderTexture::Raised);
- for (off = 1, x = 1; x < h-1; ++x, off++)
- highlight(data + off * w + 1,
- data + off * w + w - 2,
- texture.relief()==RenderTexture::Raised);
- }
+ for (off = 2, x = 2; x < w - 2; ++x, off++)
+ highlight(data + off + w,
+ data + off + (h-2) * w,
+ texture.relief()==RenderTexture::Raised);
+ for (off = 1, x = 1; x < h-1; ++x, off++)
+ highlight(data + off * w + 1,
+ data + off * w + w - 2,
+ texture.relief()==RenderTexture::Raised);
}
}
- reduceDepth(im, data);
+ reduceDepth(sf, im);
im->data = (char*) data;
sf.setPixmap(im);
- delete [] im->data;
im->data = NULL;
XDestroyImage(im);
}
void TrueRenderControl::verticalGradient(Surface &sf,
- const RenderTexture &texture,
- pixel32 *data) const
+ const RenderTexture &texture) const
{
+ pixel32 *data = sf.pixelData();
pixel32 current;
float dr, dg, db;
unsigned int r,g,b;
- unsigned int w = sf.size().width(), h = sf.size().height();
+ int w = sf.size().width(), h = sf.size().height();
dr = (float)(texture.secondary_color().red() - texture.color().red());
dr/= (float)h;
db = (float)(texture.secondary_color().blue() - texture.color().blue());
db/= (float)h;
- for (unsigned int y = 0; y < h; ++y) {
+ 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 << default_red_shift)
+ (g << default_green_shift)
+ (b << default_blue_shift);
- for (unsigned int x = 0; x < w; ++x, ++data)
+ for (int x = 0; x < w; ++x, ++data)
*data = current;
}
}
void TrueRenderControl::diagonalGradient(Surface &sf,
- const RenderTexture &texture,
- pixel32 *data) const
+ const RenderTexture &texture) const
{
+ pixel32 *data = sf.pixelData();
pixel32 current;
float drx, dgx, dbx, dry, dgy, dby;
unsigned int r,g,b;
- unsigned int w = sf.size().width(), h = sf.size().height();
+ int w = sf.size().width(), h = sf.size().height();
- for (unsigned int y = 0; y < h; ++y) {
+ for (int y = 0; y < h; ++y) {
drx = (float)(texture.secondary_color().red() - texture.color().red());
dry = drx/(float)h;
drx/= (float)w;
dbx = (float)(texture.secondary_color().blue() - texture.color().blue());
dby = dbx/(float)h;
dbx/= (float)w;
- for (unsigned int x = 0; x < w; ++x, ++data) {
+ for (int x = 0; x < w; ++x, ++data) {
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;
}
}
-void TrueRenderControl::crossDiagonalGradient(Surface &sf,
- const RenderTexture &texture,
- pixel32 *data) const
+void TrueRenderControl::crossDiagonalGradient(
+ Surface &sf, const RenderTexture &texture) const
{
+ pixel32 *data = sf.pixelData();
pixel32 current;
float drx, dgx, dbx, dry, dgy, dby;
unsigned int r,g,b;
- unsigned int w = sf.size().width(), h = sf.size().height();
+ int w = sf.size().width(), h = sf.size().height();
- for (unsigned int y = 0; y < h; ++y) {
+ for (int y = 0; y < h; ++y) {
drx = (float)(texture.secondary_color().red() - texture.color().red());
dry = drx/(float)h;
drx/= (float)w;
}
}
-void TrueRenderControl::reduceDepth(XImage *im, pixel32 *data) const
+void TrueRenderControl::reduceDepth(Surface &sf, XImage *im) const
{
// since pixel32 is the largest possible pixel size, we can share the array
int r, g, b;
int x,y;
+ pixel32 *data = sf.pixelData();
pixel16 *p = (pixel16*) data;
switch (im->bits_per_pixel) {
case 32: