// -*- 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 "surface.hh"
#include "display.hh"
#include "screeninfo.hh"
+#include "rendercolor.hh"
extern "C" {
#include <X11/Xutil.h>
+#include <cstring>
}
namespace otk {
-Surface::Surface(int screen)
- : _screen(screen),
- _size(1, 1),
- _im(0),
- _pm(None),
- _xftdraw(0)
-{
- createObjects();
-}
-
-Surface::Surface(int screen, const Point &size)
+Surface::Surface(int screen, const Size &size)
: _screen(screen),
_size(size),
- _im(0),
- _pm(None),
+ _pixel_data(new pixel32[size.width()*size.height()]),
+ _pixmap(None),
_xftdraw(0)
{
- createObjects();
}
Surface::~Surface()
{
destroyObjects();
+ freePixelData();
}
-void Surface::createObjects()
+void Surface::freePixelData()
{
- assert(!_im); assert(_pm == None); assert(!_xftdraw);
+ if (_pixel_data) {
+ delete [] _pixel_data;
+ _pixel_data = 0;
+ }
+}
- const ScreenInfo *info = display->screenInfo(_screen);
+void Surface::setPixmap(const RenderColor &color)
+{
+ assert(_pixel_data);
+ if (_pixmap == None)
+ createObjects();
- _im = XCreateImage(**display, info->visual(), info->depth(),
- ZPixmap, 0, NULL, _size.x(), _size.y(), 32, 0);
-
- _pm = XCreatePixmap(**display, info->rootWindow(), _size.x(), _size.y(),
- info->depth());
-
- _xftdraw = XftDrawCreate(**display, _pm, info->visual(), info->colormap());
+ XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
+ _size.width(), _size.height());
+
+ pixel32 val = (color.red() << default_red_shift) |
+ (color.green() << default_green_shift) |
+ (color.blue() << default_blue_shift);
+ for (unsigned int i = 0, s = _size.width() * _size.height(); i < s; ++i)
+ _pixel_data[i] = val;
}
-void Surface::destroyObjects()
+void Surface::setPixmap(XImage *image)
{
- assert(_im); assert(_pm != None); assert(_xftdraw);
+ assert(_pixel_data);
+ assert(image->width == _size.width());
+ assert(image->height == _size.height());
+
+ if (_pixmap == None)
+ createObjects();
- XftDrawDestroy(_xftdraw);
- _xftdraw = 0;
+ XPutImage(**display, _pixmap, DefaultGC(**display, _screen),
+ image, 0, 0, 0, 0, _size.width(), _size.height());
+}
- XFreePixmap(**display, _pm);
- _pm = None;
+void Surface::createObjects()
+{
+ assert(_pixmap == None); assert(!_xftdraw);
- // do the delete ourselves cuz we alloc it with new not malloc
- delete [] _im->data;
- _im->data = NULL;
- XDestroyImage(_im);
- _im = 0;
+ const ScreenInfo *info = display->screenInfo(_screen);
+
+ _pixmap = XCreatePixmap(**display, info->rootWindow(),
+ _size.width(), _size.height(), info->depth());
+ assert(_pixmap != None);
+
+ _xftdraw = XftDrawCreate(**display, _pixmap,
+ info->visual(), info->colormap());
+ assert(_xftdraw);
}
-void Surface::setSize(int w, int h)
+void Surface::destroyObjects()
{
- if (w == _size.x() && h == _size.y()) return; // no change
-
- _size.setPoint(w, h);
- destroyObjects();
- createObjects();
+ if (_xftdraw) {
+ XftDrawDestroy(_xftdraw);
+ _xftdraw = 0;
+ }
+
+ if (_pixmap != None) {
+ XFreePixmap(**display, _pixmap);
+ _pixmap = None;
+ }
}
}