namespace otk {
-Surface::Surface(int screen, const Point &size)
+Surface::Surface(int screen, const Size &size)
: _screen(screen),
_size(size),
_pixmap(None),
createObjects();
XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
- _size.x(), _size.y());
+ _size.width(), _size.height());
}
void Surface::setPixmap(XImage *image)
{
- printf("SET PIXMAP\n");
- assert(image->width == _size.x());
- assert(image->height == _size.y());
+ assert((unsigned)image->width == _size.width());
+ assert((unsigned)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()