diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-26 21:22:28 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-26 21:22:28 +0000 |
| commit | aa7c36d1bc78529feafb65c2fd6e251a86043d81 (patch) | |
| tree | 844ad79cd46160e41871965f0480745a5ee7c278 /openbox/focus_cycle.c | |
| parent | 11c4ce4903f9ac31bae3b68209f47cb1a058afb4 (diff) | |
only kill focus cycling when the window being destroyed was in the list of targets
Diffstat (limited to 'openbox/focus_cycle.c')
| -rw-r--r-- | openbox/focus_cycle.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 4ff098d7..46f5f058 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -32,6 +32,7 @@ #include <glib.h> ObClient *focus_cycle_target = NULL; +static gboolean focus_cycle_iconic_windows; static gboolean focus_cycle_all_desktops; static gboolean focus_cycle_dock_windows; static gboolean focus_cycle_desktop_windows; @@ -58,9 +59,17 @@ void focus_cycle_shutdown(gboolean reconfig) if (reconfig) return; } -void focus_cycle_stop() +void focus_cycle_stop(ObClient *ifclient) { - if (focus_cycle_target) { + /* 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_cycle_target_valid(ifclient, + 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); } @@ -179,7 +188,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops, if (focus_cycle_target == NULL) { - focus_cycle_all_desktops = FALSE; + focus_cycle_iconic_windows = TRUE; + focus_cycle_all_desktops = all_desktops; focus_cycle_dock_windows = dock_windows; focus_cycle_desktop_windows = desktop_windows; focus_cycle_target = focus_client; @@ -199,7 +209,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops, if (it == NULL) it = g_list_last(list); } ft = it->data; - if (focus_cycle_target_valid(ft, TRUE, + if (focus_cycle_target_valid(ft, + focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows)) @@ -211,7 +222,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops, } if (dialog) /* same arguments as focus_target_valid */ - focus_cycle_popup_show(ft, TRUE, + focus_cycle_popup_show(ft, + focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); @@ -356,6 +368,7 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, goto done_cycle; if (focus_cycle_target == NULL) { + focus_cycle_iconic_windows = FALSE; focus_cycle_all_desktops = FALSE; focus_cycle_dock_windows = dock_windows; focus_cycle_desktop_windows = desktop_windows; @@ -371,7 +384,9 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, GList *it; for (it = focus_order; it; it = g_list_next(it)) - if (focus_cycle_target_valid(it->data, FALSE, FALSE, + if (focus_cycle_target_valid(it->data, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows)) ft = it->data; @@ -386,7 +401,8 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, if (focus_cycle_target && dialog) { /* same arguments as focus_target_valid */ focus_cycle_popup_single_show(focus_cycle_target, - FALSE, FALSE, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); return; |