mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 11:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix returning to sway after swaylock completes

Browse source
This commit is contained in:
Drew DeVault 2016-01-26 18:33:50 -05:00
parent a97b325b26
commit f1f4791a3b
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/extensions.c
View file

@ -106,6 +106,7 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou
struct wl_resource *_output, struct wl_resource *surface) { struct wl_resource *_output, struct wl_resource *surface) {
swayc_t *output = swayc_by_handle(wlc_handle_from_wl_output_resource(_output)); swayc_t *output = swayc_by_handle(wlc_handle_from_wl_output_resource(_output));
swayc_t *view = swayc_by_handle(wlc_handle_from_wl_surface_resource(surface)); swayc_t *view = swayc_by_handle(wlc_handle_from_wl_surface_resource(surface));
sway_log(L_DEBUG, "Setting lock surface to %p", view);
if (view && output) { if (view && output) {
swayc_t *workspace = output->focused; swayc_t *workspace = output->focused;
if (!swayc_is_child_of(view, workspace)) { if (!swayc_is_child_of(view, workspace)) {
@ -116,6 +117,8 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou
desktop_shell.is_locked = true; desktop_shell.is_locked = true;
set_focused_container(view); set_focused_container(view);
arrange_windows(view, -1, -1); arrange_windows(view, -1, -1);
list_add(desktop_shell.lock_surfaces, surface);
wl_resource_set_destructor(surface, lock_surface_destructor);
} else { } else {
sway_log(L_ERROR, "Attempted to set lock surface to non-view"); sway_log(L_ERROR, "Attempted to set lock surface to non-view");
} }