X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=e4c370e7aa5b5ff0f60c1755cb6fc0906d0c231a;hb=11bb31d3bc712aa31d73065383d32f1510393fe2;hp=4043668344496cc52323bbc01d7f6225bf409200;hpb=14180a6b0dee05e73fd193db28fd94b4ef3046d1;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 40436683..e4c370e7 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -19,7 +19,6 @@
 
 #include "focus_cycle.h"
 #include "focus_cycle_indicator.h"
-#include "focus_cycle_popup.h"
 #include "client.h"
 #include "frame.h"
 #include "focus.h"
@@ -75,10 +74,8 @@ void focus_cycle_addremove(ObClient *c, gboolean redraw)
         v = focus_cycle_valid(c);
         s = focus_cycle_popup_is_showing(c);
 
-        if (v != s) {
-            focus_cycle_target =
-                focus_cycle_popup_refresh(focus_cycle_target, redraw);
-        }
+        if (v != s)
+            focus_cycle_reorder();
     }
     else if (redraw) {
         focus_cycle_reorder();
@@ -100,7 +97,7 @@ void focus_cycle_reorder()
 ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                       gboolean dock_windows, gboolean desktop_windows,
                       gboolean linear, gboolean interactive,
-                      gboolean showbar, gboolean dialog,
+                      gboolean showbar, ObFocusCyclePopupMode mode,
                       gboolean done, gboolean cancel)
 {
     static GList *order = NULL;
@@ -155,13 +152,13 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                     focus_cycle_type = OB_CYCLE_NORMAL;
                     focus_cycle_draw_indicator(showbar ? ft : NULL);
                 }
-                if (dialog)
-                    /* same arguments as focus_target_valid */
-                    focus_cycle_popup_show(ft,
-                                           focus_cycle_iconic_windows,
-                                           focus_cycle_all_desktops,
-                                           focus_cycle_dock_windows,
-                                           focus_cycle_desktop_windows);
+                /* same arguments as focus_target_valid */
+                focus_cycle_popup_show(ft,
+                                       focus_cycle_iconic_windows,
+                                       focus_cycle_all_desktops,
+                                       focus_cycle_dock_windows,
+                                       focus_cycle_desktop_windows,
+                                       mode);
                 return focus_cycle_target;
             } else if (ft != focus_cycle_target) {
                 focus_cycle_target = ft;
@@ -357,7 +354,7 @@ done_cycle:
 
 gboolean focus_cycle_valid(struct _ObClient *client)
 {
-    return focus_valid_target(client, TRUE,
+    return focus_valid_target(client, screen_desktop, TRUE,
                               focus_cycle_iconic_windows,
                               focus_cycle_all_desktops,
                               focus_cycle_dock_windows,