Focus cons when moving to a visible workspace on a different output (Thanks mseed)

Fixes: #355

diff --git a/src/con.c b/src/con.c
index 8c0a8303d497c14a5d7a3f0052a7c620e8740b12..d5029eea2df7eb3936926e6e3bddf43c70c13f43 100644 (file)
--- 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);
 }