Merge branch 'master' into chaz

[chaz/openbox] / openbox / focus_cycle.h

diff --git a/openbox/focus_cycle.h b/openbox/focus_cycle.h
index ab477d65bb80f34520fa960c7e5531351787fa75..8acb53d9bee6ab45424c5f29959a48aead5f0429 100644 (file)
--- a/openbox/focus_cycle.h
+++ b/openbox/focus_cycle.h
@@ -36,9 +36,10 @@ void focus_cycle_shutdown(gboolean reconfig);
 
 /*! Cycle focus amongst windows. */
 struct _ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
+                              gboolean nonhilite_windows,
                               gboolean dock_windows, gboolean desktop_windows,
-                              gboolean linear, gboolean interactive,
-                              gboolean showbar, ObFocusCyclePopupMode mode,
+                              gboolean linear, gboolean showbar,
+                              ObFocusCyclePopupMode mode,
                               gboolean done, gboolean cancel);
 struct _ObClient* focus_directional_cycle(ObDirection dir,
                                           gboolean dock_windows,