diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-04 17:36:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 17:36:39 +0200 |
commit | 841d04db994b0a05d7688a0ecaa9b2e29131f026 (patch) | |
tree | 71d1e442666f05fd0312acd672383c6440c63ff0 /rootston | |
parent | 0d23fb7b6dc79b82301f3c049e05d1556a187b0f (diff) | |
parent | b4d46aa9c255ccb6f121b3657f6910c29e02d704 (diff) |
Merge pull request #1262 from nyorain/session_fix
Improve session handling
Diffstat (limited to 'rootston')
-rw-r--r-- | rootston/keyboard.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 6ba0bd6d..66c373cf 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -5,7 +5,6 @@ #include <sys/wait.h> #include <unistd.h> #include <wayland-server.h> -#include <wlr/backend/multi.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_pointer_constraints_v1.h> @@ -201,14 +200,13 @@ static bool keyboard_execute_compositor_binding(struct roots_keyboard *keyboard, if (keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) { struct roots_server *server = keyboard->input->server; - if (wlr_backend_is_multi(server->backend)) { - struct wlr_session *session = - wlr_multi_get_session(server->backend); - if (session) { - unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1; - wlr_session_change_vt(session, vt); - } + + struct wlr_session *session = wlr_backend_get_session(server->backend); + if (session) { + unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1; + wlr_session_change_vt(session, vt); } + return true; } |