X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.h;h=1c8cb1575efec7f64a46ba50a1318a91d9dd7404;hb=775d5da7ade2d184dfcef5c046b8d39f91804f01;hp=e71cd2d7978cf67ed66fe83d4d962e4644c1a11b;hpb=adc5675823de8e3bbe94a1419b04103c6f845dad;p=chaz%2Fopenbox

diff --git a/openbox/focus.h b/openbox/focus.h
index e71cd2d7..1c8cb157 100644
--- 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,19 +29,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 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;
+extern GList *focus_order;
 
 void focus_startup(gboolean reconfig);
 void focus_shutdown(gboolean reconfig);
@@ -50,17 +42,23 @@ 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);
+/*! Focus nothing, but let keyboard events be caught. */
+void focus_nothing();
+
+struct _ObClient* focus_fallback_target(gboolean allow_refocus,
+                                        struct _ObClient *old);
 
 /*! 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(gboolean forward, gboolean all_desktops,
+                 gboolean dock_windows,
+                 gboolean linear, gboolean interactive,
+                 gboolean dialog, gboolean done, gboolean cancel);
+void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
+                             gboolean interactive,
+                             gboolean dialog, gboolean done, gboolean cancel);
 void focus_cycle_draw_indicator();
 
 /*! Add a new client into the focus order */
@@ -76,4 +74,6 @@ void focus_order_to_top(struct _ObClient *c);
   very bottom always though). */
 void focus_order_to_bottom(struct _ObClient *c);
 
+struct _ObClient *focus_order_find_first(guint desktop);
+
 #endif