// -*- 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 "gccache.hh"
+#include "rendercolor.hh"
extern "C" {
#include <X11/Xutil.h>
namespace otk {
-Surface::Surface(int screen, const Point &size)
+Surface::Surface(int screen, const Size &size)
: _screen(screen),
_size(size),
_pixmap(None),
destroyObjects();
}
-void Surface::setPixmap(const Color &color)
+void Surface::setPixmap(const RenderColor &color)
{
if (_pixmap == None)
createObjects();
- Pen p(color);
- XFillRectangle(**display, _pixmap, p.gc(), 0, 0,
- _size.x(), _size.y());
+ XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
+ _size.width(), _size.height());
}
void Surface::setPixmap(XImage *image)
{
- printf("SET PIXMAP\n");
- assert(image->width == _size.x());
- assert(image->height == _size.y());
+ assert(image->width == _size.width());
+ assert(image->height == _size.height());
if (_pixmap == None)
createObjects();
XPutImage(**display, _pixmap, DefaultGC(**display, _screen),
- image, 0, 0, 0, 0, _size.x(), _size.y());
+ image, 0, 0, 0, 0, _size.width(), _size.height());
}
void Surface::createObjects()
const ScreenInfo *info = display->screenInfo(_screen);
_pixmap = XCreatePixmap(**display, info->rootWindow(),
- _size.x(), _size.y(), info->depth());
+ _size.width(), _size.height(), info->depth());
+ assert(_pixmap != None);
_xftdraw = XftDrawCreate(**display, _pixmap,
info->visual(), info->colormap());
+ assert(_xftdraw);
}
void Surface::destroyObjects()