From a9175a8a324deb6d1b7e717fb77fbc96204c7540 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 14 Mar 2007 15:56:59 +0000 Subject: save the focus_client when falling back, so we don't actually refocus it when we don't want to. --- openbox/focus.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'openbox/focus.c') diff --git a/openbox/focus.c b/openbox/focus.c index 3fba876b..d18b3a1f 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -248,14 +248,11 @@ static ObClient* focus_fallback_transient(ObClient *top, ObClient *old) return NULL; } -ObClient* focus_fallback_target(gboolean allow_refocus) +ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old) { GList *it; - ObClient *old; ObClient *target = NULL; - old = focus_client; - if (!allow_refocus && old && old->transient_for) { gboolean trans = FALSE; @@ -344,6 +341,10 @@ ObClient* focus_fallback_target(gboolean allow_refocus) void focus_fallback(gboolean allow_refocus) { ObClient *new; + ObClient *old; + + /* save this before moving focus away to nothing */ + old = focus_client; /* unfocus any focused clients.. they can be focused by Pointer events and such, and then when I try focus them, I won't get a FocusIn event @@ -351,7 +352,7 @@ void focus_fallback(gboolean allow_refocus) */ focus_set_client(NULL); - if ((new = focus_fallback_target(allow_refocus))) + if ((new = focus_fallback_target(allow_refocus, old))) client_focus(new); } -- cgit v1.2.3