sway

commit 50b9a4e8a6fbe712457cadf71939a1376add9cf6
parent bb67a3d80913a6690f1ebdf4097dc76d812e6a9a
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu, 17 Mar 2016 13:47:58 -0400

Merge pull request #515 from mikkeloscar/focus-correct-swaylock-view

Focus correct swaylock view in multimonitor setup
Diffstat:
M
sway/extensions.c
 | 
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sway/extensions.c b/sway/extensions.c
@@ -129,7 +129,12 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou
 		desktop_shell.is_locked = true;
 		// reset input state
 		input_init();
-		set_focused_container(view);
+		// set focus if the lockscreen is spawned on the currently
+		// active output
+		swayc_t *focus_output = swayc_active_output();
+		if (focus_output == output) {
+			set_focused_container(view);
+		}
 		arrange_windows(workspace, -1, -1);
 		list_add(desktop_shell.lock_surfaces, surface);
 		wl_resource_set_destructor(surface, lock_surface_destructor);