diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/focus.c | 11 | ||||
| -rw-r--r-- | openbox/focus.h | 3 | ||||
| -rw-r--r-- | openbox/screen.c | 2 |
3 files changed, 9 insertions, 7 deletions
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); } diff --git a/openbox/focus.h b/openbox/focus.h index e71cd2d7..200d96a5 100644 --- a/openbox/focus.h +++ b/openbox/focus.h @@ -50,7 +50,8 @@ 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* focus_fallback_target(gboolean allow_refocus, + struct _ObClient *old); /*! Call this when you need to focus something! */ void focus_fallback(gboolean allow_refocus); diff --git a/openbox/screen.c b/openbox/screen.c index 0d4f2fb3..70de299d 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -463,7 +463,7 @@ void screen_set_desktop(guint num) event_ignore_queued_enters(); - focus_hilite = focus_fallback_target(TRUE); + focus_hilite = focus_fallback_target(TRUE, focus_client); if (focus_hilite) { frame_adjust_focus(focus_hilite->frame, TRUE); |