handle config req's in dispatcher properly.

no more basewidget again.

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index a34dd9b4dd4575eed3574e4db06837e2f8539037..a6d25624612a3d7abd6eb7713b431c57e734f9fa 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -35,6 +35,7 @@ void OtkEventDispatcher::clearHandler(Window id)
 }
 
 //#include <stdio.h>
+#include <stdio.h>
 void OtkEventDispatcher::dispatchEvents(void)
 {
   XEvent e;
@@ -48,15 +49,42 @@ void OtkEventDispatcher::dispatchEvents(void)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
-    it = _map.find(e.xany.window);
-
-    if (it != _map.end())
-      handler = it->second;
-    else
-      handler = _fallback;
-
-    if (handler)
-      handler->handle(e);
+    // these ConfigureRequests require some special attention
+    if (e.type == ConfigureRequest) {
+      // find the actual window! e.xany.window is the parent window
+      it = _map.find(e.xconfigurerequest.window);
+
+      if (it != _map.end())
+        it->second->handle(e);
+      else {
+        // unhandled configure requests must be used to configure the window
+        // directly
+        XWindowChanges xwc;
+
+        xwc.x = e.xconfigurerequest.x;
+        xwc.y = e.xconfigurerequest.y;
+        xwc.width = e.xconfigurerequest.width;
+        xwc.height = e.xconfigurerequest.height;
+        xwc.border_width = e.xconfigurerequest.border_width;
+        xwc.sibling = e.xconfigurerequest.above;
+        xwc.stack_mode = e.xconfigurerequest.detail;
+
+        XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
+                         e.xconfigurerequest.value_mask, &xwc);
+      }
+    } else {
+      // normal events
+      
+      it = _map.find(e.xany.window);
+
+      if (it != _map.end())
+        handler = it->second;
+      else
+        handler = _fallback;
+
+      if (handler)
+        handler->handle(e);
+    }
 
     if (_master)
       _master->handle(e);