X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=72588a30a958b0bcacafbbc472d57565d3d9e25a;hb=e10dd09e4831c2226a30b0454ff0a7615e590269;hp=a4d3f9f2d187853c211f6fb38e7f268d9e45a076;hpb=ba6754ac88b48c652639aec56498cb23b422bafa;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index a4d3f9f2..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;
@@ -57,8 +65,10 @@ static ObIconPopup *focus_cycle_popup;
 
 static gboolean valid_focus_target(ObClient *ft,
                                    gboolean all_desktops,
-                                   gboolean dock_windows);
-static void focus_cycle_destructor(ObClient *client, gpointer data);
+                                   gboolean dock_windows,
+                                   gboolean desktop_windows);
+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)
@@ -76,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();
@@ -129,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);
@@ -166,7 +180,7 @@ void focus_set_client(ObClient *client)
        be used.
     */
     if (focus_cycle_target)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
 
     focus_client = client;
 
@@ -183,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;
@@ -255,19 +272,26 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
     return desktop;   
 }
 
-void focus_fallback(gboolean allow_refocus)
+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);
+        /* remember that we tried to send focus here */
+        focus_tried = new;
+    }
+
+    return new;
 }
 
 void focus_nothing()
@@ -279,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,
@@ -320,7 +355,8 @@ static gchar *popup_get_name(ObClient *c, ObClient **nametarget)
 }
 
 static void popup_cycle(ObClient *c, gboolean show,
-                        gboolean all_desktops, gboolean dock_windows)
+                        gboolean all_desktops, gboolean dock_windows,
+                        gboolean desktop_windows)
 {
     gchar *showtext = NULL;
     ObClient *showtarget;
@@ -354,7 +390,9 @@ static void popup_cycle(ObClient *c, gboolean show,
         /* build a list of all the valid focus targets */
         for (it = focus_order; it; it = g_list_next(it)) {
             ObClient *ft = it->data;
-            if (valid_focus_target(ft, all_desktops, dock_windows)) {
+            if (valid_focus_target(ft, all_desktops, dock_windows
+                                   , desktop_windows))
+            {
                 targets = g_list_prepend(targets, ft);
                 ++n;
             }
@@ -385,13 +423,13 @@ 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
     */
     if (focus_cycle_target == client)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
 }
 
 void focus_cycle_draw_indicator()
@@ -540,7 +578,7 @@ static gboolean has_valid_group_siblings_on_desktop(ObClient *ft,
         ObClient *c = it->data;
         /* check that it's not a helper window to avoid infinite recursion */
         if (c != ft && !client_helper(c) &&
-            valid_focus_target(c, all_desktops, FALSE))
+            valid_focus_target(c, all_desktops, FALSE, FALSE))
         {
             return TRUE;
         }
@@ -552,7 +590,8 @@ static gboolean has_valid_group_siblings_on_desktop(ObClient *ft,
                          checking helper windows. */
 static gboolean valid_focus_target(ObClient *ft,
                                    gboolean all_desktops,
-                                   gboolean dock_windows)
+                                   gboolean dock_windows,
+                                   gboolean desktop_windows)
 {
     gboolean ok = FALSE;
 
@@ -567,8 +606,9 @@ static gboolean valid_focus_target(ObClient *ft,
     ok = ok && (ft->can_focus || ft->focus_notify);
 
     /* it's the right type of window */
-    if (dock_windows)
-        ok = ok && ft->type == OB_CLIENT_TYPE_DOCK;
+    if (dock_windows || desktop_windows)
+        ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) ||
+                    (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP));
     else
         /* normal non-helper windows are valid targets */
         ok = ok &&
@@ -585,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) ||
@@ -597,7 +638,7 @@ static gboolean valid_focus_target(ObClient *ft,
 }
 
 void focus_cycle(gboolean forward, gboolean all_desktops,
-                 gboolean dock_windows,
+                 gboolean dock_windows, gboolean desktop_windows,
                  gboolean linear, gboolean interactive,
                  gboolean dialog, gboolean done, gboolean cancel)
 {
@@ -642,14 +683,17 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
             if (it == NULL) it = g_list_last(list);
         }
         ft = it->data;
-        if (valid_focus_target(ft, all_desktops, dock_windows)) {
+        if (valid_focus_target(ft, all_desktops, dock_windows,
+                               desktop_windows))
+        {
             if (interactive) {
                 if (ft != focus_cycle_target) { /* prevents flicker */
                     focus_cycle_target = ft;
                     focus_cycle_draw_indicator();
                 }
                 /* same arguments as valid_focus_target */
-                popup_cycle(ft, dialog, all_desktops, dock_windows);
+                popup_cycle(ft, dialog, all_desktops, dock_windows,
+                            desktop_windows);
                 return;
             } else if (ft != focus_cycle_target) {
                 focus_cycle_target = ft;
@@ -671,7 +715,7 @@ done_cycle:
 
     if (interactive) {
         focus_cycle_draw_indicator();
-        popup_cycle(ft, FALSE, FALSE, FALSE);
+        popup_cycle(ft, FALSE, FALSE, FALSE, FALSE);
     }
 
     return;
@@ -679,7 +723,8 @@ done_cycle:
 
 /* this be mostly ripped from fvwm */
 static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
-                                 gboolean dock_windows) 
+                                        gboolean dock_windows,
+                                        gboolean desktop_windows) 
 {
     gint my_cx, my_cy, his_cx, his_cy;
     gint offset = 0;
@@ -704,9 +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 && !client_normal(cur))
+        if (cur->type == OB_CLIENT_TYPE_DOCK && !dock_windows)
             continue;
-        if (dock_windows && cur->type != OB_CLIENT_TYPE_DOCK)
+        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
@@ -782,7 +831,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
 }
 
 void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
-                             gboolean interactive,
+                             gboolean desktop_windows, gboolean interactive,
                              gboolean dialog, gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
@@ -804,12 +853,14 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
     if (!focus_cycle_target) focus_cycle_target = focus_client;
 
     if (focus_cycle_target)
-        ft = focus_find_directional(focus_cycle_target, dir, dock_windows);
+        ft = focus_find_directional(focus_cycle_target, dir, dock_windows,
+                                    desktop_windows);
     else {
         GList *it;
 
         for (it = focus_order; it; it = g_list_next(it))
-            if (valid_focus_target(it->data, FALSE, dock_windows))
+            if (valid_focus_target(it->data, FALSE, dock_windows,
+                                   desktop_windows))
                 ft = it->data;
     }
         
@@ -821,7 +872,8 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
     }
     if (focus_cycle_target) {
         /* same arguments as valid_focus_target */
-        popup_cycle(focus_cycle_target, dialog, FALSE, dock_windows);
+        popup_cycle(focus_cycle_target, dialog, FALSE, dock_windows,
+                    desktop_windows);
         if (dialog)
             return;
     }
@@ -835,7 +887,7 @@ done_cycle:
     focus_cycle_target = NULL;
 
     focus_cycle_draw_indicator();
-    popup_cycle(ft, FALSE, FALSE, FALSE);
+    popup_cycle(ft, FALSE, FALSE, FALSE, FALSE);
 
     return;
 }
@@ -900,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);
+        }
+    }
+}