some changes to focus handling.

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index b838ab559722881ca28d78eb53c84f31b45297a7..451cc162950c6e3fe9f6bcd19d0957233288973c 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -45,18 +45,16 @@ void focus_set_client(struct _ObClient *client);
 /*! Focus nothing, but let keyboard events be caught. */
 void focus_nothing();
 
-struct _ObClient* focus_fallback_target(gboolean allow_refocus,
-                                        struct _ObClient *old);
-
 /*! Call this when you need to focus something! */
-void focus_fallback(gboolean allow_refocus);
+struct _ObClient* focus_fallback(gboolean allow_refocus);
 
 /*! Cycle focus amongst windows. */
-void focus_cycle(gboolean forward, gboolean dock_windows,
+void focus_cycle(gboolean forward, gboolean all_desktops,
+                 gboolean dock_windows, gboolean desktop_windows,
                  gboolean linear, gboolean interactive,
                  gboolean dialog, gboolean done, gboolean cancel);
 void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
-                             gboolean interactive,
+                             gboolean desktop_windows, gboolean interactive,
                              gboolean dialog, gboolean done, gboolean cancel);
 void focus_cycle_draw_indicator();