X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=85b4206ee4d2c8db6b1a483332320d544f51a57b;hb=6f5e60f0337e60d904a8f549aeaa631afefc8033;hp=9d8c37a0fd2976b0a89d51ad89bacfe8344000a1;hpb=0856b11de843db30b5053c8cb7d9c84eae262852;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index 9d8c37a0..85b4206e 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -9,22 +9,41 @@
 namespace otk {
 
 OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
-  : _parent(parent), _style(parent->getStyle()), _direction(direction),
+  : OtkEventHandler(),
+    _parent(parent), _style(parent->getStyle()), _direction(direction),
     _cursor(parent->getCursor()), _bevel_width(parent->getBevelWidth()),
     _ignore_config(0),
     _visible(false), _focused(false), _grabbed_mouse(false),
     _grabbed_keyboard(false), _stretchable_vert(false),
     _stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
     _screen(parent->getScreen()), _fixed_width(false), _fixed_height(false),
-    _dirty(false)
+    _dirty(false), _event_dispatcher(parent->getEventDispatcher())
 {
   parent->addChild(this);
   create();
+  _event_dispatcher->registerHandler(_window, this);
+}
+
+OtkWidget::OtkWidget(OtkApplication *app, Direction direction,
+                     Cursor cursor, int bevel_width)
+  : OtkEventHandler(),
+    _parent(0), _style(app->getStyle()), _direction(direction), _cursor(cursor),
+    _bevel_width(bevel_width), _ignore_config(0), _visible(false),
+    _focused(false), _grabbed_mouse(false), _grabbed_keyboard(false),
+    _stretchable_vert(false), _stretchable_horz(false), _texture(0),
+    _bg_pixmap(0), _bg_pixel(0), _screen(app->getStyle()->getScreen()),
+    _fixed_width(false), _fixed_height(false), _dirty(false),
+    _event_dispatcher(app)
+{
+  assert(app);
+  create();
+  _event_dispatcher->registerHandler(_window, this);
 }
 
 OtkWidget::OtkWidget(Style *style, Direction direction,
                      Cursor cursor, int bevel_width)
-  : _parent(0), _style(style), _direction(direction), _cursor(cursor),
+  : OtkEventHandler(),
+    _parent(0), _style(style), _direction(direction), _cursor(cursor),
     _bevel_width(bevel_width), _ignore_config(0), _visible(false),
     _focused(false), _grabbed_mouse(false), _grabbed_keyboard(false),
     _stretchable_vert(false), _stretchable_horz(false), _texture(0),
@@ -72,6 +91,7 @@ void OtkWidget::create(void)
                           _rect.y(), _rect.width(), _rect.height(), 0,
                           scr_info->getDepth(), InputOutput,
                           scr_info->getVisual(), create_mask, &attrib_create);
+  _ignore_config++;
 }
 
 void OtkWidget::setWidth(int w)
@@ -97,6 +117,7 @@ void OtkWidget::move(int x, int y)
 {
   _rect.setPos(x, y);
   XMoveWindow(otk::OBDisplay::display, _window, x, y);
+  _ignore_config++;
 }
 
 void OtkWidget::resize(const Point &to)
@@ -125,9 +146,9 @@ void OtkWidget::setGeometry(int x, int y, int width, int height)
 {
   _rect = Rect(x, y, width, height);
   _dirty = true;
-  _ignore_config++;
 
   XMoveResizeWindow(otk::OBDisplay::display, _window, x, y, width, height);
+  _ignore_config++;
 }
 
 void OtkWidget::show(void)
@@ -245,7 +266,10 @@ void OtkWidget::adjustHorz(void)
 
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
-    if (tmp->isStretchableHorz() && _fixed_width)
+    if (tmp->isStretchableVert())
+      tmp->setHeight(_rect.height() > _bevel_width * 2 ?
+                     _rect.height() - _bevel_width * 2 : _bevel_width);
+    if (tmp->isStretchableHorz())
       stretchable.push_back(tmp);
     else
       width += tmp->_rect.width() + _bevel_width;
@@ -260,10 +284,9 @@ void OtkWidget::adjustHorz(void)
 
     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();
-    }
+    for (; str_it != str_end; ++str_it)
+      (*str_it)->setWidth(str_width > _bevel_width ? str_width - _bevel_width
+                          : _bevel_width);
   }
 
   OtkWidget *prev_widget = 0;
@@ -300,7 +323,10 @@ void OtkWidget::adjustVert(void)
 
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
-    if (tmp->isStretchableVert() && _fixed_height)
+    if (tmp->isStretchableHorz())
+      tmp->setWidth(_rect.width() > _bevel_width * 2 ?
+                    _rect.width() - _bevel_width * 2 : _bevel_width);
+    if (tmp->isStretchableVert())
       stretchable.push_back(tmp);
     else
       height += tmp->_rect.height() + _bevel_width;
@@ -315,10 +341,9 @@ void OtkWidget::adjustVert(void)
 
     int str_height = _rect.height() - height / stretchable.size();
 
-    for (; str_it != str_end; ++str_it) {
-      (*str_it)->setHeight(str_height - _bevel_width);
-      //(*str_it)->update();
-    }
+    for (; str_it != str_end; ++str_it)
+      (*str_it)->setHeight(str_height > _bevel_width ?
+                           str_height - _bevel_width : _bevel_width);
   }
 
   OtkWidget *prev_widget = 0;
@@ -343,16 +368,16 @@ void OtkWidget::adjustVert(void)
 
 void OtkWidget::update(void)
 {
-  OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-  for (; it != end; ++it)
-    (*it)->update();
-
   if (_dirty) {
     adjust();
     render();
     XClearWindow(OBDisplay::display, _window);
   }
 
+  OtkWidgetList::iterator it = _children.begin(), end = _children.end();
+  for (; it != end; ++it)
+    (*it)->update();
+
   _dirty = false;
 }
 
@@ -390,38 +415,41 @@ void OtkWidget::removeChild(OtkWidget *child)
     _children.erase(it);
 }
 
-bool OtkWidget::expose(const XExposeEvent &e)
+void OtkWidget::setEventDispatcher(OtkEventDispatcher *disp)
+{
+  if (_event_dispatcher)
+    _event_dispatcher->clearHandler(_window);
+  _event_dispatcher = disp;
+  _event_dispatcher->registerHandler(_window, this);
+}
+
+int OtkWidget::exposeHandler(const XExposeEvent &e)
 {
+  OtkEventHandler::exposeHandler(e);
   if (e.window == _window) {
     _dirty = true;
     update();
     return true;
-  } else {
-    OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-    for (; it != end; ++it)
-      if ((*it)->expose(e))
-        return true;
   }
   return false;
 }
 
-bool OtkWidget::configure(const XConfigureEvent &e)
+int OtkWidget::configureHandler(const XConfigureEvent &e)
 {
+  OtkEventHandler::configureHandler(e);
   if (e.window == _window) {
     if (_ignore_config) {
       _ignore_config--;
     } else {
-      _dirty = true;
-      _rect.setRect(e.x, e.y, e.width, e.height);
+      if (!(e.width == _rect.width() && e.height == _rect.height())) {
+        _dirty = true;
+        _rect.setSize(e.width, e.height);
+      }
       update();
     }
     return true;
-  } else {
-    OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-    for (; it != end; ++it)
-      if ((*it)->configure(e))
-        return true;
   }
+
   return false;
 }