use fitString to size the move coords box

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 9e40947d019ed3d36009e75db678ba21b74c592e..c8b27b9c702220db5ef131609863e28a0c88c954 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -89,6 +89,8 @@ void EventDispatcher::dispatchEvents(void)
       case EnterNotify:
       case LeaveNotify:
         _lasttime = e.xcrossing.time;
+        if (e.xcrossing.mode != NotifyNormal)
+          continue; // skip me!
         break;
       }
 
@@ -99,8 +101,11 @@ void EventDispatcher::dispatchEvents(void)
 
 void EventDispatcher::dispatchFocus(const XEvent &e)
 {
+//  printf("focus %s detail %d -> 0x%lx\n",
+//         (e.xfocus.type == FocusIn ? "IN" : "OUT"),
+//         e.xfocus.detail, e.xfocus.window);
   // ignore focus changes from grabs
-  if (e.xfocus.mode == NotifyGrab) // ||
+  if (e.xfocus.mode == NotifyGrab) //|| e.xfocus.mode == NotifyUngrab ||
       // From Metacity, from WindowMaker, ignore all funky pointer root events
       // its commented out cuz I don't think we need this at all. If problems
       // arise we can look into it
@@ -160,9 +165,17 @@ void EventDispatcher::dispatch(Window win, const XEvent &e)
     xwc.border_width = e.xconfigurerequest.border_width;
     xwc.sibling = e.xconfigurerequest.above;
     xwc.stack_mode = e.xconfigurerequest.detail;
-      
+    
+#ifdef DEBUG
+    printf("Proxying configure event for 0x%lx\n", e.xconfigurerequest.window);
+#endif
+    
+    // we are not to be held responsible if someone sends us an invalid
+    // request!
+    display->setIgnoreErrors(true); 
     XConfigureWindow(**display, e.xconfigurerequest.window,
                      e.xconfigurerequest.value_mask, &xwc);
+    display->setIgnoreErrors(false);
   } else {
     // grab a falback if it exists
     handler = _fallback;