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 19279a62d43f2232661cd4a7ab896139648ecb5b..ad76491d52d68e99ce12e43d178cbd26d9ffee60 100644 (file)
--- a/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@ -24,20 +24,27 @@ 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, 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 focus_cycle_popup_single_hide(void);
 
 /*! Returns TRUE if the popup is showing the client, otherwise FALSE. */
 gboolean focus_cycle_popup_is_showing(struct _ObClient *client);