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

diff --git a/otk/widget.cc b/otk/widget.cc
index 604992fd..67535024 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -8,7 +8,7 @@
 #include "display.hh"
 #include "assassin.hh"
 #include "screeninfo.hh"
-
+#include "focuslabel.hh"
 #include <algorithm>
 #include <iostream>
 
@@ -23,34 +23,39 @@ Widget::Widget(Widget *parent, Direction direction)
     _visible(false), _grabbed_mouse(false),
     _grabbed_keyboard(false), _stretchable_vert(false),
     _stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
-    _bcolor(0), _bwidth(0), _screen(parent->screen()), _fixed_width(false),
-    _fixed_height(false), _event_dispatcher(parent->eventDispatcher())
+    _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())
 {
   assert(parent);
   parent->addChild(this);
   create();
   _event_dispatcher->registerHandler(_window, this);
-  setStyle(_style); // let the widget initialize stuff
 }
 
-Widget::Widget(EventDispatcher *event_dispatcher, Style *style,
-                     Direction direction, Cursor cursor, int bevel_width,
-                     bool override_redirect)
+Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *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), _bcolor(0), _bwidth(0),
-    _screen(style->getScreen()), _fixed_width(false), _fixed_height(false),
+    _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)
 {
   assert(event_dispatcher);
   assert(style);
   create(override_redirect);
   _event_dispatcher->registerHandler(_window, this);
-  setStyle(_style); // let the widget initialize stuff
 }
 
 Widget::~Widget()
@@ -58,6 +63,9 @@ Widget::~Widget()
   if (_visible)
     hide();
 
+  if (_surface)
+    delete _surface;
+  
   _event_dispatcher->clearHandler(_window);
 
   std::for_each(_children.begin(), _children.end(), PointerAssassin());
@@ -65,12 +73,12 @@ Widget::~Widget()
   if (_parent)
     _parent->removeChild(this);
 
-  XDestroyWindow(Display::display, _window);
+  XDestroyWindow(**display, _window);
 }
 
 void Widget::create(bool override_redirect)
 {
-  const ScreenInfo *scr_info = Display::screenInfo(_screen);
+  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
@@ -80,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;
@@ -93,13 +100,19 @@ void Widget::create(bool override_redirect)
     attrib_create.cursor = _cursor;
   }
 
-  _window = XCreateWindow(Display::display, p_window, _rect.x(),
+  _window = XCreateWindow(**display, p_window, _rect.x(),
                           _rect.y(), _rect.width(), _rect.height(), 0,
                           scr_info->depth(), InputOutput,
                           scr_info->visual(), create_mask, &attrib_create);
   _ignore_config++;
 }
 
+void Widget::setEventMask(long e)
+{
+  XSelectInput(**display, _window, e);
+  _event_mask = e;
+}
+
 void Widget::setWidth(int w)
 {
   assert(w > 0);
@@ -122,7 +135,7 @@ void Widget::move(const Point &to)
 void Widget::move(int x, int y)
 {
   _rect.setPos(x, y);
-  XMoveWindow(Display::display, _window, x, y);
+  XMoveWindow(**display, _window, x, y);
   _ignore_config++;
 }
 
@@ -153,8 +166,18 @@ void Widget::setGeometry(int x, int y, int width, int height)
   _rect = Rect(x, y, width, height);
   _dirty = true;
 
-  XMoveResizeWindow(Display::display, _window, x, y, width, height);
-  _ignore_config++;
+  // 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);
+  XMoveWindow(**display, _window, x, y);
+  _ignore_config+=2;
 }
 
 void Widget::show(bool recursive)
@@ -169,10 +192,10 @@ void Widget::show(bool recursive)
   if (recursive) {
     WidgetList::iterator it = _children.begin(), end = _children.end();
     for (; it != end; ++it)
-      (*it)->show();
+      (*it)->show(recursive);
   }
 
-  XMapWindow(Display::display, _window);
+  XMapWindow(**display, _window);
   _visible = true;
 }
 
@@ -187,7 +210,7 @@ void Widget::hide(bool recursive)
       (*it)->hide();
   }
   
-  XUnmapWindow(Display::display, _window);
+  XUnmapWindow(**display, _window);
   _visible = false;
 }
 
@@ -213,7 +236,7 @@ void Widget::unfocus(void)
 
 bool Widget::grabMouse(void)
 {
-  Status ret = XGrabPointer(Display::display, _window, True,
+  Status ret = XGrabPointer(**display, _window, True,
                             (ButtonPressMask | ButtonReleaseMask |
                              ButtonMotionMask | EnterWindowMask |
                              LeaveWindowMask | PointerMotionMask),
@@ -228,13 +251,13 @@ void Widget::ungrabMouse(void)
   if (! _grabbed_mouse)
     return;
 
-  XUngrabPointer(Display::display, CurrentTime);
+  XUngrabPointer(**display, CurrentTime);
   _grabbed_mouse = false;
 }
 
 bool Widget::grabKeyboard(void)
 {
-  Status ret = XGrabKeyboard(Display::display, _window, True,
+  Status ret = XGrabKeyboard(**display, _window, True,
                              GrabModeSync, GrabModeAsync, CurrentTime);
   _grabbed_keyboard = (ret == GrabSuccess);
   return _grabbed_keyboard;
@@ -246,26 +269,28 @@ void Widget::ungrabKeyboard(void)
   if (! _grabbed_keyboard)
     return;
 
-  XUngrabKeyboard(Display::display, CurrentTime);
+  XUngrabKeyboard(**display, CurrentTime);
   _grabbed_keyboard = false;
 }
 
 void Widget::render(void)
 {
-  if (!_texture) return;
+  if (!_texture) {
+    XSetWindowBackgroundPixmap(**display, _window, ParentRelative);
+    return;
+  }
 
-  _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
+  Surface *s = _surface; // save the current surface
+  
+  _surface = new Surface(_screen, _rect.size());
+  display->renderControl(_screen)->drawBackground(*_surface, *_texture);
 
-  if (_bg_pixmap) {
-    XSetWindowBackgroundPixmap(Display::display, _window, _bg_pixmap);
-    _bg_pixel = None;
-  } else {
-    unsigned int pix = _texture->color().pixel();
-    if (pix != _bg_pixel) {
-      _bg_pixel = pix;
-      XSetWindowBackground(Display::display, _window, pix);
-    }
-  }
+  renderForeground(); // for inherited types to render onto the _surface
+
+  XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap());
+
+  if (s)
+    delete s; // delete the old surface *after* its pixmap isn't in use anymore
 }
 
 void Widget::adjust(void)
@@ -322,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);
 }
 
@@ -369,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;
 
@@ -379,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);
@@ -390,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::display, _window);
+    XClearWindow(**display, _window);
   }
 
-  WidgetList::iterator it = _children.begin(), end = _children.end();
-  for (; it != end; ++it)
-    (*it)->update();
-
   _dirty = false;
 }
 
@@ -409,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)
@@ -439,7 +470,7 @@ void Widget::removeChild(Widget *child)
     _children.erase(it);
 }
 
-void Widget::setStyle(Style *style)
+void Widget::setStyle(RenderStyle *style)
 {
   assert(style);
   _style = style;
@@ -462,19 +493,28 @@ void Widget::setEventDispatcher(EventDispatcher *disp)
 void Widget::exposeHandler(const XExposeEvent &e)
 {
   EventHandler::exposeHandler(e);
-  _dirty = true;
-  update();
+//  XClearArea(**display, _window, e.x, e.y, e.width, e.height, false);
 }
 
 void Widget::configureHandler(const XConfigureEvent &e)
 {
   EventHandler::configureHandler(e);
+
   if (_ignore_config) {
     _ignore_config--;
   } else {
-    if (!(e.width == _rect.width() && e.height == _rect.height())) {
+    int width = e.width;
+    int height = e.height;
+
+    XEvent ev;
+    while (XCheckTypedWindowEvent(**display, _window, ConfigureNotify, &ev)) {
+      width = ev.xconfigure.width;
+      height = ev.xconfigure.height;
+    }
+
+    if (!(width == _rect.width() && height == _rect.height())) {
       _dirty = true;
-      _rect.setSize(e.width, e.height);
+      _rect.setSize(width, height);
     }
     update();
   }