X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.h;h=6a99cf6a2d5af162fe3aa91fdfc229bc890b5ad7;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=d917367bed1d3e7e299d3fff102d0ea70a864231;hpb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;p=chaz%2Fopenbox

diff --git a/openbox/focus.h b/openbox/focus.h
index d917367b..6a99cf6a 100644
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -1,40 +1,42 @@
 #ifndef __focus_h
 #define __focus_h
 
+#include "misc.h"
+
 #include <X11/Xlib.h>
 #include <glib.h>
 
 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 _ObClient *focus_client;
+/*! The client which appears focused during a focus cycle operation */
+extern struct _ObClient *focus_cycle_target;
 
 /*! The recent focus order on each desktop */
 extern GList **focus_order;
 
-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 _ObClient *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;
+    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 _ObClient to which focus has been cycled, or NULL if none. */
-struct _ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                           gboolean cancel);
+/*! Cycle focus amongst windows. */
+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);