From 56139f3656a3c4da195fc7189441443e5dd094cf Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 23 Mar 2010 14:43:35 +0100 Subject: [PATCH] Bugfix: only restore focus if the workspace is focused, not if it is visible --- src/handlers.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/handlers.c b/src/handlers.c index c2911942..53a5cf38 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -531,17 +531,12 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */ bool workspace_empty = SLIST_EMPTY(&(client->workspace->focus_stack)); - bool workspace_active = false; + bool workspace_focused = (c_ws == client->workspace); Client *to_focus = (!workspace_empty ? SLIST_FIRST(&(client->workspace->focus_stack)) : NULL); - /* If this workspace is currently active, we don’t delete it */ - Output *screen; - TAILQ_FOREACH(screen, &outputs, outputs) - if (screen->current_workspace == client->workspace) { - workspace_active = true; - workspace_empty = false; - break; - } + /* If this workspace is currently visible, we don’t delete it */ + if (workspace_is_visible(client->workspace)) + workspace_empty = false; if (workspace_empty) { client->workspace->output = NULL; @@ -563,7 +558,7 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti * the screen itself (if we do not focus the screen, it can happen that * the focus is "nowhere" and thus keypress events will not be received * by i3, thus the user cannot use any hotkeys). */ - if (workspace_active) { + if (workspace_focused) { if (to_focus != NULL) set_focus(conn, to_focus, true); else { -- 2.39.5