make focuslast only apply to switching desktops, like 3.3.1

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index e1d6a6c4e1f4e6c9fca970635cd90f4c6465aadf..be7a042d16ee5171562e82fab0744e03899e6531 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -2,7 +2,7 @@
 
    focus.h for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,16 +29,6 @@ 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 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 */
-extern struct _ObClient *focus_cycle_target;
 
 /*! The recent focus order on each desktop */
 extern GList *focus_order;
@@ -50,19 +40,12 @@ void focus_shutdown(gboolean reconfig);
   send focus anywhere, its called by the Focus event handlers */
 void focus_set_client(struct _ObClient *client);
 
-struct _ObClient* focus_fallback_target(gboolean allow_refocus,
-                                        struct _ObClient *old);
+/*! Focus nothing, but let keyboard events be caught. */
+void focus_nothing();
 
 /*! Call this when you need to focus something! */
-void focus_fallback(gboolean allow_refocus);
-
-/*! Cycle focus amongst windows. */
-void focus_cycle(gboolean forward, gboolean linear, gboolean interactive,
-                 gboolean dialog, gboolean done, gboolean cancel, Time time);
-void focus_directional_cycle(ObDirection dir, gboolean interactive,
-                             gboolean dialog, gboolean done, gboolean cancel,
-                             Time time);
-void focus_cycle_draw_indicator();
+struct _ObClient* focus_fallback(gboolean allow_refocus,
+                                 gboolean allow_pointer);
 
 /*! Add a new client into the focus order */
 void focus_order_add_new(struct _ObClient *c);