Merge branch 'backport' into work

[chaz/openbox] / openbox / focus_cycle_popup.h

diff --git a/openbox/focus_cycle_popup.h b/openbox/focus_cycle_popup.h
index 695dfe53ebcae3c1013a43c47da4922706310c90..b085f9a94e1ba3e13072c2d18552ab7e103e14cc 100644 (file)
--- a/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@ -24,12 +24,35 @@ struct _ObClient;
 
 #include <glib.h>
 
+typedef enum {
+    OB_FOCUS_CYCLE_POPUP_MODE_NONE,
+    OB_FOCUS_CYCLE_POPUP_MODE_ICONS,
+    OB_FOCUS_CYCLE_POPUP_MODE_LIST
+} ObFocusCyclePopupMode;
+
 void focus_cycle_popup_startup(gboolean reconfig);
 void focus_cycle_popup_shutdown(gboolean reconfig);
 
-void focus_cycle_popup_show(struct _ObClient *c,
+void focus_cycle_popup_show(struct _ObClient *c, gboolean iconic_windows,
                             gboolean all_desktops, gboolean dock_windows,
-                            gboolean desktop_windows);
-void focus_cycle_popup_hide();
+                            gboolean desktop_windows,
+                            ObFocusCyclePopupMode mode);
+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_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);
 
 #endif