X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.h;h=b12caf7be156cbe379c55a9346227c9fe761adff;hb=0745e2ee0aa6b8e7dbab1a4124e60ccb5b4e8441;hp=3ad606820ebe04f9102e75e3da9b6332f555bf2c;hpb=c99bb4a049d29d2546074365ab76cecad4d1f65b;p=chaz%2Fopenbox

diff --git a/openbox/focus.h b/openbox/focus.h
index 3ad60682..b12caf7b 100644
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -1,44 +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;
-/*! 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 {
-    Fallback_Desktop,    /* switching desktops */
-    Fallback_Unfocusing, /* forcefully remove focus from the curernt window */
-    Fallback_NoFocus     /* nothing has focus for some reason */
-} FallbackType;
+    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(FallbackType type);
+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,
-                           gboolean cancel);
+  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