X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.h;h=d7f0183e901e6db88fb9ee96518ad5ecbe1f8064;hb=4eb80a81cf99fe6fc14521a3503bb4fd482fc1da;hp=6a86965a69e762a29970d0ed935a97d4f877a424;hpb=083f2f5d5d3b5295b824a23b39fcef648b117ef7;p=chaz%2Fopenbox

diff --git a/openbox/focus.h b/openbox/focus.h
index 6a86965a..d7f0183e 100644
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -15,11 +15,6 @@ extern struct Client *focus_client;
 /*! The recent focus order on each desktop */
 extern GList **focus_order;
 
-/*! Should new windows be focused */
-extern gboolean focus_new;
-/*! Focus windows when the mouse enters them */
-extern gboolean focus_follow;
-
 void focus_startup();
 void focus_shutdown();
 
@@ -27,11 +22,18 @@ void focus_shutdown();
   send focus anywhere, its called by the Focus event handlers */
 void focus_set_client(struct Client *client);
 
+typedef enum {
+    Fallback_Desktop,    /* switching desktops */
+    Fallback_Unfocusing, /* forcefully remove focus from the curernt window */
+    Fallback_NoFocus     /* nothing has focus for some reason */
+} FallbackType;
+
 /*! Call this when you need to focus something! */
-void focus_fallback(gboolean switching_desks);
+void focus_fallback(FallbackType type);
 
-/*! Cycle focus amongst windows */
-void focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                 gboolean cancel);
+/*! Cycle focus amongst windows
+  Returns the Client to which focus has been cycled, or NULL if none. */
+struct Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
+                           gboolean cancel);
 
 #endif