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

diff --git a/openbox/focus.c b/openbox/focus.c
index 2c66336d..72588a30 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -43,6 +43,14 @@ ObClient *focus_client = NULL;
 GList *focus_order = NULL;
 ObClient *focus_cycle_target = NULL;
 
+/*! This variable is used for focus fallback. If we fallback to a window, we
+  set this to the window. And when focus goes somewhere after that, it will
+  be set to NULL. If between falling back to that window and something
+  getting focused, the window gets unmanaged, then if there are no incoming
+  FocusIn events, we fallback again because focus has just gotten itself lost.
+ */
+static ObClient *focus_tried = NULL;
+
 struct {
     InternalWindow top;
     InternalWindow left;
@@ -59,7 +67,8 @@ 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 void focus_tried_hide_notify(ObClient *client, gpointer data);
 
 static Window createWindow(Window parent, gulong mask,
                            XSetWindowAttributes *attrib)
@@ -77,7 +86,9 @@ 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);
+        client_add_destroy_notify(focus_tried_hide_notify, NULL);
+        client_add_hide_notify(focus_tried_hide_notify, NULL);
 
         /* start with nothing focused */
         focus_nothing();
@@ -130,7 +141,9 @@ 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);
+        client_remove_destroy_notify(focus_tried_hide_notify);
+        client_remove_hide_notify(focus_tried_hide_notify);
 
         /* reset focus to root */
         XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
@@ -184,9 +197,12 @@ void focus_set_client(ObClient *client)
         PROP_SET32(RootWindow(ob_display, ob_screen),
                    net_active_window, window, active);
     }
+
+
+    focus_tried = NULL; /* focus isn't "trying" to go anywhere now */
 }
 
-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 +275,23 @@ 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;
+        /* remember that we tried to send focus here */
+        focus_tried = new;
+    }
+
+    return new;
 }
 
 void focus_nothing()
@@ -283,6 +303,17 @@ void focus_nothing()
     }
 
     focus_client = NULL;
+    focus_tried = NULL; /* focus isn't "trying" to go anywhere now */
+
+    /* 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 +423,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 +625,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 +749,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
@@ -917,3 +952,25 @@ ObClient *focus_order_find_first(guint desktop)
     }
     return NULL;
 }
+
+static void focus_tried_hide_notify(ObClient *client, gpointer data)
+{
+    XEvent ce;
+
+    if (client == focus_tried) {
+        /* we were trying to focus this window but it's gone */
+
+        focus_tried = NULL;
+
+        ob_debug_type(OB_DEBUG_FOCUS, "Tried to focus window 0x%x and it "
+                      "is being unmanaged:\n");
+        if (XCheckIfEvent(ob_display, &ce, event_look_for_focusin_client,NULL))
+        {
+            XPutBackEvent(ob_display, &ce);
+            ob_debug_type(OB_DEBUG_FOCUS, "  but another FocusIn is coming\n");
+        } else {
+            ob_debug_type(OB_DEBUG_FOCUS, "  so falling back focus again.\n");
+            focus_fallback(TRUE);
+        }
+    }
+}