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

diff --git a/otk/widget.cc b/otk/widget.cc
index 6423a7af..67535024 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -8,23 +8,27 @@
 #include "display.hh"
 #include "assassin.hh"
 #include "screeninfo.hh"
-
+#include "focuslabel.hh"
 #include <algorithm>
 #include <iostream>
 
 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), _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);
@@ -32,29 +36,36 @@ OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
   _event_dispatcher->registerHandler(_window, this);
 }
 
-OtkWidget::OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
-                     Direction direction, Cursor cursor, int bevel_width)
-  : OtkEventHandler(),
-    _dirty(false),
+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),
-    _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), _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();
+  create(override_redirect);
   _event_dispatcher->registerHandler(_window, this);
 }
 
-OtkWidget::~OtkWidget()
+Widget::~Widget()
 {
   if (_visible)
     hide();
 
+  if (_surface)
+    delete _surface;
+  
   _event_dispatcher->clearHandler(_window);
 
   std::for_each(_children.begin(), _children.end(), PointerAssassin());
@@ -62,13 +73,13 @@ 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();
+  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
 
@@ -76,80 +87,100 @@ void OtkWidget::create(void)
   unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
 
   attrib_create.background_pixmap = None;
-  attrib_create.colormap = scr_info->getColormap();
-  attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
-    ButtonMotionMask | ExposureMask | StructureNotifyMask;
+  attrib_create.colormap = scr_info->colormap();
+  attrib_create.event_mask = _event_mask;
+
+  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::setEventMask(long e)
+{
+  XSelectInput(**display, _window, e);
+  _event_mask = e;
+}
+
+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);
-  _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 OtkWidget::show(bool recursive)
+void Widget::show(bool recursive)
 {
   if (_visible)
     return;
@@ -159,42 +190,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();
+      (*it)->show(recursive);
   }
 
-  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 +246,54 @@ 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 {
-    unsigned int pix = _texture->color().pixel();
-    if (pix != _bg_pixel) {
-      _bg_pixel = pix;
-      XSetWindowBackground(otk::OBDisplay::display, _window, pix);
-    }
+  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);
+
+  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 OtkWidget::adjust(void)
+void Widget::adjust(void)
 {
   if (_direction == Horizontal)
     adjustHorz();
@@ -256,17 +301,17 @@ 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;
@@ -283,7 +328,7 @@ 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();
@@ -293,7 +338,7 @@ void OtkWidget::adjustHorz(void)
                           : _bevel_width);
   }
 
-  OtkWidget *prev_widget = 0;
+  Widget *prev_widget = 0;
 
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
@@ -302,28 +347,27 @@ void OtkWidget::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);
 }
 
-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;
@@ -340,7 +384,7 @@ 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();
@@ -349,8 +393,10 @@ void OtkWidget::adjustVert(void)
       (*str_it)->setHeight(str_height > _bevel_width ?
                            str_height - _bevel_width : _bevel_width);
   }
+  if (stretchable.size() > 0)
+    height = _rect.height();
 
-  OtkWidget *prev_widget = 0;
+  Widget *prev_widget = 0;
 
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
@@ -359,7 +405,7 @@ void OtkWidget::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);
@@ -370,35 +416,39 @@ void OtkWidget::adjustVert(void)
   internalResize(widest + _bevel_width * 2, height);
 }
 
-void OtkWidget::update(void)
+void Widget::update()
 {
+  WidgetList::iterator it = _children.begin(), end = _children.end();
+  for (; it != end; ++it)
+    (*it)->update();
+
   if (_dirty) {
-    if (! _unmanaged)
     adjust();
     render();
-    XClearWindow(OBDisplay::display, _window);
+    XClearWindow(**display, _window);
   }
 
-  OtkWidgetList::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)
+  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 OtkWidget::addChild(OtkWidget *child, bool front)
+void Widget::addChild(Widget *child, bool front)
 {
   assert(child);
   if (front)
@@ -407,10 +457,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,18 +470,19 @@ void OtkWidget::removeChild(OtkWidget *child)
     _children.erase(it);
 }
 
-void OtkWidget::setStyle(Style *style)
+void Widget::setStyle(RenderStyle *style)
 {
   assert(style);
   _style = style;
   _dirty = true;
-  OtkWidgetList::iterator it, end = _children.end();
+
+  WidgetList::iterator it, end = _children.end();
   for (it = _children.begin(); it != end; ++it)
     (*it)->setStyle(style);
 }
 
 
-void OtkWidget::setEventDispatcher(OtkEventDispatcher *disp)
+void Widget::setEventDispatcher(EventDispatcher *disp)
 {
   if (_event_dispatcher)
     _event_dispatcher->clearHandler(_window);
@@ -439,22 +490,31 @@ 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);
-  _dirty = true;
-  update();
+  EventHandler::exposeHandler(e);
+//  XClearArea(**display, _window, e.x, e.y, e.width, e.height, false);
 }
 
-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())) {
+    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();
   }