Merge branch 'master' into chaz

[chaz/openbox] / openbox / focus_cycle_popup.h

diff --git a/openbox/focus_cycle_popup.h b/openbox/focus_cycle_popup.h
index c289be36b35d683acb018b4eb0c847eaa01387e6..8c80bfcf2d75b65024cf63c3b80af4dc6180754e 100644 (file)
--- a/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@ -33,17 +33,21 @@ typedef enum {
 void focus_cycle_popup_startup(gboolean reconfig);
 void focus_cycle_popup_shutdown(gboolean reconfig);
 
-void focus_cycle_popup_show(struct _ObClient *c, gboolean iconic_windows,
-                            gboolean all_desktops, gboolean dock_windows,
-                            gboolean desktop_windows,
-                            ObFocusCyclePopupMode mode);
+void focus_cycle_popup_show(struct _ObClient *c, ObFocusCyclePopupMode mode,
+                            gboolean linear);
 void focus_cycle_popup_hide(void);
 
-void focus_cycle_popup_single_show(struct _ObClient *c,
-                                   gboolean iconic_windows,
-                                   gboolean all_desktops,
-                                   gboolean dock_windows,
-                                   gboolean desktop_windows);
+void focus_cycle_popup_single_show(struct _ObClient *c);
 void focus_cycle_popup_single_hide(void);
 
+gboolean focus_cycle_popup_is_showing(struct _ObClient *c);
+
+/*! Redraws the focus cycle popup, and returns the current target.  If
+    the target given to the function is no longer valid, this will return
+    a different target that is valid, and which should be considered the
+    current focus cycling target. */
+struct _ObClient *focus_cycle_popup_refresh(struct _ObClient *target,
+                                            gboolean redraw,
+                                            gboolean linear);
+
 #endif