save the focus_client when falling back, so we don't actually refocus it when we...

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index 1c95faa046272848b19dd39591cc6b2291cf9191..200d96a57043c3bd2aca6355d7d0a3d81040923a 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -30,7 +30,11 @@ struct _ObClient;
 /*! The client which is currently focused */
 extern struct _ObClient *focus_client;
 /*! The client which is being decorated as focused, not always matching the
-  real focus, but this is used to track it so that it can be ersolved to match
+  real focus, but this is used to track it so that it can be resolved to match.
+
+  This is for when you change desktops. We know which window is *going to be*
+  focused, so we hilight it. But since it's hilighted, we also want
+  keybindings to go to it, which is really what this is for.
 */
 extern struct _ObClient *focus_hilite;
 /*! The client which appears focused during a focus cycle operation */
@@ -46,17 +50,11 @@ void focus_shutdown(gboolean reconfig);
   send focus anywhere, its called by the Focus event handlers */
 void focus_set_client(struct _ObClient *client);
 
-typedef enum {
-    OB_FOCUS_FALLBACK_UNFOCUSING, /*!< forcefully remove focus from the
-                                    current window */
-    OB_FOCUS_FALLBACK_CLOSED,     /*!< closed the window with focus */
-    OB_FOCUS_FALLBACK_NOFOCUS     /*!< nothing has focus for some reason */
-} ObFocusFallbackType;
-
-struct _ObClient* focus_fallback_target(ObFocusFallbackType type);
+struct _ObClient* focus_fallback_target(gboolean allow_refocus,
+                                        struct _ObClient *old);
 
 /*! Call this when you need to focus something! */
-void focus_fallback(ObFocusFallbackType type);
+void focus_fallback(gboolean allow_refocus);
 
 /*! Cycle focus amongst windows. */
 void focus_cycle(gboolean forward, gboolean linear, gboolean interactive,