Redraw the focus cycle popup when the list of focusable windows changes, rather than...

[chaz/openbox] / openbox / focus_cycle.c

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 85cdf4808b7067e66716c825d3b531b9f9bd7d37..07cc2e83d4e5a8cf1b0fc9d65df9f9bc6ceecc1a 100644 (file)
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -31,6 +31,7 @@
 #include <glib.h>
 
 ObClient       *focus_cycle_target = NULL;
+static gboolean focus_cycle_directional = FALSE;
 static gboolean focus_cycle_iconic_windows;
 static gboolean focus_cycle_all_desktops;
 static gboolean focus_cycle_dock_windows;
@@ -51,28 +52,72 @@ void focus_cycle_shutdown(gboolean reconfig)
     if (reconfig) return;
 }
 
-void focus_cycle_stop(ObClient *ifclient)
+void focus_cycle_add(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,
+    if (!(focus_cycle_target && ifclient && !focus_cycle_directional))
+        return;
+
+    if (focus_valid_target(ifclient, TRUE,
                            focus_cycle_iconic_windows,
                            focus_cycle_all_desktops,
                            focus_cycle_dock_windows,
-                           focus_cycle_desktop_windows))
-    {
-        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
-        focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+                           focus_cycle_desktop_windows,
+                           FALSE))
+        focus_cycle_popup_refresh(focus_cycle_target,
+                                  focus_cycle_iconic_windows,
+                                  focus_cycle_all_desktops,
+                                  focus_cycle_dock_windows,
+                                  focus_cycle_desktop_windows); 
+}
+
+void focus_cycle_remove(ObClient *ifclient)
+{
+    if (!(focus_cycle_target && ifclient))
+        return;
+
+    if (focus_cycle_directional) {
+        if (focus_cycle_target == ifclient) {
+            focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE,
+                                    TRUE, TRUE, TRUE);
+        }
+    }
+    else {
+        if (!focus_valid_target(ifclient, TRUE,
+                                focus_cycle_iconic_windows,
+                                focus_cycle_all_desktops,
+                                focus_cycle_dock_windows,
+                                focus_cycle_desktop_windows,
+                                FALSE)) {
+            if (focus_cycle_target == ifclient) {
+                focus_cycle_target =
+                    focus_cycle_popup_revert(focus_cycle_target);
+                focus_cycle_update_indicator(focus_cycle_target);
+            }
+            focus_cycle_popup_refresh(focus_cycle_target,
+                                      focus_cycle_iconic_windows,
+                                      focus_cycle_all_desktops,
+                                      focus_cycle_dock_windows,
+                                      focus_cycle_desktop_windows); 
+        }
     }
 }
 
+void focus_cycle_reorder()
+{
+    if (focus_cycle_target && !focus_cycle_directional)
+        focus_cycle_popup_refresh(focus_cycle_target,
+                                  focus_cycle_iconic_windows,
+                                  focus_cycle_all_desktops,
+                                  focus_cycle_dock_windows,
+                                  focus_cycle_desktop_windows); 
+}
+
 ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                       gboolean dock_windows, gboolean desktop_windows,
                       gboolean linear, gboolean interactive,
-                      gboolean dialog, gboolean done, gboolean cancel)
+                      gboolean showbar, gboolean dialog,
+                      gboolean done, gboolean cancel)
 {
-    static ObClient *t = NULL;
     static GList *order = NULL;
     GList *it, *start, *list;
     ObClient *ft = NULL;
@@ -81,6 +126,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
     if (interactive) {
         if (cancel) {
             focus_cycle_target = NULL;
+            focus_cycle_directional = FALSE;
             goto done_cycle;
         } else if (done)
             goto done_cycle;
@@ -96,7 +142,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;
@@ -123,12 +168,14 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                                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 */
                     focus_cycle_target = ft;
-                    focus_cycle_draw_indicator(ft);
+                    focus_cycle_directional = FALSE;
+                    focus_cycle_draw_indicator(showbar ? ft : NULL);
                 }
                 if (dialog)
                     /* same arguments as focus_target_valid */
@@ -140,6 +187,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                 return focus_cycle_target;
             } else if (ft != focus_cycle_target) {
                 focus_cycle_target = ft;
+                focus_cycle_directional = FALSE;
                 done = TRUE;
                 break;
             }
@@ -149,8 +197,8 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
 done_cycle:
     if (done && !cancel) ret = focus_cycle_target;
 
-    t = NULL;
     focus_cycle_target = NULL;
+    focus_cycle_directional = FALSE;
     g_list_free(order);
     order = NULL;
 
@@ -191,7 +239,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
         if (cur == c)
             continue;
         if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows,
-                                desktop_windows))
+                                desktop_windows, FALSE))
             continue;
 
         /* find the centre coords of this window, from the
@@ -261,7 +309,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
 ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
                                   gboolean desktop_windows,
                                   gboolean interactive,
-                                  gboolean dialog,
+                                  gboolean showbar, gboolean dialog,
                                   gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
@@ -270,6 +318,7 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
 
     if (cancel) {
         focus_cycle_target = NULL;
+        focus_cycle_directional = FALSE;
         goto done_cycle;
     } else if (done && interactive)
         goto done_cycle;
@@ -299,15 +348,16 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
                                    focus_cycle_iconic_windows,
                                    focus_cycle_all_desktops,
                                    focus_cycle_dock_windows,
-                                   focus_cycle_desktop_windows))
+                                   focus_cycle_desktop_windows, FALSE))
                 ft = it->data;
     }
 
     if (ft && ft != focus_cycle_target) {/* prevents flicker */
         focus_cycle_target = ft;
+        focus_cycle_directional = TRUE;
         if (!interactive)
             goto done_cycle;
-        focus_cycle_draw_indicator(ft);
+        focus_cycle_draw_indicator(showbar ? ft : NULL);
     }
     if (focus_cycle_target && dialog)
         /* same arguments as focus_target_valid */
@@ -323,6 +373,7 @@ done_cycle:
 
     first = NULL;
     focus_cycle_target = NULL;
+    focus_cycle_directional = FALSE;
 
     focus_cycle_draw_indicator(NULL);
     focus_cycle_popup_single_hide();