add helper functions for manipulating the focus_order list.

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index 19e3b363c83727110e25f5220302e1b894139815..ed94fe7885da0d7b3510387cdbf9df096c683017 100644 (file)
--- 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;
-/*! Should focus follow the mouse pointer */
-extern gboolean focus_follow;
-
 void focus_startup();
 void focus_shutdown();
 
@@ -27,11 +22,31 @@ 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 current 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
+  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);
+
+/*! Add a new client into the focus order */
+void focus_order_add_new(struct Client *c);
+
+/*! Remove a client from the focus order */
+void focus_order_remove(struct Client *c);
+
+/*! Move a client to the top of the focus order */
+void focus_order_to_top(struct Client *c);
 
-/*! Cycle focus amongst windows */
-void focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                 gboolean cancel);
+/*! Move a client to the bottom of the focus order (keeps iconic windows at the
+  very bottom always though). */
+void focus_order_to_bottom(struct Client *c);
 
 #endif