X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=e53e3585e395b792173362b5c696a31345412a24;hb=f94dc995c60462a2e308c61123ede83cc8680736;hp=3ff484bca546dd0b36a6b72792530cafb77fd3fc;hpb=6d68ac2256dc212dc0f2dd8a15d013d6ce3fc4b8;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index 3ff484bc..e53e3585 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef    HAVE_CONFIG_H
+#  include "../config.h"
+#endif // HAVE_CONFIG_H
+
 #include "widget.hh"
 #include "display.hh"
 #include "assassin.hh"
@@ -8,49 +14,64 @@
 
 namespace otk {
 
-OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
-  : _parent(parent), _style(parent->getStyle()), _direction(direction),
-    _cursor(parent->getCursor()), _bevel_width(parent->getBevelWidth()),
-    _visible(false), _focused(false), _grabbed_mouse(false),
+Widget::Widget(Widget *parent, Direction direction)
+  : EventHandler(),
+    _dirty(false), _focused(false),
+    _parent(parent), _style(parent->style()), _direction(direction),
+    _cursor(parent->cursor()), _bevel_width(parent->bevelWidth()),
+    _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),
-    _screen(parent->getScreen()), _fixed_width(false), _fixed_height(false),
-    _dirty(false)
+    _bcolor(0), _bwidth(0), _screen(parent->screen()), _fixed_width(false),
+    _fixed_height(false), _event_dispatcher(parent->eventDispatcher())
 {
+  assert(parent);
   parent->addChild(this);
   create();
+  _event_dispatcher->registerHandler(_window, this);
+  setStyle(_style); // let the widget initialize stuff
 }
 
-OtkWidget::OtkWidget(Style *style, Direction direction,
-                     Cursor cursor, int bevel_width)
-  : _parent(0), _style(style), _direction(direction), _cursor(cursor),
-    _bevel_width(bevel_width), _visible(false),
-    _focused(false), _grabbed_mouse(false), _grabbed_keyboard(false),
+Widget::Widget(EventDispatcher *event_dispatcher, Style *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), _screen(style->getScreen()),
-    _fixed_width(false), _fixed_height(false), _dirty(false)
+    _bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0),
+    _screen(style->getScreen()), _fixed_width(false), _fixed_height(false),
+    _event_dispatcher(event_dispatcher)
 {
+  assert(event_dispatcher);
   assert(style);
-  create();
+  create(override_redirect);
+  _event_dispatcher->registerHandler(_window, this);
+  setStyle(_style); // let the widget initialize stuff
 }
 
-OtkWidget::~OtkWidget()
+Widget::~Widget()
 {
   if (_visible)
     hide();
 
+  _event_dispatcher->clearHandler(_window);
+
   std::for_each(_children.begin(), _children.end(), PointerAssassin());
 
   if (_parent)
     _parent->removeChild(this);
 
-  XDestroyWindow(otk::OBDisplay::display, _window);
+  XDestroyWindow(**display, _window);
 }
 
-void OtkWidget::create(void)
+void Widget::create(bool override_redirect)
 {
-  const ScreenInfo *scr_info = otk::OBDisplay::screenInfo(_screen);
-  Window p_window = _parent ? _parent->getWindow() : scr_info->getRootWindow();
+  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
 
@@ -58,77 +79,88 @@ void OtkWidget::create(void)
   unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
 
   attrib_create.background_pixmap = None;
-  attrib_create.colormap = scr_info->getColormap();
+  attrib_create.colormap = scr_info->colormap();
   attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
     ButtonMotionMask | ExposureMask | StructureNotifyMask;
 
+  if (override_redirect) {
+    create_mask |= CWOverrideRedirect;
+    attrib_create.override_redirect = true;
+  }
+
   if (_cursor) {
     create_mask |= CWCursor;
     attrib_create.cursor = _cursor;
   }
 
-  _window = XCreateWindow(otk::OBDisplay::display, p_window, _rect.x(),
+  _window = XCreateWindow(**display, p_window, _rect.x(),
                           _rect.y(), _rect.width(), _rect.height(), 0,
-                          scr_info->getDepth(), InputOutput,
-                          scr_info->getVisual(), create_mask, &attrib_create);
+                          scr_info->depth(), InputOutput,
+                          scr_info->visual(), create_mask, &attrib_create);
+  _ignore_config++;
 }
 
-void OtkWidget::setWidth(int w)
+void Widget::setWidth(int w)
 {
   assert(w > 0);
   _fixed_width = true;  
   setGeometry(_rect.x(), _rect.y(), w, _rect.height());
 }
 
-void OtkWidget::setHeight(int h)
+void Widget::setHeight(int h)
 {
   assert(h > 0);
   _fixed_height = true;
   setGeometry(_rect.x(), _rect.y(), _rect.width(), h);
 }
 
-void OtkWidget::move(const Point &to)
+void Widget::move(const Point &to)
 {
   move(to.x(), to.y());
 }
 
-void OtkWidget::move(int x, int y)
+void Widget::move(int x, int y)
 {
   _rect.setPos(x, y);
-  XMoveWindow(otk::OBDisplay::display, _window, x, y);
+  XMoveWindow(**display, _window, x, y);
+  _ignore_config++;
 }
 
-void OtkWidget::resize(const Point &to)
+void Widget::resize(const Point &to)
 {
   resize(to.x(), to.y());
 }
 
-void OtkWidget::resize(int w, int h)
+void Widget::resize(int w, int h)
 {
   assert(w > 0 && h > 0);
   _fixed_width = _fixed_height = true;
   setGeometry(_rect.x(), _rect.y(), w, h);
 }
 
-void OtkWidget::setGeometry(const Rect &new_geom)
+void Widget::setGeometry(const Rect &new_geom)
 {
   setGeometry(new_geom.x(), new_geom.y(), new_geom.width(), new_geom.height());
 }
  
-void OtkWidget::setGeometry(const Point &topleft, int width, int height)
+void Widget::setGeometry(const Point &topleft, int width, int height)
 {
   setGeometry(topleft.x(), topleft.y(), width, height);
 }
 
-void OtkWidget::setGeometry(int x, int y, int width, int height)
+void Widget::setGeometry(int x, int y, int width, int height)
 {
   _rect = Rect(x, y, width, height);
   _dirty = true;
 
-  XMoveResizeWindow(otk::OBDisplay::display, _window, x, y, width, height);
+  // 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);
+  XMoveWindow(**display, _window, x, y);
+  _ignore_config+=2;
 }
 
-void OtkWidget::show(void)
+void Widget::show(bool recursive)
 {
   if (_visible)
     return;
@@ -137,39 +169,54 @@ void OtkWidget::show(void)
   if (_dirty)
     update();
 
-  OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-  for (; it != end; ++it)
-    (*it)->show();
+  if (recursive) {
+    WidgetList::iterator it = _children.begin(), end = _children.end();
+    for (; it != end; ++it)
+      (*it)->show();
+  }
 
-  XMapWindow(otk::OBDisplay::display, _window);
+  XMapWindow(**display, _window);
   _visible = true;
 }
 
-void OtkWidget::hide(void)
+void Widget::hide(bool recursive)
 {
   if (! _visible)
     return;
 
-  OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-  for (; it != end; ++it)
-    (*it)->hide();
-
-  XUnmapWindow(otk::OBDisplay::display, _window);
+  if (recursive) {
+    WidgetList::iterator it = _children.begin(), end = _children.end();
+    for (; it != end; ++it)
+      (*it)->hide();
+  }
+  
+  XUnmapWindow(**display, _window);
   _visible = false;
 }
 
-void OtkWidget::focus(void)
+void Widget::focus(void)
 {
-  if (! _visible)
-    return;
+  _focused = true;
+  
+  Widget::WidgetList::iterator it = _children.begin(),
+    end = _children.end();
+  for (; it != end; ++it)
+    (*it)->focus();
+}
 
-  XSetInputFocus(otk::OBDisplay::display, _window, RevertToPointerRoot,
-                 CurrentTime);
+void Widget::unfocus(void)
+{
+  _focused = false;
+  
+  Widget::WidgetList::iterator it = _children.begin(),
+    end = _children.end();
+  for (; it != end; ++it)
+    (*it)->unfocus();
 }
 
-bool OtkWidget::grabMouse(void)
+bool Widget::grabMouse(void)
 {
-  Status ret = XGrabPointer(otk::OBDisplay::display, _window, True,
+  Status ret = XGrabPointer(**display, _window, True,
                             (ButtonPressMask | ButtonReleaseMask |
                              ButtonMotionMask | EnterWindowMask |
                              LeaveWindowMask | PointerMotionMask),
@@ -179,51 +226,52 @@ bool OtkWidget::grabMouse(void)
   return _grabbed_mouse;
 }
 
-void OtkWidget::ungrabMouse(void)
+void Widget::ungrabMouse(void)
 {
   if (! _grabbed_mouse)
     return;
 
-  XUngrabPointer(otk::OBDisplay::display, CurrentTime);
+  XUngrabPointer(**display, CurrentTime);
   _grabbed_mouse = false;
 }
 
-bool OtkWidget::grabKeyboard(void)
+bool Widget::grabKeyboard(void)
 {
-  Status ret = XGrabKeyboard(otk::OBDisplay::display, _window, True,
+  Status ret = XGrabKeyboard(**display, _window, True,
                              GrabModeSync, GrabModeAsync, CurrentTime);
   _grabbed_keyboard = (ret == GrabSuccess);
   return _grabbed_keyboard;
 
 }
 
-void OtkWidget::ungrabKeyboard(void)
+void Widget::ungrabKeyboard(void)
 {
   if (! _grabbed_keyboard)
     return;
 
-  XUngrabKeyboard(otk::OBDisplay::display, CurrentTime);
+  XUngrabKeyboard(**display, CurrentTime);
   _grabbed_keyboard = false;
 }
 
-void OtkWidget::render(void)
+void Widget::render(void)
 {
-  Pixmap old = _bg_pixmap;
+  if (!_texture) return;
 
   _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
 
-  if (_bg_pixmap && _bg_pixmap != old)
-    XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap);
-  else {
+  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(otk::OBDisplay::display, _window, pix);
+      XSetWindowBackground(**display, _window, pix);
     }
   }
 }
 
-void OtkWidget::adjust(void)
+void Widget::adjust(void)
 {
   if (_direction == Horizontal)
     adjustHorz();
@@ -231,21 +279,24 @@ void OtkWidget::adjust(void)
     adjustVert();
 }
 
-void OtkWidget::adjustHorz(void)
+void Widget::adjustHorz(void)
 {
   if (_children.size() == 0)
     return;
 
-  OtkWidget *tmp;
-  OtkWidgetList::iterator it, end = _children.end();
+  Widget *tmp;
+  WidgetList::iterator it, end = _children.end();
 
   int tallest = 0;
   int width = _bevel_width;
-  OtkWidgetList stretchable;
+  WidgetList stretchable;
 
   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;
@@ -255,18 +306,17 @@ void OtkWidget::adjustHorz(void)
   }
 
   if (stretchable.size() > 0) {
-    OtkWidgetList::iterator str_it = stretchable.begin(),
+    WidgetList::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();
-    }
+    for (; str_it != str_end; ++str_it)
+      (*str_it)->setWidth(str_width > _bevel_width ? str_width - _bevel_width
+                          : _bevel_width);
   }
 
-  OtkWidget *prev_widget = 0;
+  Widget *prev_widget = 0;
 
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
@@ -286,21 +336,24 @@ void OtkWidget::adjustHorz(void)
   internalResize(width, tallest + _bevel_width * 2);
 }
 
-void OtkWidget::adjustVert(void)
+void Widget::adjustVert(void)
 {
   if (_children.size() == 0)
     return;
 
-  OtkWidget *tmp;
-  OtkWidgetList::iterator it, end = _children.end();
+  Widget *tmp;
+  WidgetList::iterator it, end = _children.end();
 
   int widest = 0;
   int height = _bevel_width;
-  OtkWidgetList stretchable;
+  WidgetList stretchable;
 
   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;
@@ -310,18 +363,17 @@ void OtkWidget::adjustVert(void)
   }
 
   if (stretchable.size() > 0) {
-    OtkWidgetList::iterator str_it = stretchable.begin(),
+    WidgetList::iterator str_it = stretchable.begin(),
       str_end = stretchable.end();
 
     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;
+  Widget *prev_widget = 0;
 
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
@@ -341,22 +393,22 @@ void OtkWidget::adjustVert(void)
   internalResize(widest + _bevel_width * 2, height);
 }
 
-void OtkWidget::update(void)
+void Widget::update(void)
 {
-  OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-  for (; it != end; ++it)
-    (*it)->update();
-
   if (_dirty) {
     adjust();
     render();
-    XClearWindow(OBDisplay::display, _window);
+    XClearWindow(**display, _window);
   }
 
+  WidgetList::iterator it = _children.begin(), end = _children.end();
+  for (; it != end; ++it)
+    (*it)->update();
+
   _dirty = false;
 }
 
-void OtkWidget::internalResize(int w, int h)
+void Widget::internalResize(int w, int h)
 {
   assert(w > 0 && h > 0);
 
@@ -368,7 +420,7 @@ void OtkWidget::internalResize(int w, int h)
     resize(_rect.width(), h);
 }
 
-void OtkWidget::addChild(OtkWidget *child, bool front)
+void Widget::addChild(Widget *child, bool front)
 {
   assert(child);
   if (front)
@@ -377,10 +429,10 @@ void OtkWidget::addChild(OtkWidget *child, bool front)
     _children.push_back(child);
 }
 
-void OtkWidget::removeChild(OtkWidget *child)
+void Widget::removeChild(Widget *child)
 {
   assert(child);
-  OtkWidgetList::iterator it, end = _children.end();
+  WidgetList::iterator it, end = _children.end();
   for (it = _children.begin(); it != end; ++it) {
     if ((*it) == child)
       break;
@@ -390,19 +442,45 @@ void OtkWidget::removeChild(OtkWidget *child)
     _children.erase(it);
 }
 
-bool OtkWidget::expose(const XExposeEvent &e)
+void Widget::setStyle(Style *style)
 {
-  if (e.window == _window) {
-    _dirty = true;
-    update();
-    return true;
+  assert(style);
+  _style = style;
+  _dirty = true;
+
+  WidgetList::iterator it, end = _children.end();
+  for (it = _children.begin(); it != end; ++it)
+    (*it)->setStyle(style);
+}
+
+
+void Widget::setEventDispatcher(EventDispatcher *disp)
+{
+  if (_event_dispatcher)
+    _event_dispatcher->clearHandler(_window);
+  _event_dispatcher = disp;
+  _event_dispatcher->registerHandler(_window, this);
+}
+
+void Widget::exposeHandler(const XExposeEvent &e)
+{
+  EventHandler::exposeHandler(e);
+  _dirty = true;
+  update();
+}
+
+void Widget::configureHandler(const XConfigureEvent &e)
+{
+  EventHandler::configureHandler(e);
+  if (_ignore_config) {
+    _ignore_config--;
   } else {
-    OtkWidgetList::iterator it = _children.begin(), end = _children.end();
-    for (; it != end; ++it)
-      if ((*it)->expose(e))
-        return true;
+    if (!(e.width == _rect.width() && e.height == _rect.height())) {
+      _dirty = true;
+      _rect.setSize(e.width, e.height);
+    }
+    update();
   }
-  return false;
 }
 
 }