X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.h;h=b8f899940d72047ea1c5fb9c79f4d0f5a369c0a8;hb=f34b2571b99f40885548fc3ea7c8c5b45ba64335;hp=df48b2260eb21457198dc41af820984b337a4e32;hpb=1d1aef75a0a4ab016243336fce0a69d00623caf8;p=chaz%2Fopenbox

diff --git a/openbox/focus.h b/openbox/focus.h
index df48b226..b8f89994 100644
--- 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;
@@ -45,21 +43,11 @@ 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! */
-struct _ObClient* focus_fallback(gboolean allow_refocus);
-
-/*! Cycle focus amongst 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 desktop_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