X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.h;h=1b1ce066c337930b595fea37951c10c51e5b2bea;hb=fcdcd0fab4141d2d8bc1c156096ac5dbedbeaf61;hp=8a511cf32e3e7b4fccce328ee884bec6bf4f7527;hpb=cbbf90a718ecc6836ef7a77b9040aebb9da348b8;p=chaz%2Fopenbox

diff --git a/openbox/focus.h b/openbox/focus.h
index 8a511cf3..1b1ce066 100644
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -1,33 +1,54 @@
 #ifndef __focus_h
 #define __focus_h
 
+#include "misc.h"
+
 #include <X11/Xlib.h>
 #include <glib.h>
 
-struct Client;
-
-/*! The window which gets focus when nothing else will be focused */
-extern Window focus_backup;
+struct _ObClient;
 
 /*! 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;
-/*! Should focus follow the mouse pointer */
-extern gboolean focus_follow;
-
-void focus_startup();
-void focus_shutdown();
+void focus_startup(gboolean reconfig);
+void focus_shutdown(gboolean reconfig);
 
 /*! 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 _ObClient to which focus has been cycled, or NULL if none. */
+void focus_cycle(gboolean forward, gboolean linear,
+                 gboolean dialog, gboolean done, gboolean cancel);
+void focus_directional_cycle(ObDirection dir,
+                             gboolean dialog, 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