mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-01 19:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sway: extensions: make locking give back focus

Browse source 
Don't switch the internal tracking of focus to the swaylock surface,
to allow for switching back to the previously active window (or the
currently active window, if some new process changed).

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This commit is contained in:
Aleksa Sarai 2016-12-26 19:35:12 +11:00
parent 29a535aae4
commit 09259021ab
No known key found for this signature in database
GPG key ID: 4A7BE7BF70DE9B9F
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/extensions.c
View file

@ -69,7 +69,15 @@ void lock_surface_destructor(struct wl_resource *resource) {
} }
} }
if (desktop_shell.lock_surfaces->length == 0) { if (desktop_shell.lock_surfaces->length == 0) {
sway_log(L_DEBUG, "Desktop shell unlocked");
desktop_shell.is_locked = false; desktop_shell.is_locked = false;
// We need to now give focus back to the focus which we internally
// track, since when we lock sway we don't actually change our internal
// focus tracking.
swayc_t *focus = get_focused_container(swayc_active_workspace());
set_focused_container(focus);
wlc_view_focus(focus->handle);
} }
} }
@ -159,10 +167,6 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou
desktop_shell.is_locked = true; desktop_shell.is_locked = true;
input_init(); input_init();
arrange_windows(workspace, -1, -1); arrange_windows(workspace, -1, -1);
swayc_t *focus_output = swayc_active_output();
if (focus_output == output) {
set_focused_container(view);
}
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);
} else { } else {