X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=551a7900b181b22a825d08dcbb8f63c0e73a22d9;hb=23940f9e034af023af610c56e915a6044ea436ec;hp=e95848a6577e4e6cb4b9b2771a2851994229f83b;hpb=22bd294c7baed75a24b1df7cc423042c965acbdb;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index e95848a6..551a7900 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -14,43 +14,47 @@
 
 namespace otk {
 
-OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
-  : OtkEventHandler(),
-    _dirty(false),
-    _parent(parent), _style(parent->getStyle()), _direction(direction),
-    _cursor(parent->getCursor()), _bevel_width(parent->getBevelWidth()),
+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), _focused(false), _grabbed_mouse(false),
+    _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),
-    _event_dispatcher(parent->getEventDispatcher()), _application(0)
+    _bcolor(0), _bwidth(0), _pos(0,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(OtkEventDispatcher *event_dispatcher, Style *style,
-                     Direction direction, Cursor cursor, int bevel_width)
-  : OtkEventHandler(),
-    _dirty(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),
-    _focused(false), _grabbed_mouse(false), _grabbed_keyboard(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),
-    _event_dispatcher(event_dispatcher), _application(0)
+    _bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0), _pos(0,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();
@@ -62,94 +66,101 @@ OtkWidget::~OtkWidget()
   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();
-
-  _rect.setRect(0, 0, 1, 1); // just some initial values
+  const ScreenInfo *scr_info = display->screenInfo(_screen);
+  Window p_window = _parent ? _parent->window() : scr_info->rootWindow();
 
   XSetWindowAttributes attrib_create;
   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(),
-                          _rect.y(), _rect.width(), _rect.height(), 0,
-                          scr_info->getDepth(), InputOutput,
-                          scr_info->getVisual(), create_mask, &attrib_create);
+  _window = XCreateWindow(**display, p_window, _pos.x(),
+                          _pos.y(), width(), height(), 0,
+                          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());
+  setGeometry(_pos.x(), _pos.y(), w, 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);
+  setGeometry(_pos.x(), _pos.y(), _pos.x(), 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);
+  _pos.setPoint(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);
+  setGeometry(_pos.x(), _pos.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);
+  _pos.setPoint(x, y);
+  setSize(width, height);
   _dirty = true;
 
-  XMoveResizeWindow(otk::OBDisplay::display, _window, x, y, width, height);
-  _ignore_config++;
+  // 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(bool recursive)
+void Widget::show(bool recursive)
 {
   if (_visible)
     return;
@@ -159,42 +170,53 @@ void OtkWidget::show(bool recursive)
     update();
 
   if (recursive) {
-    OtkWidgetList::iterator it = _children.begin(), end = _children.end();
+    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(bool recursive)
+void Widget::hide(bool recursive)
 {
   if (! _visible)
     return;
 
   if (recursive) {
-    OtkWidgetList::iterator it = _children.begin(), end = _children.end();
+    WidgetList::iterator it = _children.begin(), end = _children.end();
     for (; it != end; ++it)
       (*it)->hide();
   }
   
-  XUnmapWindow(otk::OBDisplay::display, _window);
+  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),
@@ -204,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)
 {
   if (!_texture) return;
-  
-  _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
 
-  if (_bg_pixmap)
-    XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap);
-  else {
+  _bg_pixmap = _texture->render(width(), height(), _bg_pixmap);
+
+  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();
@@ -256,54 +279,54 @@ 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->isStretchableVert())
-      tmp->setHeight(_rect.height() > _bevel_width * 2 ?
-                     _rect.height() - _bevel_width * 2 : _bevel_width);
+      tmp->setHeight(height() > _bevel_width * 2 ?
+                     height() - _bevel_width * 2 : _bevel_width);
     if (tmp->isStretchableHorz())
       stretchable.push_back(tmp);
     else
-      width += tmp->_rect.width() + _bevel_width;
+      width += tmp->width() + _bevel_width;
 
-    if (tmp->_rect.height() > tallest)
-      tallest = tmp->_rect.height();
+    if (tmp->height() > tallest)
+      tallest = tmp->height();
   }
 
   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();
+    int str_width = Surface::width() - width / stretchable.size();
 
     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;
     int x, y;
 
     if (prev_widget)
-      x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width;
+      x = prev_widget->_pos.x() + prev_widget->width() + _bevel_width;
     else
-      x = _rect.x() + _bevel_width;
-    y = (tallest - tmp->_rect.height()) / 2 + _bevel_width;
+      x = _pos.x() + _bevel_width;
+    y = (tallest - tmp->height()) / 2 + _bevel_width;
 
     tmp->move(x, y);
 
@@ -313,54 +336,54 @@ 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->isStretchableHorz())
-      tmp->setWidth(_rect.width() > _bevel_width * 2 ?
-                    _rect.width() - _bevel_width * 2 : _bevel_width);
+      tmp->setWidth(width() > _bevel_width * 2 ?
+                    width() - _bevel_width * 2 : _bevel_width);
     if (tmp->isStretchableVert())
       stretchable.push_back(tmp);
     else
-      height += tmp->_rect.height() + _bevel_width;
+      height += tmp->height() + _bevel_width;
 
-    if (tmp->_rect.width() > widest)
-      widest = tmp->_rect.width();
+    if (tmp->width() > widest)
+      widest = tmp->width();
   }
 
   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();
+    int str_height = Surface::height() - height / stretchable.size();
 
     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;
     int x, y;
 
     if (prev_widget)
-      y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width;
+      y = prev_widget->_pos.y() + prev_widget->height() + _bevel_width;
     else
-      y = _rect.y() + _bevel_width;
-    x = (widest - tmp->_rect.width()) / 2 + _bevel_width;
+      y = _pos.y() + _bevel_width;
+    x = (widest - tmp->width()) / 2 + _bevel_width;
 
     tmp->move(x, y);
 
@@ -370,35 +393,34 @@ void OtkWidget::adjustVert(void)
   internalResize(widest + _bevel_width * 2, height);
 }
 
-void OtkWidget::update(void)
+void Widget::update(void)
 {
   if (_dirty) {
-    if (! _unmanaged)
     adjust();
     render();
-    XClearWindow(OBDisplay::display, _window);
+    XClearWindow(**display, _window);
   }
 
-  OtkWidgetList::iterator it = _children.begin(), end = _children.end();
+  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);
 
   if (! _fixed_width && ! _fixed_height)
     resize(w, h);
   else if (! _fixed_width)
-    resize(w, _rect.height());
+    resize(w, height());
   else if (! _fixed_height)
-    resize(_rect.width(), h);
+    resize(width(), h);
 }
 
-void OtkWidget::addChild(OtkWidget *child, bool front)
+void Widget::addChild(Widget *child, bool front)
 {
   assert(child);
   if (front)
@@ -407,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;
@@ -420,7 +442,19 @@ void OtkWidget::removeChild(OtkWidget *child)
     _children.erase(it);
 }
 
-void OtkWidget::setEventDispatcher(OtkEventDispatcher *disp)
+void Widget::setStyle(Style *style)
+{
+  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);
@@ -428,22 +462,23 @@ void OtkWidget::setEventDispatcher(OtkEventDispatcher *disp)
   _event_dispatcher->registerHandler(_window, this);
 }
 
-void OtkWidget::exposeHandler(const XExposeEvent &e)
+void Widget::exposeHandler(const XExposeEvent &e)
 {
-  OtkEventHandler::exposeHandler(e);
+  EventHandler::exposeHandler(e);
   _dirty = true;
   update();
 }
 
-void OtkWidget::configureHandler(const XConfigureEvent &e)
+void Widget::configureHandler(const XConfigureEvent &e)
 {
-  OtkEventHandler::configureHandler(e);
+  EventHandler::configureHandler(e);
   if (_ignore_config) {
     _ignore_config--;
   } else {
-    if (!(e.width == _rect.width() && e.height == _rect.height())) {
+    if (!(e.width == width() && e.height == height())) {
       _dirty = true;
-      _rect.setSize(e.width, e.height);
+      _pos.setPoint(e.x, e.y);
+      setSize(e.width, e.height);
     }
     update();
   }