X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=2d1445192df91a2d2373e56ca88172906670bbda;hb=e2c3582a5c0230cae0571e8f92829b910039f179;hp=fc8b6fff175bd5a973ff5decffd2dc3d805ff6bc;hpb=76943cdfe07390b031ad6404dbb59413364a5a17;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index fc8b6fff..2d144519 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -225,16 +225,6 @@ void event_process(XEvent *e)
     case FocusIn:
         g_message("FocusIn on %lx mode %d detail %d", window,
                   e->xfocus.mode, e->xfocus.detail);
-        if (client == NULL) {
-            /* says a client was not found for the event!
-               this is important whether the event is a valid type for us or
-               not! this makes the evil known as mozilla not DESTROY my
-               precious wm!! YES ITS FIVE AM AND I AM NOT SANE RIGHT NOW. FOCUS
-               EVENTS WILL DRIVE YOU MAD.
-             */
-            e->xfocus.window = None;
-        }
-
         /* 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
@@ -242,8 +232,16 @@ void event_process(XEvent *e)
            for FocusOut, so it is safely ignored there.
         */
 	if (e->xfocus.detail == NotifyInferior ||
-            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,
@@ -254,16 +252,24 @@ 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;
+            XEvent fi, fo;
+            gboolean isfo = FALSE;
+
             if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
 		event_process(&fi);
 
+                /* when we have gotten a fi/fo pair, then see if there are any
+                   more fo's coming. if there are, then don't fallback just yet
+                */
+                if ((isfo = XCheckTypedEvent(ob_display, FocusOut, &fo)))
+                    XPutBackEvent(ob_display, &fo);
+
                 /* secret magic way of event_process telling us that no client
                    was found for the FocusIn event. ^_^ */
-                if (fi.xfocus.window == None)
+                if (!isfo && fi.xfocus.window == None)
                     focus_fallback(FALSE);
                 if (fi.xfocus.window == e->xfocus.window)
                     return;