use the right lib

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 38d395d7e57cca1f643598a843e6f006336c2bfe..6c15a60bcf8d0aa9be411a517971eaf42b24630b 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -45,67 +45,87 @@ void OtkEventDispatcher::dispatchEvents(void)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
-    Window win;
-
-    // pick a window
-    switch (e.type) {
-    case UnmapNotify:
-      win = e.xunmap.window;
-      break;
-    case DestroyNotify:
-      win = e.xdestroywindow.window;
-      break;
-    case ConfigureRequest:
-      win = e.xconfigurerequest.window;
-      break;
-    default:
-      win = e.xany.window;
-    }
+    if (e.type == FocusIn || e.type == FocusOut) {
+      // focus events are a beast all their own.. yuk, hate, etc.
+      dispatchFocus(e);
+    } else {    
+      Window win;
+
+      // pick a window
+      switch (e.type) {
+      case UnmapNotify:
+        win = e.xunmap.window;
+        break;
+      case DestroyNotify:
+        win = e.xdestroywindow.window;
+        break;
+      case ConfigureRequest:
+        win = e.xconfigurerequest.window;
+        break;
+      default:
+        win = e.xany.window;
+      }
     
-    // grab the lasttime and hack up the modifiers
-    switch (e.type) {
-    case ButtonPress:
-    case ButtonRelease:
-      _lasttime = e.xbutton.time;
-      e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() |
-                           OBDisplay::scrollLockMask());
-      break;
-    case KeyPress:
-      e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() |
-                        OBDisplay::scrollLockMask());
-      break;
-    case MotionNotify:
-      _lasttime = e.xmotion.time;
-      e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() |
-                           OBDisplay::scrollLockMask());
-      break;
-    case PropertyNotify:
-      _lasttime = e.xproperty.time;
-      break;
-    case EnterNotify:
-    case LeaveNotify:
-      _lasttime = e.xcrossing.time;
-      break;
+      // grab the lasttime and hack up the modifiers
+      switch (e.type) {
+      case ButtonPress:
+      case ButtonRelease:
+        _lasttime = e.xbutton.time;
+        e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() |
+                             OBDisplay::scrollLockMask());
+        break;
+      case KeyPress:
+        e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() |
+                          OBDisplay::scrollLockMask());
+        break;
+      case MotionNotify:
+        _lasttime = e.xmotion.time;
+        e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() |
+                             OBDisplay::scrollLockMask());
+        break;
+      case PropertyNotify:
+        _lasttime = e.xproperty.time;
+        break;
+      case EnterNotify:
+      case LeaveNotify:
+        _lasttime = e.xcrossing.time;
+        break;
+      }
+
+      dispatch(win, e);
     }
+  }
+}
 
-    if (e.type == FocusIn || e.type == FocusOut)
-      // any other types are not ones we're interested in
-      if (e.xfocus.detail != NotifyNonlinear)
-        continue;
-
-    if (e.type == FocusOut) {
-      XEvent fi;
-      // send a FocusIn first if one exists
-      while (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) {
-        // any other types are not ones we're interested in
-        if (fi.xfocus.detail == NotifyNonlinear) {
-          dispatch(fi.xfocus.window, fi);
-          break;
-        }
-      }
+void OtkEventDispatcher::dispatchFocus(const XEvent &e)
+{
+  if (e.type == FocusIn) {
+    //printf("Got FocusIn!\n");
+
+    // send a FocusIn to whatever was just focused
+    dispatch(e.xfocus.window, e);
+    //printf("Sent FocusIn 0x%lx\n", e.xfocus.window);
+
+  } else if (e.type == FocusOut) {
+    //printf("Got FocusOut!\n");
+
+    // ignore FocusOut changes from grabs
+    if (e.xfocus.mode == NotifyGrab)
+      return;
+  
+    // FocusOut events just make us look for FocusIn events. They are ignored
+    // otherwise.
+    XEvent fi;
+    if (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) {
+      //printf("Found FocusIn\n");
+      dispatchFocus(fi);
+      // dont unfocus the window we just focused!
+      if (fi.xfocus.window == e.xfocus.window)
+        return;
     }
-    
-    dispatch(win, e);
+
+    dispatch(e.xfocus.window, e);
+    //printf("Sent FocusOut 0x%lx\n", e.xfocus.window);
   }
 }