diff options
Diffstat (limited to 'otk')
| -rw-r--r-- | otk/widget.cc | 191 | ||||
| -rw-r--r-- | otk/widget.hh | 32 |
2 files changed, 190 insertions, 33 deletions
diff --git a/otk/widget.cc b/otk/widget.cc index 7a8a390b..4522a1c0 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -4,6 +4,7 @@ #include "screeninfo.hh" #include <algorithm> +#include <iostream> namespace otk { @@ -12,8 +13,9 @@ OtkWidget::OtkWidget(OtkWidget *parent, Direction direction) _cursor(parent->getCursor()), _bevel_width(parent->getBevelWidth()), _visible(false), _focused(false), _grabbed_mouse(false), _grabbed_keyboard(false), _stretchable_vert(false), - _stretchable_horz(false), _texture(0), _bg_pixmap(0), - _screen(parent->getScreen()) + _stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0), + _screen(parent->getScreen()), _fixed_width(false), _fixed_height(false), + _dirty(false) { parent->addChild(this); create(); @@ -25,7 +27,8 @@ OtkWidget::OtkWidget(Style *style, Direction direction, _bevel_width(bevel_width), _visible(false), _focused(false), _grabbed_mouse(false), _grabbed_keyboard(false), _stretchable_vert(false), _stretchable_horz(false), _texture(0), - _bg_pixmap(0), _screen(style->getScreen()) + _bg_pixmap(0), _bg_pixel(0), _screen(style->getScreen()), + _fixed_width(false), _fixed_height(false), _dirty(false) { assert(style); create(); @@ -70,6 +73,20 @@ void OtkWidget::create(void) scr_info->getVisual(), create_mask, &attrib_create); } +void OtkWidget::setWidth(int w) +{ + assert(w > 0); + _fixed_width = true; + setGeometry(_rect.x(), _rect.y(), w, _rect.height()); +} + +void OtkWidget::setHeight(int h) +{ + assert(h > 0); + _fixed_height = true; + setGeometry(_rect.x(), _rect.y(), _rect.width(), h); +} + void OtkWidget::move(const Point &to) { move(to.x(), to.y()); @@ -86,11 +103,11 @@ void OtkWidget::resize(const Point &to) resize(to.x(), to.y()); } -void OtkWidget::resize(int x, int y) +void OtkWidget::resize(int w, int h) { - assert(x >= _rect.x() && y >= _rect.y()); - - setGeometry(_rect.x(), _rect.y(), x - _rect.x(), y - _rect.y()); + assert(w > 0 && h > 0); + _fixed_width = _fixed_height = true; + setGeometry(_rect.x(), _rect.y(), w, h); } void OtkWidget::setGeometry(const Rect &new_geom) @@ -106,12 +123,9 @@ void OtkWidget::setGeometry(const Point &topleft, int width, int height) void OtkWidget::setGeometry(int x, int y, int width, int height) { _rect = Rect(x, y, width, height); - - fprintf(stderr, "Resizing to x: %d, y: %d, width: %d, height: %d\n", - x, y, width, height); + _dirty = true; XMoveResizeWindow(otk::OBDisplay::display, _window, x, y, width, height); - setTexture(); } void OtkWidget::show(void) @@ -119,14 +133,13 @@ void OtkWidget::show(void) if (_visible) return; + // make sure the internal state isn't mangled + if (_dirty) + update(); + OtkWidgetList::iterator it = _children.begin(), end = _children.end(); - for (; it != end; ++it) { - fprintf(stderr, "showing child\n"); + for (; it != end; ++it) (*it)->show(); - } - - fprintf(stderr, "x: %d, y: %d, width: %d, height: %d\n", - _rect.x(), _rect.y(), _rect.width(), _rect.height()); XMapWindow(otk::OBDisplay::display, _window); _visible = true; @@ -193,22 +206,143 @@ void OtkWidget::ungrabKeyboard(void) _grabbed_keyboard = false; } -void OtkWidget::setTexture(BTexture *texture) +void OtkWidget::render(void) { - if (!texture && !_texture) - return; - Pixmap old = _bg_pixmap; - if (texture) - _texture = texture; - _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap); - if (_bg_pixmap != old) + if (_bg_pixmap && _bg_pixmap != old) XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap); - - //XSetWindowBackground(otk::OBDisplay::display, win, pix); + else { + unsigned int pix = _texture->color().pixel(); + if (pix != _bg_pixel) { + _bg_pixel = pix; + XSetWindowBackground(otk::OBDisplay::display, _window, pix); + } + } +} + +void OtkWidget::adjust(void) +{ + if (_direction == Horizontal) + adjustHorz(); + else + adjustVert(); +} + +void OtkWidget::adjustHorz(void) +{ + if (_children.size() == 0) + return; + + OtkWidget *tmp; + OtkWidgetList::iterator it, end = _children.end(); + + int tallest = 0; + int width = _bevel_width; + OtkWidgetList stretchable; + + for (it = _children.begin(); it != end; ++it) { + tmp = *it; + if (tmp->isStretchableHorz() && _fixed_width) + stretchable.push_back(tmp); + else + width += tmp->_rect.width() + _bevel_width; + + if (tmp->_rect.height() > tallest) + tallest = tmp->_rect.height(); + } + + if (stretchable.size() > 0) { + OtkWidgetList::iterator str_it = stretchable.begin(), + str_end = stretchable.end(); + + int str_width = _rect.width() - width / stretchable.size(); + + for (; str_it != str_end; ++str_it) { + (*str_it)->setWidth(str_width - _bevel_width); + (*str_it)->update(); + } + } + + OtkWidget *prev_widget = 0; + + for (it = _children.begin(); it != end; ++it) { + tmp = *it; + int x, y; + + if (prev_widget) + x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width; + else + x = _rect.x() + _bevel_width; + y = (tallest - tmp->_rect.height()) / 2 + _bevel_width; + + tmp->move(x, y); + + prev_widget = tmp; + } + + internalResize(width, tallest + _bevel_width * 2); +} + +void OtkWidget::adjustVert(void) +{ + if (_children.size() == 0) + return; + + OtkWidget *tmp; + OtkWidgetList::iterator it, end = _children.end(); + + int widest = 0; + int height = _bevel_width; + for (it = _children.begin(); it != end; ++it) { + tmp = *it; + if (tmp->_rect.width() > widest) + widest = tmp->_rect.width(); + height += tmp->_rect.height() + _bevel_width; + } + + OtkWidget *prev_widget = 0; + + for (it = _children.begin(); it != end; ++it) { + tmp = *it; + int x, y; + + if (prev_widget) + y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width; + else + y = _rect.y() + _bevel_width; + x = (widest - tmp->_rect.width()) / 2 + _bevel_width; + + tmp->move(x, y); + + prev_widget = tmp; + } + + internalResize(widest + _bevel_width * 2, height); +} + +void OtkWidget::update(void) +{ + if (_dirty) { + adjust(); + render(); + XClearWindow(OBDisplay::display, _window); + } + _dirty = false; +} + +void OtkWidget::internalResize(int w, int h) +{ + assert(w > 0 && h > 0); + + if (! _fixed_width && ! _fixed_height) + resize(w, h); + else if (! _fixed_width) + resize(w, _rect.height()); + else if (! _fixed_height) + resize(_rect.width(), h); } void OtkWidget::addChild(OtkWidget *child, bool front) @@ -222,8 +356,9 @@ void OtkWidget::addChild(OtkWidget *child, bool front) void OtkWidget::removeChild(OtkWidget *child) { + assert(child); OtkWidgetList::iterator it, end = _children.end(); - for (; it != end; ++it) { + for (it = _children.begin(); it != end; ++it) { if ((*it) == child) break; } diff --git a/otk/widget.hh b/otk/widget.hh index dd12de7c..ccda3b1f 100644 --- a/otk/widget.hh +++ b/otk/widget.hh @@ -1,3 +1,6 @@ +#ifndef __focus_hh +#define __focus_hh + #include <string> #include <list> @@ -22,6 +25,8 @@ public: virtual ~OtkWidget(); + void update(void); + inline Window getWindow(void) const { return _window; } inline const OtkWidget *getParent(void) const { return _parent; } inline const OtkWidgetList &getChildren(void) const { return _children; } @@ -31,6 +36,9 @@ public: void move(const Point &to); void move(int x, int y); + virtual void setWidth(int); + virtual void setHeight(int); + virtual void resize(const Point &to); virtual void resize(int x, int y); @@ -53,16 +61,17 @@ public: bool grabKeyboard(void); void ungrabKeyboard(void); - inline const BTexture *getTexture(void) const { return _texture; } - virtual void setTexture(BTexture *texture = 0); + inline BTexture *getTexture(void) const { return _texture; } + virtual void setTexture(BTexture *texture) + { _texture = texture; _dirty = true; } virtual void addChild(OtkWidget *child, bool front = false); virtual void removeChild(OtkWidget *child); - inline bool getStretchableHorz(void) const { return _stretchable_horz; } + inline bool isStretchableHorz(void) const { return _stretchable_horz; } void setStretchableHorz(bool s_horz) { _stretchable_horz = s_horz; } - inline bool getStretchableVert(void) const { return _stretchable_vert; } + inline bool isStretchableVert(void) const { return _stretchable_vert; } void setStretchableVert(bool s_vert) { _stretchable_vert = s_vert; } inline Cursor getCursor(void) const { return _cursor; } @@ -80,12 +89,17 @@ public: private: void create(void); + void adjust(void); + void adjustHorz(void); + void adjustVert(void); + void internalResize(int width, int height); + void render(void); Window _window; OtkWidget *_parent; OtkWidgetList _children; - + Style *_style; Direction _direction; Cursor _cursor; @@ -102,9 +116,17 @@ private: BTexture *_texture; Pixmap _bg_pixmap; + unsigned int _bg_pixel; Rect _rect; unsigned int _screen; + + bool _fixed_width; + bool _fixed_height; + + bool _dirty; }; } + +#endif // __widget_hh |