X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=e30672dce89e5a35a8b69d01c75e230c2f0428b7;hb=33328583a143677d27eb3d081ce66532c3aaca1c;hp=02510c4db5f6bf58c65c89a2dfd8fdbe16e32aba;hpb=0d0ce065df9ff1acc06fe63e4a0fe45c184de693;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 02510c4d..e30672dc 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -62,17 +62,17 @@ void focus_cycle_stop(ObClient *ifclient)
                            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(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE);
+        focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
     }
 }
 
 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;
@@ -96,7 +96,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;
@@ -128,7 +127,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
             if (interactive) {
                 if (ft != focus_cycle_target) { /* prevents flicker */
                     focus_cycle_target = ft;
-                    focus_cycle_draw_indicator(ft);
+                    focus_cycle_draw_indicator(showbar ? ft : NULL);
                 }
                 if (dialog)
                     /* same arguments as focus_target_valid */
@@ -149,7 +148,6 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
 done_cycle:
     if (done && !cancel) ret = focus_cycle_target;
 
-    t = NULL;
     focus_cycle_target = NULL;
     g_list_free(order);
     order = NULL;
@@ -165,7 +163,7 @@ done_cycle:
 /* this be mostly ripped from fvwm */
 static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
                                         gboolean dock_windows,
-                                        gboolean desktop_windows) 
+                                        gboolean desktop_windows)
 {
     gint my_cx, my_cy, his_cx, his_cy;
     gint offset = 0;
@@ -261,7 +259,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;
@@ -302,12 +300,12 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
                                    focus_cycle_desktop_windows))
                 ft = it->data;
     }
-        
+
     if (ft && ft != focus_cycle_target) {/* prevents flicker */
         focus_cycle_target = ft;
         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 */