From 99ce340feac8f9d28b4558d380532bb14ebf85d6 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 20 Mar 2011 19:32:00 +0100 Subject: [PATCH] Focus cons when moving to a visible workspace on a different output (Thanks mseed) Fixes: #355 --- src/con.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/con.c b/src/con.c index 8c0a8303..d5029eea 100644 --- a/src/con.c +++ b/src/con.c @@ -527,6 +527,9 @@ void con_move_to_workspace(Con *con, Con *workspace) { con = con->parent; } + Con *source_output = con_get_output(con), + *dest_output = con_get_output(workspace); + /* 1: save the container which is going to be focused after the current * container is moved away */ Con *focus_next = con_next_focused(con); @@ -562,8 +565,15 @@ void con_move_to_workspace(Con *con, Con *workspace) { * calling tree_render(), so for the "real" focus this is a no-op) */ con_focus(con); - /* 8: keep focus on the current workspace */ - con_focus(focus_next); + /* 8: when moving to a visible workspace on a different output, we keep the + * con focused. Otherwise, we leave the focus on the current workspace as we + * don’t want to focus invisible workspaces */ + if (source_output != dest_output && + workspace_is_visible(workspace)) { + DLOG("Moved to a different output, focusing target"); + } else { + con_focus(focus_next); + } CALL(parent, on_remove_child); } -- 2.39.5