diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-03-04 13:47:08 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-03-04 13:47:08 -0500 |
commit | 181b6b31a4e53aeca6f57c2f8b0129eece9d0a5e (patch) | |
tree | b3ffde8de53b1374cd7f4dfb2c68fec31d42d31e /sway | |
parent | Merge pull request #501 from mikkeloscar/ws-on-output (diff) | |
parent | Reset input state when locking compositor (diff) | |
download | sway-181b6b31a4e53aeca6f57c2f8b0129eece9d0a5e.tar.gz sway-181b6b31a4e53aeca6f57c2f8b0129eece9d0a5e.tar.zst sway-181b6b31a4e53aeca6f57c2f8b0129eece9d0a5e.zip |
Merge pull request #502 from mikkeloscar/lock-reset-input
Reset input state when locking compositor
Diffstat (limited to 'sway')
-rw-r--r-- | sway/extensions.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/extensions.c b/sway/extensions.c index bd279276..2d17292a 100644 --- a/sway/extensions.c +++ b/sway/extensions.c | |||
@@ -5,6 +5,7 @@ | |||
5 | #include "wayland-swaylock-server-protocol.h" | 5 | #include "wayland-swaylock-server-protocol.h" |
6 | #include "layout.h" | 6 | #include "layout.h" |
7 | #include "log.h" | 7 | #include "log.h" |
8 | #include "input_state.h" | ||
8 | #include "extensions.h" | 9 | #include "extensions.h" |
9 | 10 | ||
10 | struct desktop_shell_state desktop_shell; | 11 | struct desktop_shell_state desktop_shell; |
@@ -123,6 +124,8 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou | |||
123 | wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true); | 124 | wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true); |
124 | workspace->fullscreen = view; | 125 | workspace->fullscreen = view; |
125 | desktop_shell.is_locked = true; | 126 | desktop_shell.is_locked = true; |
127 | // reset input state | ||
128 | input_init(); | ||
126 | set_focused_container(view); | 129 | set_focused_container(view); |
127 | arrange_windows(workspace, -1, -1); | 130 | arrange_windows(workspace, -1, -1); |
128 | list_add(desktop_shell.lock_surfaces, surface); | 131 | list_add(desktop_shell.lock_surfaces, surface); |