// -*- 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"
extern "C" {
#include <X11/Xutil.h>
+#include <cstring>
}
namespace otk {
Surface::Surface(int screen, const Size &size)
: _screen(screen),
_size(size),
+ _pixel_data(new pixel32[size.width()*size.height()]),
_pixmap(None),
_xftdraw(0)
{
Surface::~Surface()
{
destroyObjects();
+ freePixelData();
+}
+
+void Surface::freePixelData()
+{
+ if (_pixel_data) {
+ delete [] _pixel_data;
+ _pixel_data = 0;
+ }
}
void Surface::setPixmap(const RenderColor &color)
{
+ assert(_pixel_data);
if (_pixmap == None)
createObjects();
-
+
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::setPixmap(XImage *image)
{
- assert((unsigned)image->width == _size.width());
- assert((unsigned)image->height == _size.height());
+ assert(_pixel_data);
+ assert(image->width == _size.width());
+ assert(image->height == _size.height());
if (_pixmap == None)
createObjects();