#include "display.hh"
#include "assassin.hh"
#include "screeninfo.hh"
-
+#include "focuslabel.hh"
#include <algorithm>
#include <iostream>
_stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
_bcolor(0), _bwidth(0), _rect(0, 0, 1, 1), _screen(parent->screen()),
_fixed_width(false), _fixed_height(false),
- _surface(parent->screen(), _rect.size()),
+ _surface(0),
_event_dispatcher(parent->eventDispatcher())
{
assert(parent);
setStyle(_style); // let the widget initialize stuff
}
-Widget::Widget(EventDispatcher *event_dispatcher, Style *style,
- Direction direction, Cursor cursor, int bevel_width,
- bool override_redirect)
+Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
+ Direction direction, Cursor cursor, int bevel_width,
+ bool override_redirect)
: EventHandler(),
_dirty(false),_focused(false),
_parent(0), _style(style), _direction(direction), _cursor(cursor),
_grabbed_mouse(false), _grabbed_keyboard(false),
_stretchable_vert(false), _stretchable_horz(false), _texture(0),
_bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0), _rect(0, 0, 1, 1),
- _screen(style->getScreen()), _fixed_width(false), _fixed_height(false),
- _surface(style->getScreen(), _rect.size()),
+ _screen(style->screen()), _fixed_width(false), _fixed_height(false),
+ _surface(0),
_event_dispatcher(event_dispatcher)
{
assert(event_dispatcher);
if (recursive) {
WidgetList::iterator it = _children.begin(), end = _children.end();
for (; it != end; ++it)
- (*it)->show();
+ (*it)->show(recursive);
}
XMapWindow(**display, _window);
void Widget::render(void)
{
if (!_texture) return;
- printf("RENDER\n");
- _surface = Surface(_screen, _rect.size());
- display->renderControl(_screen)->drawBackground(_surface, *_texture);
+ Surface *s = _surface; // save the current surface
+
+ _surface = new Surface(_screen, _rect.size());
+ display->renderControl(_screen)->drawBackground(*_surface, *_texture);
+
+ renderForeground(); // for inherited types to render onto the _surface
- renderForeground();
+ XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap());
- XSetWindowBackgroundPixmap(**display, _window, _surface.pixmap());
+ delete s; // delete the old surface *after* its pixmap isn't in use anymore
}
void Widget::adjust(void)
_children.erase(it);
}
-void Widget::setStyle(Style *style)
+void Widget::setStyle(RenderStyle *style)
{
assert(style);
_style = style;
void Widget::exposeHandler(const XExposeEvent &e)
{
EventHandler::exposeHandler(e);
- _dirty = true;
- update();
+// XClearArea(**display, _window, e.x, e.y, e.width, e.height, false);
}
void Widget::configureHandler(const XConfigureEvent &e)
{
EventHandler::configureHandler(e);
+
if (_ignore_config) {
_ignore_config--;
} else {
- if (!(e.width == _rect.width() && e.height == _rect.height())) {
+ int width = e.width;
+ int height = e.height;
+
+ XEvent ev;
+ while (XCheckTypedWindowEvent(**display, _window, ConfigureNotify, &ev)) {
+ width = ev.xconfigure.width;
+ height = ev.xconfigure.height;
+ }
+
+ if (!(width == _rect.width() && height == _rect.height())) {
_dirty = true;
- _rect.setSize(e.width, e.height);
+ _rect.setSize(width, height);
}
update();
}