yet more focus fixings. RevertToPointerRoot could mess things up focusing a client...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index b048e7e64e7e95babf6c08f0536386d9bb99df5a..8d1f444992865bf9dd153cdc809dde4d08d4b7bc 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -149,6 +149,8 @@ void event_process(XEvent *e)
             window = e->xany.window;
     }
      
+    client = g_hash_table_lookup(client_map, &window);
+
     /* grab the lasttime and hack up the state */
     switch (e->type) {
     case ButtonPress:
@@ -223,10 +225,22 @@ void event_process(XEvent *e)
     case FocusIn:
         g_message("FocusIn on %lx mode %d detail %d", window,
                   e->xfocus.mode, e->xfocus.detail);
+        /* NotifyAncestor is not ignored in FocusIn like it is in FocusOut
+           because of RevertToPointerRoot. If the focus ends up reverting to
+           pointer root on a workspace change, then the FocusIn event that we
+           want will be of type NotifyAncestor. This situation does not occur
+           for FocusOut, so it is safely ignored there.
+        */
        if (e->xfocus.detail == NotifyInferior ||
-            /*e->xfocus.detail == NotifyAncestor ||*/
-            e->xfocus.detail > NotifyNonlinearVirtual) return;
-            g_message("FocusIn on %lx", window);
+            e->xfocus.detail > NotifyNonlinearVirtual || client == NULL) {
+            /* says a client was not found for the event (or a valid FocusIn
+               event was not found.
+            */
+            e->xfocus.window = None;
+            return;
+        }
+
+        g_message("FocusIn on %lx", window);
         break;
     case FocusOut:
         g_message("FocusOut on %lx mode %d detail %d", window,
@@ -237,24 +251,15 @@ void event_process(XEvent *e)
             e->xfocus.detail > NotifyNonlinearVirtual) return;
 
         g_message("FocusOut on %lx", window);
-        /* FocusOut events just make us look for FocusIn events. They
-           are mostly ignored otherwise. */
+        /* Try process a FocusIn first, and if a legit one isn't found, then
+           do the fallback shiznit. */
         {
             XEvent fi;
             if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
                event_process(&fi);
 
                 /* secret magic way of event_process telling us that no client
-                   was found for the FocusIn event.
-                   
-                   it should be noted!! that focus events of invalud types
-                   (the ones that cause a return in the FocusIn case above)
-                   will not cause this focus_fallback to be called. it will
-                   be assumed that focus is going someplace sane still, or
-                   there are more focus events coming to fix up the situation.
-                   this may not be perfect.. but its working! and focus events
-                   are too much headache to take that for granted. ktnx. ^_^
-                */
+                   was found for the FocusIn event. ^_^ */
                 if (fi.xfocus.window == None)
                     focus_fallback(FALSE);
                 if (fi.xfocus.window == e->xfocus.window)
@@ -275,8 +280,6 @@ void event_process(XEvent *e)
         break;
     }
 
-    client = g_hash_table_lookup(client_map, &window);
-
     /* deal with it in the kernel */
     if (client)
        event_handle_client(client, e);
@@ -284,8 +287,6 @@ void event_process(XEvent *e)
        event_handle_root(e);
     else if (e->type == MapRequest)
        client_manage(window);
-    else if (e->type == FocusIn)
-       e->xfocus.window = None; /* says a client was found for the event! */
     else if (e->type == ConfigureRequest) {
        /* unhandled configure requests must be used to configure the
           window directly */