nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed VT switching

Browse Source
This commit is contained in:
Scott Anderson 2017-08-06 13:37:49 +12:00
parent 3373ec5fc8
commit 4d4da18437
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/multi/backend.c
View File

@ -113,3 +113,11 @@ void wlr_multi_backend_add(struct wlr_backend *multi,
list_add(multi->state->backends, sub); list_add(multi->state->backends, sub);
} }
struct wlr_session *wlr_multi_get_session(struct wlr_backend *base) {
if (base->impl != &backend_impl)
return NULL;
struct wlr_backend_state *multi = base->state;
return multi->session;
}

11
examples/shared.c
View File

@ -9,6 +9,7 @@
#include <wayland-server-protocol.h> #include <wayland-server-protocol.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/backend/multi.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_input_device.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
@ -44,8 +45,14 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
} }
if (sym == XKB_KEY_Escape) { if (sym == XKB_KEY_Escape) {
wl_display_terminate(kbstate->compositor->display); wl_display_terminate(kbstate->compositor->display);
} else if (key_state == WLR_KEY_PRESSED && sym >= XKB_KEY_F1 && sym <= XKB_KEY_F12) { } else if (key_state == WLR_KEY_PRESSED &&
wlr_session_change_vt(kbstate->compositor->session, sym - XKB_KEY_F1 + 1); sym >= XKB_KEY_XF86Switch_VT_1 &&
sym <= XKB_KEY_XF86Switch_VT_12) {
struct wlr_session *session =
wlr_multi_get_session(kbstate->compositor->backend);
if (session) {
wlr_session_change_vt(session, sym - XKB_KEY_XF86Switch_VT_1 + 1);
}
} }
} }
xkb_state_update_key(kbstate->xkb_state, keycode, xkb_state_update_key(kbstate->xkb_state, keycode,

2
include/wlr/backend/multi.h
View File

@ -10,4 +10,6 @@ struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session,
void wlr_multi_backend_add(struct wlr_backend *multi, void wlr_multi_backend_add(struct wlr_backend *multi,
struct wlr_backend *backend); struct wlr_backend *backend);
struct wlr_session *wlr_multi_get_session(struct wlr_backend *base);
#endif #endif