diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-03 00:07:21 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-03 00:28:02 -0500 |
| commit | 76464a604ee2999b00b806be25722f7fcac1cd9c (patch) | |
| tree | 828f01ecb455a14a1f184121cfe164ef0e94eb6a /openbox/focus_cycle.c | |
| parent | 2924adb9b1addab67983a5276ec6932b7b7933d6 (diff) | |
combine the old focus cycle popup code with mika's new list-mode popup, and make an action option for it (the old <dialog> option)
Diffstat (limited to 'openbox/focus_cycle.c')
| -rw-r--r-- | openbox/focus_cycle.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 2348f8d0..dbf79c9a 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" @@ -70,7 +69,7 @@ void focus_cycle_stop(ObClient *ifclient) 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 ObClient *t = NULL; @@ -131,13 +130,13 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops, focus_cycle_target = ft; 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; |