add more options for focus fallback, use an enum for all the types of fallbacks.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index cf6e7b514aef8be24bff6196ac49051bb7481851..8afbdcb6f6fc942569679db9e6701d5b03c6f4f4 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -3,6 +3,7 @@
 #include "client.h"
 #include "frame.h"
 #include "screen.h"
+#include "group.h"
 #include "prop.h"
 #include "dispatch.h"
 #include "focus.h"
@@ -162,7 +163,7 @@ static gboolean focus_under_pointer()
     return FALSE;
 }
 
-void focus_fallback(gboolean switching_desks)
+void focus_fallback(FallbackType type)
 {
     GList *it;
     Client *old = NULL;
@@ -175,26 +176,37 @@ void focus_fallback(gboolean switching_desks)
     */
     focus_set_client(NULL);
 
-    if (switching_desks) {
-        /* don't skip any windows when switching desktops */
-        old = NULL;
-    }
-
-    if (!(switching_desks ? focus_last_on_desktop : focus_last)) {
+    if (!(type == Fallback_Desktop ? focus_last_on_desktop : focus_last)) {
         if (focus_follow) focus_under_pointer();
         return;
     }
 
+    if (type == Fallback_Unfocusing && old && old->transient_for) {
+        if (old->transient_for == TRAN_GROUP) {
+            for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
+                GSList *sit;
+
+                for (sit = old->group->members; sit; sit = sit->next)
+                    if (sit->data == it->data && client_focus(sit->data))
+                        return;
+            }
+        } else {
+            if (client_normal(old->transient_for))
+                if (client_focus(old->transient_for))
+                    return;
+        }
+    }
+
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
-        if (it->data != old && client_normal(it->data))
-            if (client_focus(it->data))
+        if (type != Fallback_Unfocusing || it->data != old)
+            if (client_normal(it->data) && client_focus(it->data))
                 return;
 
     /* nothing to focus */
     focus_set_client(NULL);
 }
 
-void focus_cycle(gboolean forward, gboolean linear, gboolean done,
+Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
                  gboolean cancel)
 {
     static Client *first = NULL;
@@ -232,18 +244,18 @@ void focus_cycle(gboolean forward, gboolean linear, gboolean done,
             if (it == NULL) it = g_list_last(list);
         }
         ft = client_focus_target(it->data);
-        if (ft == it->data && focus_client != ft && client_focusable(ft)) {
-            if (client_focus(ft)) {
-                noreorder++; /* avoid reordering the focus_order */
-                break;
-            }
+        if (ft == it->data && focus_client != ft && client_normal(ft) &&
+            client_focus(ft)) {
+            noreorder++; /* avoid reordering the focus_order */
+            return ft;
         }
     } while (it != start);
-    return;
+    return NULL;
 
 done_cycle:
     t = NULL;
     first = NULL;
     g_list_free(order);
     order = NULL;
+    return NULL;
 }