#include "display.hh"
#include "assassin.hh"
#include "screeninfo.hh"
-
+#include "focuslabel.hh"
#include <algorithm>
#include <iostream>
_visible(false), _grabbed_mouse(false),
_grabbed_keyboard(false), _stretchable_vert(false),
_stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
- _bcolor(0), _bwidth(0), _pos(0,0), _screen(parent->screen()),
+ _bcolor(0), _bwidth(0), _rect(0, 0, 1, 1), _screen(parent->screen()),
_fixed_width(false), _fixed_height(false),
+ _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),
_bevel_width(bevel_width), _ignore_config(0), _visible(false),
_grabbed_mouse(false), _grabbed_keyboard(false),
_stretchable_vert(false), _stretchable_horz(false), _texture(0),
- _bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0), _pos(0,0),
- _screen(style->getScreen()), _fixed_width(false), _fixed_height(false),
+ _bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0), _rect(0, 0, 1, 1),
+ _screen(style->screen()), _fixed_width(false), _fixed_height(false),
+ _surface(0),
_event_dispatcher(event_dispatcher)
{
assert(event_dispatcher);
const ScreenInfo *scr_info = display->screenInfo(_screen);
Window p_window = _parent ? _parent->window() : scr_info->rootWindow();
+ _rect.setRect(0, 0, 1, 1); // just some initial values
+
XSetWindowAttributes attrib_create;
unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
attrib_create.cursor = _cursor;
}
- _window = XCreateWindow(**display, p_window, _pos.x(),
- _pos.y(), width(), height(), 0,
+ _window = XCreateWindow(**display, p_window, _rect.x(),
+ _rect.y(), _rect.width(), _rect.height(), 0,
scr_info->depth(), InputOutput,
scr_info->visual(), create_mask, &attrib_create);
_ignore_config++;
{
assert(w > 0);
_fixed_width = true;
- setGeometry(_pos.x(), _pos.y(), w, height());
+ setGeometry(_rect.x(), _rect.y(), w, _rect.height());
}
void Widget::setHeight(int h)
{
assert(h > 0);
_fixed_height = true;
- setGeometry(_pos.x(), _pos.y(), _pos.x(), h);
+ setGeometry(_rect.x(), _rect.y(), _rect.width(), h);
}
void Widget::move(const Point &to)
void Widget::move(int x, int y)
{
- _pos.setPoint(x, y);
+ _rect.setPos(x, y);
XMoveWindow(**display, _window, x, y);
_ignore_config++;
}
{
assert(w > 0 && h > 0);
_fixed_width = _fixed_height = true;
- setGeometry(_pos.x(), _pos.y(), w, h);
+ setGeometry(_rect.x(), _rect.y(), w, h);
}
void Widget::setGeometry(const Rect &new_geom)
void Widget::setGeometry(int x, int y, int width, int height)
{
- _pos.setPoint(x, y);
- setSize(width, height);
+ _rect = Rect(x, y, width, height);
_dirty = true;
// don't use an XMoveResizeWindow here, because it doesn't seem to move
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");
- _bg_pixmap = _texture->render(width(), height(), _bg_pixmap);
+ Surface *s = _surface; // save the current surface
+
+ _surface = new Surface(_screen, _rect.size());
+ display->renderControl(_screen)->drawBackground(*_surface, *_texture);
- if (_bg_pixmap) {
- XSetWindowBackgroundPixmap(**display, _window, _bg_pixmap);
- _bg_pixel = None;
- } else {
- unsigned int pix = _texture->color().pixel();
- if (pix != _bg_pixel) {
- _bg_pixel = pix;
- XSetWindowBackground(**display, _window, pix);
- }
- }
+ if (dynamic_cast<FocusLabel*>(this))
+ printf("IM A FOCUSLABEL RENDERING\n");
+ renderForeground(); // for inherited types to render onto the _surface
+
+ XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap());
+
+ delete s; // delete the old surface *after* its pixmap isn't in use anymore
}
void Widget::adjust(void)
for (it = _children.begin(); it != end; ++it) {
tmp = *it;
if (tmp->isStretchableVert())
- tmp->setHeight(height() > _bevel_width * 2 ?
- height() - _bevel_width * 2 : _bevel_width);
+ tmp->setHeight(_rect.height() > _bevel_width * 2 ?
+ _rect.height() - _bevel_width * 2 : _bevel_width);
if (tmp->isStretchableHorz())
stretchable.push_back(tmp);
else
- width += tmp->width() + _bevel_width;
+ width += tmp->_rect.width() + _bevel_width;
- if (tmp->height() > tallest)
- tallest = tmp->height();
+ if (tmp->_rect.height() > tallest)
+ tallest = tmp->_rect.height();
}
if (stretchable.size() > 0) {
WidgetList::iterator str_it = stretchable.begin(),
str_end = stretchable.end();
- int str_width = Surface::width() - width / stretchable.size();
+ int str_width = _rect.width() - width / stretchable.size();
for (; str_it != str_end; ++str_it)
(*str_it)->setWidth(str_width > _bevel_width ? str_width - _bevel_width
int x, y;
if (prev_widget)
- x = prev_widget->_pos.x() + prev_widget->width() + _bevel_width;
+ x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width;
else
- x = _pos.x() + _bevel_width;
- y = (tallest - tmp->height()) / 2 + _bevel_width;
+ x = _rect.x() + _bevel_width;
+ y = (tallest - tmp->_rect.height()) / 2 + _bevel_width;
tmp->move(x, y);
for (it = _children.begin(); it != end; ++it) {
tmp = *it;
if (tmp->isStretchableHorz())
- tmp->setWidth(width() > _bevel_width * 2 ?
- width() - _bevel_width * 2 : _bevel_width);
+ tmp->setWidth(_rect.width() > _bevel_width * 2 ?
+ _rect.width() - _bevel_width * 2 : _bevel_width);
if (tmp->isStretchableVert())
stretchable.push_back(tmp);
else
- height += tmp->height() + _bevel_width;
+ height += tmp->_rect.height() + _bevel_width;
- if (tmp->width() > widest)
- widest = tmp->width();
+ if (tmp->_rect.width() > widest)
+ widest = tmp->_rect.width();
}
if (stretchable.size() > 0) {
WidgetList::iterator str_it = stretchable.begin(),
str_end = stretchable.end();
- int str_height = Surface::height() - height / stretchable.size();
+ int str_height = _rect.height() - height / stretchable.size();
for (; str_it != str_end; ++str_it)
(*str_it)->setHeight(str_height > _bevel_width ?
int x, y;
if (prev_widget)
- y = prev_widget->_pos.y() + prev_widget->height() + _bevel_width;
+ y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width;
else
- y = _pos.y() + _bevel_width;
- x = (widest - tmp->width()) / 2 + _bevel_width;
+ y = _rect.y() + _bevel_width;
+ x = (widest - tmp->_rect.width()) / 2 + _bevel_width;
tmp->move(x, y);
if (! _fixed_width && ! _fixed_height)
resize(w, h);
else if (! _fixed_width)
- resize(w, height());
+ resize(w, _rect.height());
else if (! _fixed_height)
- resize(width(), h);
+ resize(_rect.width(), h);
}
void Widget::addChild(Widget *child, bool front)
_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 == width() && e.height == 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;
- _pos.setPoint(e.x, e.y);
- setSize(e.width, e.height);
+ _rect.setSize(width, height);
}
update();
}
projects / chaz / openbox / blobdiff