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 934d9a67f139e9309b04c35a1df87f91fa669ca2..8c80bfcf2d75b65024cf63c3b80af4dc6180754e 100644 (file)
--- a/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@ -24,20 +24,21 @@ 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();
+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_hide();
+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);
 
@@ -46,6 +47,7 @@ gboolean focus_cycle_popup_is_showing(struct _ObClient *c);
     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 redraw,
+                                            gboolean linear);
 
 #endif