when a window focused that was the last focused already (this happens from grabs...

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index d28a74269d57ad861948334daef414de74100eb2..51e2251e201050b29fddf807debe9bbaded7784e 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -56,6 +56,20 @@ void OtkEventDispatcher::dispatchEvents(void)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
+    // grab the lasttime
+    switch (e.type) {
+    case ButtonPress:
+    case ButtonRelease:
+      _lasttime = e.xbutton.time; break;
+    case MotionNotify:
+      _lasttime = e.xmotion.time; break;
+    case PropertyNotify:
+      _lasttime = e.xproperty.time; break;
+    case EnterNotify:
+    case LeaveNotify:
+      _lasttime = e.xcrossing.time; break;
+    }
+
     // these ConfigureRequests require some special attention
     if (e.type == ConfigureRequest) {
       // find the actual window! e.xany.window is the parent window
@@ -85,31 +99,31 @@ void OtkEventDispatcher::dispatchEvents(void)
       if (e.xfocus.detail == NotifyNonlinear) {
         focus = e.xfocus.window;
         unfocus = None;
-        printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
+        //printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
       }
     } else if (e.type == FocusOut) {
       // any other types are not ones we're interested in
       if (e.xfocus.detail == NotifyNonlinear) {
         unfocus = e.xfocus.window;
         focus = None;
-        printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
+        //printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
       }
-/*    // madly compress all crossing events
+    // madly compress all crossing events
     } else if (e.type == EnterNotify) {
       // any other types are not ones we're interested in
       if (e.xcrossing.mode == NotifyNormal) {
         // any other types are not ones we're interested in
         enter = e.xcrossing.window;
         enter_root = e.xcrossing.root;
-        printf("Enter enter=%lx leave=%lx\n", enter, leave);
+        //printf("Enter enter=%lx leave=%lx\n", enter, leave);
       }
     } else if (e.type == LeaveNotify) {
       // any other types are not ones we're interested in
       if (e.xcrossing.mode == NotifyNormal) {
         leave = e.xcrossing.window;
         leave_root = e.xcrossing.root;
-        printf("Leave enter=%lx leave=%lx\n", enter, leave);
-        }*/
+        //printf("Leave enter=%lx leave=%lx\n", enter, leave);
+      }
     } else {
       // normal events
       dispatch(e);
@@ -118,26 +132,27 @@ void OtkEventDispatcher::dispatchEvents(void)
 
   if (unfocus != None) {
     // the last focus event was an FocusOut, so where the hell is the focus at?
-    printf("UNFOCUSING: %lx\n", unfocus);
+    //printf("UNFOCUSING: %lx\n", unfocus);
     _focus_e.xfocus.type = FocusOut;
     _focus_e.xfocus.window = unfocus;
     dispatch(_focus_e);
 
     _focus = None;
-  } else if (focus != None) {
+  } else if (focus != None && focus != _focus) {
     // the last focus event was a FocusIn, so unfocus what used to be focus and
     // focus this new target
+    //printf("FOCUSING: %lx\n", focus);
+    _focus_e.xfocus.type = FocusIn;
+    _focus_e.xfocus.window = focus;
+    dispatch(_focus_e);
+
     if (_focus != None) {
-      printf("UNFOCUSING: %lx\n", _focus);
+      //printf("UNFOCUSING: %lx\n", _focus);
       _focus_e.xfocus.type = FocusOut;
       _focus_e.xfocus.window = _focus;
       dispatch(_focus_e);
     }
-    printf("FOCUSING: %lx\n", focus);
-    _focus_e.xfocus.type = FocusIn;
-    _focus_e.xfocus.window = focus;
-    dispatch(_focus_e);
-
+    
     _focus = focus;
   }
   
@@ -159,6 +174,9 @@ void OtkEventDispatcher::dispatch(const XEvent &e) {
   OtkEventHandler *handler;
   OtkEventMap::iterator it;
 
+  if (_master)
+    _master->handle(e);
+
   it = _map.find(e.xany.window);
   
   if (it != _map.end())
@@ -168,9 +186,6 @@ void OtkEventDispatcher::dispatch(const XEvent &e) {
 
   if (handler)
     handler->handle(e);
-
-  if (_master)
-    _master->handle(e);
 }
 
 OtkEventHandler *OtkEventDispatcher::findHandler(Window win)