X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=85cdf4808b7067e66716c825d3b531b9f9bd7d37;hb=2543dbbff86b76dd64e0f0e2765fad12de93fa08;hp=22398851ddfab0995e5b19d2df4cfc540e253478;hpb=29c4cf4a15bc5fa97ba746b03a5e334f989c645e;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 22398851..85cdf480 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -56,7 +56,7 @@ 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, + focus_valid_target(ifclient, TRUE, focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, @@ -119,7 +119,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops, if (it == NULL) it = g_list_last(list); } ft = it->data; - if (focus_valid_target(ft, + if (focus_valid_target(ft, TRUE, focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, @@ -137,7 +137,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); - return NULL; + return focus_cycle_target; } else if (ft != focus_cycle_target) { focus_cycle_target = ft; done = TRUE; @@ -165,7 +165,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; @@ -190,7 +190,7 @@ 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, FALSE, FALSE, dock_windows, + if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows, desktop_windows)) continue; @@ -295,14 +295,14 @@ 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, + if (focus_valid_target(it->data, TRUE, focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows)) ft = it->data; } - + if (ft && ft != focus_cycle_target) {/* prevents flicker */ focus_cycle_target = ft; if (!interactive) @@ -316,7 +316,7 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); - return NULL; + return focus_cycle_target; done_cycle: if (done && !cancel) ret = focus_cycle_target;