X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=67535024721932b2a64a604196a295813c867242;hb=59ef3022a4ce0a23e6d54f7d73a2aa77721e9cc9;hp=dc4cfa2ec8eca033fd7749dcb7b6cfeacf49a266;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox diff --git a/otk/widget.cc b/otk/widget.cc index dc4cfa2e..67535024 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -8,15 +8,14 @@ #include "display.hh" #include "assassin.hh" #include "screeninfo.hh" - +#include "focuslabel.hh" #include #include namespace otk { Widget::Widget(Widget *parent, Direction direction) - : Surface(parent->screen()), - EventHandler(), + : EventHandler(), _dirty(false), _focused(false), _parent(parent), _style(parent->style()), _direction(direction), _cursor(parent->cursor()), _bevel_width(parent->bevelWidth()), @@ -24,36 +23,39 @@ Widget::Widget(Widget *parent, Direction direction) _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), + _event_mask(ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | + ExposureMask | StructureNotifyMask), + _surface(0), _event_dispatcher(parent->eventDispatcher()) { assert(parent); parent->addChild(this); create(); _event_dispatcher->registerHandler(_window, this); - setStyle(_style); // let the widget initialize stuff } -Widget::Widget(EventDispatcher *event_dispatcher, Style *style, - Direction direction, Cursor cursor, int bevel_width, - bool override_redirect) - : Surface(style->getScreen()), - EventHandler(), +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), + _event_mask(ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | + ExposureMask | StructureNotifyMask), + _surface(0), _event_dispatcher(event_dispatcher) { assert(event_dispatcher); assert(style); create(override_redirect); _event_dispatcher->registerHandler(_window, this); - setStyle(_style); // let the widget initialize stuff } Widget::~Widget() @@ -61,6 +63,9 @@ Widget::~Widget() if (_visible) hide(); + if (_surface) + delete _surface; + _event_dispatcher->clearHandler(_window); std::for_each(_children.begin(), _children.end(), PointerAssassin()); @@ -76,13 +81,14 @@ void Widget::create(bool override_redirect) 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.background_pixmap = None; attrib_create.colormap = scr_info->colormap(); - attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask | - ButtonMotionMask | ExposureMask | StructureNotifyMask; + attrib_create.event_mask = _event_mask; if (override_redirect) { create_mask |= CWOverrideRedirect; @@ -94,25 +100,31 @@ void Widget::create(bool override_redirect) 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++; } +void Widget::setEventMask(long e) +{ + XSelectInput(**display, _window, e); + _event_mask = e; +} + void Widget::setWidth(int w) { 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) @@ -122,7 +134,7 @@ 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++; } @@ -136,7 +148,7 @@ void Widget::resize(int w, int h) { 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) @@ -151,10 +163,16 @@ void Widget::setGeometry(const Point &topleft, int width, int height) 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; + // make all parents dirty too + Widget *p = _parent; + while (p) { + p->_dirty = true; + p = p->_parent; + } + // don't use an XMoveResizeWindow here, because it doesn't seem to move // windows with StaticGravity? This works, that didn't. XResizeWindow(**display, _window, width, height); @@ -174,7 +192,7 @@ void Widget::show(bool recursive) if (recursive) { WidgetList::iterator it = _children.begin(), end = _children.end(); for (; it != end; ++it) - (*it)->show(); + (*it)->show(recursive); } XMapWindow(**display, _window); @@ -257,20 +275,22 @@ void Widget::ungrabKeyboard(void) void Widget::render(void) { - if (!_texture) return; + if (!_texture) { + XSetWindowBackgroundPixmap(**display, _window, ParentRelative); + return; + } - _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); - } - } + renderForeground(); // for inherited types to render onto the _surface + + XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap()); + + if (s) + delete s; // delete the old surface *after* its pixmap isn't in use anymore } void Widget::adjust(void) @@ -296,22 +316,22 @@ void Widget::adjustHorz(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 @@ -325,16 +345,15 @@ void Widget::adjustHorz(void) 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 = _bevel_width; + y = (tallest - tmp->_rect.height()) / 2 + _bevel_width; tmp->move(x, y); prev_widget = tmp; } - internalResize(width, tallest + _bevel_width * 2); } @@ -353,27 +372,29 @@ void Widget::adjustVert(void) 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 ? str_height - _bevel_width : _bevel_width); } + if (stretchable.size() > 0) + height = _rect.height(); Widget *prev_widget = 0; @@ -382,10 +403,10 @@ void Widget::adjustVert(void) 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 = _bevel_width; + x = (widest - tmp->_rect.width()) / 2 + _bevel_width; tmp->move(x, y); @@ -395,18 +416,18 @@ void Widget::adjustVert(void) internalResize(widest + _bevel_width * 2, height); } -void Widget::update(void) +void Widget::update() { + WidgetList::iterator it = _children.begin(), end = _children.end(); + for (; it != end; ++it) + (*it)->update(); + if (_dirty) { adjust(); render(); XClearWindow(**display, _window); } - WidgetList::iterator it = _children.begin(), end = _children.end(); - for (; it != end; ++it) - (*it)->update(); - _dirty = false; } @@ -414,12 +435,17 @@ void Widget::internalResize(int w, int h) { assert(w > 0 && h > 0); - if (! _fixed_width && ! _fixed_height) + bool fw = _fixed_width, fh = _fixed_height; + + if (! fw && ! fh) resize(w, h); - else if (! _fixed_width) - resize(w, height()); - else if (! _fixed_height) - resize(width(), h); + else if (! fw) + resize(w, _rect.height()); + else if (! fh) + resize(_rect.width(), h); + + _fixed_width = fw; + _fixed_height = fh; } void Widget::addChild(Widget *child, bool front) @@ -444,7 +470,7 @@ void Widget::removeChild(Widget *child) _children.erase(it); } -void Widget::setStyle(Style *style) +void Widget::setStyle(RenderStyle *style) { assert(style); _style = style; @@ -467,20 +493,28 @@ void Widget::setEventDispatcher(EventDispatcher *disp) 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(); }