X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus.c;h=7e1623bd61df8957cc94350cfff3f34462c10e6f;hb=f9fe78d970fa1ef62d56160db7a82fa6948643b6;hp=2c66336da39e3ca281647253e03f38b39610f424;hpb=1d1aef75a0a4ab016243336fce0a69d00623caf8;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 2c66336d..7e1623bd 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"
@@ -59,7 +60,7 @@ static gboolean valid_focus_target(ObClient *ft,
                                    gboolean all_desktops,
                                    gboolean dock_windows,
                                    gboolean desktop_windows);
-static void focus_cycle_destructor(ObClient *client, gpointer data);
+static void focus_cycle_destroy_notify(ObClient *client, gpointer data);
 
 static Window createWindow(Window parent, gulong mask,
                            XSetWindowAttributes *attrib)
@@ -77,7 +78,7 @@ void focus_startup(gboolean reconfig)
     if (!reconfig) {
         XSetWindowAttributes attr;
 
-        client_add_destructor(focus_cycle_destructor, NULL);
+        client_add_destroy_notify(focus_cycle_destroy_notify, NULL);
 
         /* start with nothing focused */
         focus_nothing();
@@ -130,7 +131,7 @@ void focus_shutdown(gboolean reconfig)
     icon_popup_free(focus_cycle_popup);
 
     if (!reconfig) {
-        client_remove_destructor(focus_cycle_destructor);
+        client_remove_destroy_notify(focus_cycle_destroy_notify);
 
         /* reset focus to root */
         XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
@@ -186,7 +187,7 @@ void focus_set_client(ObClient *client)
     }
 }
 
-ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
 {
     GList *it;
     ObClient *target = NULL;
@@ -259,19 +260,20 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
 ObClient* focus_fallback(gboolean allow_refocus)
 {
     ObClient *new;
-    ObClient *old = focus_client;
+    ObClient *old;
+
+    old = focus_client;
+    new = focus_fallback_target(allow_refocus, focus_client);
 
     /* unfocus any focused clients.. they can be focused by Pointer events
-       and such, and then when I try focus them, I won't get a FocusIn event
-       at all for them.
-    */
+       and such, and then when we try focus them, we won't get a FocusIn
+       event at all for them. */
     focus_nothing();
 
-    if ((new = focus_fallback_target(allow_refocus, old))) {
+    if (new)
         client_focus(new);
-        return new;
-    } else
-        return NULL;
+
+    return new;
 }
 
 void focus_nothing()
@@ -282,7 +284,22 @@ 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;
+    */
+
+    /* 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,
@@ -392,7 +409,7 @@ static void popup_cycle(ObClient *c, gboolean show,
     g_free(showtext);
 }
 
-static void focus_cycle_destructor(ObClient *client, gpointer data)
+static void focus_cycle_destroy_notify(ObClient *client, gpointer data)
 {
     /* end cycling if the target disappears. CurrentTime is fine, time won't
        be used
@@ -594,6 +611,7 @@ static gboolean valid_focus_target(ObClient *ft,
     /* it's not set to skip the taskbar (unless it is a type that would be
        expected to set this hint */
     ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK ||
+                 ft->type == OB_CLIENT_TYPE_DESKTOP ||
                  ft->type == OB_CLIENT_TYPE_TOOLBAR ||
                  ft->type == OB_CLIENT_TYPE_MENU ||
                  ft->type == OB_CLIENT_TYPE_UTILITY) ||
@@ -717,10 +735,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 (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows)
             continue;
-        if (!(dock_windows && cur->type == OB_CLIENT_TYPE_DOCK) ||
-            (desktop_windows && cur->type == OB_CLIENT_TYPE_DESKTOP))
+        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