Merge branch 'master' into next

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index c901c18d6be0de78d6bbc85a5224dcf84e74f024..ded8d7bf0596859aedc47f872c634d552267a31d 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -657,8 +657,10 @@ void con_move_to_workspace(Con *con, Con *workspace, bool fix_coordinates, bool
 
     /* 7: focus the con on the target workspace (the X focus is only updated by
      * calling tree_render(), so for the "real" focus this is a no-op).
-     * We don’t focus when there is a fullscreen con on that workspace. */
-    if (con_get_fullscreen_con(workspace, CF_OUTPUT) == NULL)
+     * We don’t focus the con for i3 pseudo workspaces like __i3_scratch and
+     * we don’t focus when there is a fullscreen con on that workspace. */
+    if ((workspace->name[0] != '_' || workspace->name[1] != '_') &&
+        con_get_fullscreen_con(workspace, CF_OUTPUT) == NULL)
         con_focus(con_descend_focused(con));
 
     /* 8: when moving to a visible workspace on a different output, we keep the