diff options
Diffstat (limited to 'openbox/focus_cycle.c')
| -rw-r--r-- | openbox/focus_cycle.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index da9cd4cc..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" @@ -98,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; @@ -153,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; @@ -355,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, |