X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus.c;h=88ef01047160472775c7ac1ad58284cc776fcda7;hb=b906db3e11c06997261297cdb1992fd1b05738ff;hp=00759514eb23e92680de8ffc615eec4f55947863;hpb=acfa2af3c2eacd099869cc5aebdcfa1241214e8b;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 00759514..88ef0104 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -28,6 +28,7 @@
 #include "screen.h"
 #include "group.h"
 #include "prop.h"
+#include "keyboard.h"
 #include "focus.h"
 #include "stacking.h"
 #include "popup.h"
@@ -200,6 +201,7 @@ void focus_set_client(ObClient *client)
 
 
     focus_tried = NULL; /* focus isn't "trying" to go anywhere now */
+    ob_debug_type(OB_DEBUG_FOCUS, "focus tried = NULL\n");
 }
 
 static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
@@ -280,19 +282,17 @@ ObClient* focus_fallback(gboolean allow_refocus)
     old = focus_client;
     new = focus_fallback_target(allow_refocus, focus_client);
 
-    /* send focus somewhere if it is moving or if it was NULL before,
-       in which case it may not even be on the screen */
-    if (!old || new != old) {
-        /* unfocus any focused clients.. they can be focused by Pointer events
-           and such, and then when we try focus them, we won't get a FocusIn
-           event at all for them. */
-        focus_nothing();
+    /* unfocus any focused clients.. they can be focused by Pointer events
+       and such, and then when we try focus them, we won't get a FocusIn
+       event at all for them. */
+    focus_nothing();
 
-        if (new) {
-            client_focus(new);
-            /* remember that we tried to send focus here */
-            focus_tried = new;
-        }
+    if (new) {
+        client_focus(new);
+        /* remember that we tried to send focus here */
+        focus_tried = new;
+
+        ob_debug_type(OB_DEBUG_FOCUS, "focus tried = %s\n", new->title);
     }
 
     return new;
@@ -306,8 +306,25 @@ void focus_nothing()
         screen_install_colormap(NULL, TRUE);
     }
 
+    /* Don't set focus_client to NULL here. It will be set to NULL when the
+       FocusOut event comes. Otherwise, if we focus nothing and then focus the
+       same window again, The focus code says nothing changed, but focus_client
+       ends up being NULL anyways.
     focus_client = NULL;
+    */
+
     focus_tried = NULL; /* focus isn't "trying" to go anywhere now */
+    ob_debug_type(OB_DEBUG_FOCUS, "focus tried = NULL\n");
+
+    /* if there is a grab going on, then we need to cancel it. if we move
+       focus during the grab, applications will get NotifyWhileGrabbed events
+       and ignore them !
+
+       actions should not rely on being able to move focus during an
+       interactive grab.
+    */
+    if (keyboard_interactively_grabbed())
+        keyboard_interactive_cancel();
 
     /* when nothing will be focused, send focus to the backup target */
     XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
@@ -743,10 +760,13 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
         /* the currently selected window isn't interesting */
         if(cur == c)
             continue;
-        if (!dock_windows && !desktop_windows && !client_normal(cur))
+        if (cur->type == OB_CLIENT_TYPE_DOCK && !dock_windows)
             continue;
-        if (!(dock_windows && cur->type == OB_CLIENT_TYPE_DOCK) ||
-            (desktop_windows && cur->type == OB_CLIENT_TYPE_DESKTOP))
+        if (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows)
+            continue;
+        if (!client_normal(cur) &&
+            cur->type != OB_CLIENT_TYPE_DOCK &&
+            cur->type != OB_CLIENT_TYPE_DESKTOP)
             continue;
         /* using c->desktop instead of screen_desktop doesn't work if the
          * current window was omnipresent, hope this doesn't have any other
@@ -948,6 +968,9 @@ static void focus_tried_hide_notify(ObClient *client, gpointer data)
 {
     XEvent ce;
 
+    ob_debug_type(OB_DEBUG_FOCUS, "checking focus tried (%s) against %s\n",
+                  (focus_tried?focus_tried->title:"(null)"), client->title);
+
     if (client == focus_tried) {
         /* we were trying to focus this window but it's gone */