roll back focus fallback change, so it behaves well with new stacking

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index d917367bed1d3e7e299d3fff102d0ea70a864231..1c95faa046272848b19dd39591cc6b2291cf9191 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -1,40 +1,70 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   focus.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003        Ben 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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #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 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
+*/
+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;
 
-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_CLOSED,     /*!< closed the window with focus */
+    OB_FOCUS_FALLBACK_NOFOCUS     /*!< nothing has focus for some reason */
+} ObFocusFallbackType;
+
+struct _ObClient* focus_fallback_target(ObFocusFallbackType type);
 
 /*! 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 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();
 
 /*! Add a new client into the focus order */
 void focus_order_add_new(struct _ObClient *c);