X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=a79049106a85ceb0efc1d6282cab7bdc2f1d4811;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=9c29345f7c484b29ad3a87132d15ea1def95520d;hpb=4be58bf13719fd22cb08a7f016eaf757640ccd05;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 9c29345f..a7904910 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -162,11 +162,8 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!(type == OB_FOCUS_FALLBACK_DESKTOP ?
-          config_focus_last_on_desktop : config_focus_last)) {
-        if (config_focus_follow) focus_under_pointer();
+    if (config_focus_follow && focus_under_pointer())
         return;
-    }
 
     if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         /* try for transient relations */
@@ -260,6 +257,18 @@ static void popup_cycle(ObClient *c, gboolean show)
     }
 }
 
+static gboolean valid_focus_target(ObClient *ft)
+{
+    /* we don't use client_can_focus here, because that doesn't let you
+       focus an iconic window, but we want to be able to, so we just check
+       if the focus flags on the window allow it, and its on the current
+       desktop */
+    return (ft->transients == NULL && client_normal(ft) &&
+            ((ft->can_focus || ft->focus_notify) &&
+             !ft->skip_taskbar &&
+             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
+}
+
 void focus_cycle(gboolean forward, gboolean linear,
                  gboolean dialog, gboolean done, gboolean cancel)
 {
@@ -280,6 +289,9 @@ void focus_cycle(gboolean forward, gboolean linear,
         goto done_cycle;
     }
 
+    if (!focus_order[screen_desktop])
+        goto done_cycle;
+
     if (!first) first = focus_client;
     if (!focus_cycle_target) focus_cycle_target = focus_client;
 
@@ -301,14 +313,7 @@ void focus_cycle(gboolean forward, gboolean linear,
         }
         /*ft = client_focus_target(it->data);*/
         ft = it->data;
-        /* we don't use client_can_focus here, because that doesn't let you
-           focus an iconic window, but we want to be able to, so we just check
-           if the focus flags on the window allow it, and its on the current
-           desktop */
-        if (ft->transients == NULL && client_normal(ft) &&
-            ((ft->can_focus || ft->focus_notify) &&
-             !ft->skip_taskbar &&
-             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) {
+        if (valid_focus_target(ft)) {
             if (ft != focus_cycle_target) { /* prevents flicker */
                 if (focus_cycle_target)
                     frame_adjust_focus(focus_cycle_target->frame, FALSE);
@@ -339,7 +344,7 @@ void focus_directional_cycle(ObDirection dir,
                              gboolean dialog, gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
-    ObClient *ft;
+    ObClient *ft = NULL;
 
     if (cancel) {
         if (focus_cycle_target)
@@ -352,10 +357,23 @@ void focus_directional_cycle(ObDirection dir,
         goto done_cycle;
     }
 
+    if (!focus_order[screen_desktop])
+        goto done_cycle;
+
     if (!first) first = focus_client;
     if (!focus_cycle_target) focus_cycle_target = focus_client;
 
-    if ((ft = client_find_directional(focus_cycle_target, dir))) {
+    if (focus_cycle_target)
+        ft = client_find_directional(focus_cycle_target, dir);
+    else {
+        GList *it;
+
+        for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
+            if (valid_focus_target(it->data))
+                ft = it->data;
+    }
+        
+    if (ft) {
         if (ft != focus_cycle_target) {/* prevents flicker */
             if (focus_cycle_target)
                 frame_adjust_focus(focus_cycle_target->frame, FALSE);
@@ -363,9 +381,9 @@ void focus_directional_cycle(ObDirection dir,
             frame_adjust_focus(focus_cycle_target->frame, TRUE);
         }
         popup_cycle(ft, dialog);
+        if (dialog)
+            return;
     }
-    if (dialog)
-        return;
 
 done_cycle:
     if (done && focus_cycle_target)