X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=5dd1bce9976e82a643bace905b438c501e36418d;hb=bd748f74022019c4c9ee3e078afcef14cf47d370;hp=e95848a6577e4e6cb4b9b2771a2851994229f83b;hpb=22bd294c7baed75a24b1df7cc423042c965acbdb;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index e95848a6..5dd1bce9 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -16,38 +16,41 @@ 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()),
+    _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), _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)
+                     Direction direction, Cursor cursor, int bevel_width,
+                     bool override_redirect)
   : OtkEventHandler(),
-    _dirty(false),
+    _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),
+    _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()
@@ -65,10 +68,10 @@ OtkWidget::~OtkWidget()
   XDestroyWindow(otk::OBDisplay::display, _window);
 }
 
-void OtkWidget::create(void)
+void OtkWidget::create(bool override_redirect)
 {
   const ScreenInfo *scr_info = otk::OBDisplay::screenInfo(_screen);
-  Window p_window = _parent ? _parent->getWindow() : scr_info->getRootWindow();
+  Window p_window = _parent ? _parent->window() : scr_info->rootWindow();
 
   _rect.setRect(0, 0, 1, 1); // just some initial values
 
@@ -76,10 +79,15 @@ 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;
@@ -87,8 +95,8 @@ void OtkWidget::create(void)
 
   _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);
+                          scr_info->depth(), InputOutput,
+                          scr_info->visual(), create_mask, &attrib_create);
   _ignore_config++;
 }
 
@@ -185,11 +193,22 @@ void OtkWidget::hide(bool recursive)
 
 void OtkWidget::focus(void)
 {
-  if (! _visible)
-    return;
+  _focused = true;
+  
+  OtkWidget::OtkWidgetList::iterator it = _children.begin(),
+    end = _children.end();
+  for (; it != end; ++it)
+    (*it)->focus();
+}
 
-  XSetInputFocus(otk::OBDisplay::display, _window, RevertToPointerRoot,
-                 CurrentTime);
+void OtkWidget::unfocus(void)
+{
+  _focused = false;
+  
+  OtkWidget::OtkWidgetList::iterator it = _children.begin(),
+    end = _children.end();
+  for (; it != end; ++it)
+    (*it)->unfocus();
 }
 
 bool OtkWidget::grabMouse(void)
@@ -234,12 +253,13 @@ void OtkWidget::ungrabKeyboard(void)
 void OtkWidget::render(void)
 {
   if (!_texture) return;
-  
+
   _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
 
-  if (_bg_pixmap)
+  if (_bg_pixmap) {
     XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap);
-  else {
+    _bg_pixel = None;
+  } else {
     unsigned int pix = _texture->color().pixel();
     if (pix != _bg_pixel) {
       _bg_pixel = pix;
@@ -373,7 +393,6 @@ void OtkWidget::adjustVert(void)
 void OtkWidget::update(void)
 {
   if (_dirty) {
-    if (! _unmanaged)
     adjust();
     render();
     XClearWindow(OBDisplay::display, _window);
@@ -420,6 +439,18 @@ void OtkWidget::removeChild(OtkWidget *child)
     _children.erase(it);
 }
 
+void OtkWidget::setStyle(Style *style)
+{
+  assert(style);
+  _style = style;
+  _dirty = true;
+
+  OtkWidgetList::iterator it, end = _children.end();
+  for (it = _children.begin(); it != end; ++it)
+    (*it)->setStyle(style);
+}
+
+
 void OtkWidget::setEventDispatcher(OtkEventDispatcher *disp)
 {
   if (_event_dispatcher)