support the button pressed resources better

[chaz/openbox] / otk / widget.cc

diff --git a/otk/widget.cc b/otk/widget.cc
index 07122bc645a2b9237dbd0f0b9d8d8e5dd06ccbcd..9cc822aea8683ff98b41fdd606d8eca6d194ccbf 100644 (file)
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -187,12 +187,6 @@ void OtkWidget::hide(bool recursive)
 
 void OtkWidget::focus(void)
 {
-/*  if (! _visible)
-    return;
-
-  XSetInputFocus(otk::OBDisplay::display, _window, RevertToPointerRoot,
-  CurrentTime);*/
-
   _focused = true;
   
   OtkWidget::OtkWidgetList::iterator it = _children.begin(),
@@ -253,7 +247,9 @@ void OtkWidget::ungrabKeyboard(void)
 void OtkWidget::render(void)
 {
   if (!_texture) return;
-  
+
+  printf("rendering %lx\n", _texture);
+
   _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
 
   if (_bg_pixmap)
@@ -392,7 +388,7 @@ void OtkWidget::adjustVert(void)
 void OtkWidget::update(void)
 {
   if (_dirty) {
-    if (! _unmanaged)
+    printf("widget dirty, redrawing\n");
     adjust();
     render();
     XClearWindow(OBDisplay::display, _window);
@@ -445,15 +441,6 @@ void OtkWidget::setStyle(Style *style)
   _style = style;
   _dirty = true;
 
-  // reset textures/colors
-  if (_focused) {
-    unfocus();
-    focus();
-  } else {
-    focus();
-    unfocus();
-  }
-
   OtkWidgetList::iterator it, end = _children.end();
   for (it = _children.begin(); it != end; ++it)
     (*it)->setStyle(style);