X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=4e04477bcc79f8e71e4692fc00ec4c8ef2078080;hb=0352abfa88892bc17bdff2022745e3c1b312edd0;hp=4d79377735928a6c9f1976860939c44975d3766a;hpb=435df32acc55a3bc4cc8f9ba954ae21b65c7c69d;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 4d793777..4e04477b 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -54,12 +54,10 @@ void focus_cycle_stop(ObClient *ifclient)
 {
     /* stop focus cycling if the given client is a valid focus target,
        and so the cycling is being disrupted */
-    if (focus_cycle_target && ifclient &&
-        focus_valid_target(ifclient, TRUE,
-                           focus_cycle_iconic_windows,
-                           focus_cycle_all_desktops,
-                           focus_cycle_dock_windows,
-                           focus_cycle_desktop_windows))
+    if (focus_cycle_target &&
+        ((ifclient && (ifclient == focus_cycle_target ||
+                       focus_cycle_popup_is_showing(ifclient))) ||
+         !ifclient))
     {
         focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE);
         focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
@@ -95,7 +93,6 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
         list = client_list;
     }
 
-
     if (focus_cycle_target == NULL) {
         focus_cycle_iconic_windows = TRUE;
         focus_cycle_all_desktops = all_desktops;
@@ -118,11 +115,12 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
             if (it == NULL) it = g_list_last(list);
         }
         ft = it->data;
-        if (focus_valid_target(ft, TRUE,
+        if (focus_valid_target(ft, screen_desktop, TRUE,
                                focus_cycle_iconic_windows,
                                focus_cycle_all_desktops,
                                focus_cycle_dock_windows,
-                               focus_cycle_desktop_windows))
+                               focus_cycle_desktop_windows,
+                               FALSE))
         {
             if (interactive) {
                 if (ft != focus_cycle_target) { /* prevents flicker */
@@ -188,8 +186,9 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
         /* the currently selected window isn't interesting */
         if (cur == c)
             continue;
-        if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows,
-                                desktop_windows))
+        if (!focus_valid_target(it->data, screen_desktop,
+                                TRUE, FALSE, FALSE, dock_windows,
+                                desktop_windows, FALSE))
             continue;
 
         /* find the centre coords of this window, from the
@@ -293,11 +292,11 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
         GList *it;
 
         for (it = focus_order; it; it = g_list_next(it))
-            if (focus_valid_target(it->data, TRUE,
+            if (focus_valid_target(it->data, screen_desktop, TRUE,
                                    focus_cycle_iconic_windows,
                                    focus_cycle_all_desktops,
                                    focus_cycle_dock_windows,
-                                   focus_cycle_desktop_windows))
+                                   focus_cycle_desktop_windows, FALSE))
                 ft = it->data;
     }