Merge branch 'backport' into work

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index be63433868bbb0572f36fb6041a2e980ff51478f..4f37b7281fce234a4850b0967a9f2efa4f1b14dc 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -29,8 +29,6 @@ struct _ObClient;
 
 /*! The client which is currently focused */
 extern struct _ObClient *focus_client;
-/*! The client which appears focused during a focus cycle operation */
-extern struct _ObClient *focus_cycle_target;
 
 /*! The recent focus order on each desktop */
 extern GList *focus_order;
@@ -43,23 +41,13 @@ void focus_shutdown(gboolean reconfig);
 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);
+void focus_nothing(void);
 
 /*! Call this when you need to focus something! */
-struct _ObClient* focus_fallback(gboolean allow_refocus);
-
-/*! Cycle focus amongst windows. */
-void focus_cycle(gboolean forward, gboolean all_desktops,
-                 gboolean dock_windows,
-                 gboolean linear, gboolean interactive,
-                 gboolean dialog, gboolean done, gboolean cancel);
-void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
-                             gboolean interactive,
-                             gboolean dialog, gboolean done, gboolean cancel);
-void focus_cycle_draw_indicator();
+struct _ObClient* focus_fallback(gboolean allow_refocus,
+                                 gboolean allow_pointer,
+                                 gboolean allow_omnipresent,
+                                 gboolean focus_lost);
 
 /*! Add a new client into the focus order */
 void focus_order_add_new(struct _ObClient *c);
@@ -76,4 +64,11 @@ void focus_order_to_bottom(struct _ObClient *c);
 
 struct _ObClient *focus_order_find_first(guint desktop);
 
+gboolean focus_valid_target(struct _ObClient *ft,
+                            gboolean helper_windows,
+                            gboolean iconic_windows,
+                            gboolean all_desktops,
+                            gboolean dock_windows,
+                            gboolean desktop_windows);
+
 #endif