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

Focus correct swaylock view in multimonitor setup
This commit is contained in:
Drew DeVault 2016-03-17 13:47:58 -04:00
commit 50b9a4e8a6

View file

@ -129,7 +129,12 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou
desktop_shell.is_locked = true; desktop_shell.is_locked = true;
// reset input state // reset input state
input_init(); 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); arrange_windows(workspace, -1, -1);
list_add(desktop_shell.lock_surfaces, surface); list_add(desktop_shell.lock_surfaces, surface);
wl_resource_set_destructor(surface, lock_surface_destructor); wl_resource_set_destructor(surface, lock_surface_destructor);