X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=67535024721932b2a64a604196a295813c867242;hb=59ef3022a4ce0a23e6d54f7d73a2aa77721e9cc9;hp=154fc92cd6faa698a1fcbde220634873a4981581;hpb=70e2ab8017bc50fc1442f56f2b24ad18f4844686;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index 154fc92c..67535024 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -25,6 +25,8 @@ Widget::Widget(Widget *parent, Direction direction)
     _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),
+    _event_mask(ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
+                ExposureMask | StructureNotifyMask),
     _surface(0),
     _event_dispatcher(parent->eventDispatcher())
 {
@@ -32,7 +34,6 @@ Widget::Widget(Widget *parent, Direction direction)
   parent->addChild(this);
   create();
   _event_dispatcher->registerHandler(_window, this);
-  setStyle(_style); // let the widget initialize stuff
 }
 
 Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
@@ -46,6 +47,8 @@ Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
     _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->screen()), _fixed_width(false), _fixed_height(false),
+    _event_mask(ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
+                ExposureMask | StructureNotifyMask),
     _surface(0),
     _event_dispatcher(event_dispatcher)
 {
@@ -53,7 +56,6 @@ Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
   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());
@@ -83,8 +88,7 @@ void Widget::create(bool override_redirect)
 
   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;
@@ -103,6 +107,12 @@ void Widget::create(bool override_redirect)
   _ignore_config++;
 }
 
+void Widget::setEventMask(long e)
+{
+  XSelectInput(**display, _window, e);
+  _event_mask = e;
+}
+
 void Widget::setWidth(int w)
 {
   assert(w > 0);
@@ -156,6 +166,13 @@ void Widget::setGeometry(int x, int y, int width, int 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);
@@ -258,21 +275,22 @@ void Widget::ungrabKeyboard(void)
 
 void Widget::render(void)
 {
-  if (!_texture) return;
-  printf("RENDER\n");
+  if (!_texture) {
+    XSetWindowBackgroundPixmap(**display, _window, ParentRelative);
+    return;
+  }
 
   Surface *s = _surface; // save the current surface
   
   _surface = new Surface(_screen, _rect.size());
   display->renderControl(_screen)->drawBackground(*_surface, *_texture);
 
-  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
+  if (s)
+    delete s; // delete the old surface *after* its pixmap isn't in use anymore
 }
 
 void Widget::adjust(void)
@@ -329,14 +347,13 @@ void Widget::adjustHorz(void)
     if (prev_widget)
       x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width;
     else
-      x = _rect.x() + _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);
 }
 
@@ -376,6 +393,8 @@ void Widget::adjustVert(void)
       (*str_it)->setHeight(str_height > _bevel_width ?
                            str_height - _bevel_width : _bevel_width);
   }
+  if (stretchable.size() > 0)
+    height = _rect.height();
 
   Widget *prev_widget = 0;
 
@@ -386,7 +405,7 @@ void Widget::adjustVert(void)
     if (prev_widget)
       y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width;
     else
-      y = _rect.y() + _bevel_width;
+      y = _bevel_width;
     x = (widest - tmp->_rect.width()) / 2 + _bevel_width;
 
     tmp->move(x, y);
@@ -397,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;
 }
 
@@ -416,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)
+  else if (! fw)
     resize(w, _rect.height());
-  else if (! _fixed_height)
+  else if (! fh)
     resize(_rect.width(), h);
+
+  _fixed_width = fw;
+  _fixed_height = fh;
 }
 
 void Widget::addChild(Widget *child, bool front)