remove focusLast and focusLastOnDesktop

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index cfaba39b78e1457d08b7e7d2bd10b402f027efe9..6a99cf6a2d5af162fe3aa91fdfc229bc890b5ad7 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -1,6 +1,8 @@
 #ifndef __focus_h
 #define __focus_h
 
+#include "misc.h"
+
 #include <X11/Xlib.h>
 #include <glib.h>
 
@@ -8,19 +10,20 @@ struct _ObClient;
 
 /*! 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 {
-    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 */
@@ -29,10 +32,11 @@ typedef enum {
 /*! Call this when you need to focus something! */
 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 dialog, 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);