prefix and capitalize the ObFocusFallbackType enum

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index 4c8d4c98862d589cad55aea1954f22f228e3681d..a7f70a0e11b761041df3d4d59b9c1ed3b5d49c2a 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -4,35 +4,50 @@
 #include <X11/Xlib.h>
 #include <glib.h>
 
-struct Client;
+struct _ObClient;
 
 /*! The window which gets focus when nothing else will be focused */
 extern Window focus_backup;
 
 /*! The client which is currently focused */
-extern struct Client *focus_client;
+extern struct _ObClient *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();
 
 /*! Specify which client is currently focused, this doesn't actually
   send focus anywhere, its called by the Focus event handlers */
-void focus_set_client(struct Client *client);
+void focus_set_client(struct _ObClient *client);
+
+typedef enum {
+    OB_FOCUS_FALLBACK_DESKTOP,    /*!< switching desktops */
+    OB_FOCUS_FALLBACK_UNFOCUSING, /*!< forcefully remove focus from the
+                                    current window */
+    OB_FOCUS_FALLBACK_NOFOCUS     /*!< nothing has focus for some reason */
+} ObFocusFallbackType;
 
 /*! Call this when you need to focus something! */
-void focus_fallback(gboolean switching_desks);
+void focus_fallback(ObFocusFallbackType 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,
+  Returns the _ObClient to which focus has been cycled, or NULL if none. */
+struct _ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
                            gboolean cancel);
 
+/*! Add a new client into the focus order */
+void focus_order_add_new(struct _ObClient *c);
+
+/*! Remove a client from the focus order */
+void focus_order_remove(struct _ObClient *c);
+
+/*! Move a client to the top of the focus order */
+void focus_order_to_top(struct _ObClient *c);
+
+/*! 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 _ObClient *c);
+
 #endif