X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Frendercontrol.cc;h=802c7f55aee4f64d7256f73eeffe0d3e73ed2402;hb=e451c08ac5a103362adbece9b8a11a16ade739c1;hp=90229d88c7db765ff98398a9e82338ec583a6485;hpb=033e9843bcec8340c9e657fe0f0519f86075424b;p=chaz%2Fopenbox diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc index 90229d88..802c7f55 100644 --- a/otk/rendercontrol.cc +++ b/otk/rendercontrol.cc @@ -1,13 +1,13 @@ // -*- 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 "rendercontrol.hh" #include "truerendercontrol.hh" +#include "pseudorendercontrol.hh" #include "rendertexture.hh" #include "rendercolor.hh" +#include "renderstyle.hh" #include "display.hh" #include "screeninfo.hh" #include "surface.hh" @@ -19,7 +19,7 @@ extern "C" { # include #endif // HAVE_STDLIB_H -#include "gettext.h" +#include "../src/gettext.h" #define _(str) gettext(str) } @@ -34,10 +34,10 @@ RenderControl *RenderControl::getRenderControl(int screen) return new TrueRenderControl(screen); case PseudoColor: case StaticColor: -// return new PseudoRenderControl(screen); + return new PseudoRenderControl(screen); case GrayScale: case StaticGray: -// return new GrayRenderControl(screen); + return new PseudoRenderControl(screen); default: printf(_("RenderControl: Unsupported visual %d specified. Aborting.\n"), vclass); @@ -49,15 +49,18 @@ RenderControl::RenderControl(int screen) : _screen(screen) { printf("Initializing RenderControl\n"); - - } RenderControl::~RenderControl() { printf("Destroying RenderControl\n"); +} - +void RenderControl::drawRoot(const RenderColor &color) const +{ + Window root = display->screenInfo(_screen)->rootWindow(); + XSetWindowBackground(**display, root, color.pixel()); + XClearWindow(**display, root); } void RenderControl::drawString(Surface& sf, const Font &font, int x, int y, @@ -99,7 +102,6 @@ void RenderControl::drawString(Surface& sf, const Font &font, int x, int y, else XftDrawString8(d, &c, font._xftfont, x, font._xftfont->ascent + y, (FcChar8*)string.c_str(), string.bytes()); - return; } @@ -113,7 +115,7 @@ void RenderControl::drawSolidBackground(Surface& sf, sf.setPixmap(texture.color()); - int width = sf.width(), height = sf.height(); + int width = sf.size().width(), height = sf.size().height(); int left = 0, top = 0, right = width - 1, bottom = height - 1; if (texture.interlaced()) @@ -188,4 +190,309 @@ void RenderControl::drawSolidBackground(Surface& sf, } } +void RenderControl::drawMask(Surface &sf, const RenderColor &color, + const PixmapMask &mask) const +{ + assert(_screen == sf._screen); + assert(_screen == color.screen()); + + if (mask.mask == None) return; // no mask given + + int width = sf.size().width(), height = sf.size().height(); + + // set the clip region + int x = (width - mask.w) / 2, y = (height - mask.h) / 2; + XSetClipMask(**display, color.gc(), mask.mask); + XSetClipOrigin(**display, color.gc(), x, y); + + // fill in the clipped region + XFillRectangle(**display, sf.pixmap(), color.gc(), x, y, + x + mask.w, y + mask.h); + + // unset the clip region + XSetClipMask(**display, color.gc(), None); + XSetClipOrigin(**display, color.gc(), 0, 0); +} + +void RenderControl::drawGradientBackground( + Surface &sf, const RenderTexture &texture) const +{ + unsigned int r,g,b; + 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; + + switch (texture.gradient()) { + case RenderTexture::Vertical: + verticalGradient(sf, texture); + break; + case RenderTexture::Diagonal: + diagonalGradient(sf, texture); + break; + case RenderTexture::CrossDiagonal: + 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(); + b = texture.borderColor().blue(); + 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; + } + for (off = 0, x = 0; x < h; ++x, off++) { + *(data + (off * w)) = current; + *(data + (off * w) + w - 1) = current; + } + } + + if (texture.relief() != RenderTexture::Flat) { + if (texture.bevel() == RenderTexture::Bevel1) { + 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) { + 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(sf, im); + + im->data = (char*) data; + + sf.setPixmap(im); + + im->data = NULL; + XDestroyImage(im); +} + +void RenderControl::verticalGradient(Surface &sf, + const RenderTexture &texture) const +{ + pixel32 *data = sf.pixelData(); + pixel32 current; + float dr, dg, db; + unsigned int r,g,b; + int w = sf.size().width(), h = sf.size().height(); + + dr = (float)(texture.secondary_color().red() - texture.color().red()); + dr/= (float)h; + + dg = (float)(texture.secondary_color().green() - texture.color().green()); + dg/= (float)h; + + db = (float)(texture.secondary_color().blue() - texture.color().blue()); + db/= (float)h; + + 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 (int x = 0; x < w; ++x, ++data) + *data = current; + } +} + +void RenderControl::diagonalGradient(Surface &sf, + const RenderTexture &texture) const +{ + pixel32 *data = sf.pixelData(); + pixel32 current; + float drx, dgx, dbx, dry, dgy, dby; + unsigned int r,g,b; + int w = sf.size().width(), h = sf.size().height(); + + for (int y = 0; y < h; ++y) { + drx = (float)(texture.secondary_color().red() - texture.color().red()); + dry = drx/(float)h; + drx/= (float)w; + + dgx = (float)(texture.secondary_color().green() - texture.color().green()); + dgy = dgx/(float)h; + dgx/= (float)w; + + dbx = (float)(texture.secondary_color().blue() - texture.color().blue()); + dby = dbx/(float)h; + dbx/= (float)w; + 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; + current = (r << default_red_shift) + + (g << default_green_shift) + + (b << default_blue_shift); + *data = current; + } + } +} + +void RenderControl::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; + int w = sf.size().width(), h = sf.size().height(); + + for (int y = 0; y < h; ++y) { + drx = (float)(texture.secondary_color().red() - texture.color().red()); + dry = drx/(float)h; + drx/= (float)w; + + dgx = (float)(texture.secondary_color().green() - texture.color().green()); + dgy = dgx/(float)h; + dgx/= (float)w; + + dbx = (float)(texture.secondary_color().blue() - texture.color().blue()); + dby = dbx/(float)h; + dbx/= (float)w; + for (int x = w; x > 0; --x, ++data) { + 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 << default_red_shift) + + (g << default_green_shift) + + (b << default_blue_shift); + *data = current; + } + } +} + +void RenderControl::highlight(pixel32 *x, pixel32 *y, bool raised) const +{ + int r, g, b; + + pixel32 *up, *down; + if (raised) { + up = x; + down = y; + } else { + up = y; + down = x; + } + r = (*up >> default_red_shift) & 0xFF; + r += r >> 1; + g = (*up >> default_green_shift) & 0xFF; + g += g >> 1; + 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 << default_red_shift) + (g << default_green_shift) + + (b << default_blue_shift); + + r = (*down >> default_red_shift) & 0xFF; + r = (r >> 1) + (r >> 2); + g = (*down >> default_green_shift) & 0xFF; + g = (g >> 1) + (g >> 2); + b = (*down >> default_blue_shift) & 0xFF; + b = (b >> 1) + (b >> 2); + *down = (r << default_red_shift) + (g << default_green_shift) + + (b << default_blue_shift); +} + +void RenderControl::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); +} + + +void RenderControl::drawImage(Surface &sf, int w, int h, + unsigned long *data) const +{ + pixel32 *bg = sf.pixelData(); + int startx, x, y, c; + unsigned int i, e; + x = (sf.size().width() - w) / 2; + y = (sf.size().height() - h) / 2; + + if (x < 0) x = 0; + if (y < 0) y = 0; + + // XX SCALING!@!&*(@! to make it fit on the surface + + startx = x; + + for (i = 0, c = 0, e = w*h; i < e; ++i) { + unsigned char alpha = data[i] >> 24; + unsigned char r = data[i] >> 16; + unsigned char g = data[i] >> 8; + unsigned char b = data[i]; + + // background color + unsigned char bgr = bg[i] >> default_red_shift; + unsigned char bgg = bg[i] >> default_green_shift; + unsigned char bgb = bg[i] >> default_blue_shift; + + r = bgr + (r - bgr) * alpha >> 8; + g = bgg + (g - bgg) * alpha >> 8; + b = bgb + (b - bgb) * alpha >> 8; + + bg[i] = (r << default_red_shift) | (g << default_green_shift) | + (b << default_blue_shift); + + if (++c >= w) { + ++y; + x = startx; + c = 0; + } else + ++x; + } + + const ScreenInfo *info = display->screenInfo(_screen); + XImage *im = XCreateImage(**display, info->visual(), info->depth(), + ZPixmap, 0, NULL, sf.size().width(), + sf.size().height(), 32, 0); + im->byte_order = endian; + + reduceDepth(sf, im); + + im->data = (char*) bg; + + sf.setPixmap(im); + + im->data = NULL; + XDestroyImage(im); +} + }