diff options
| author | Simon Ser <contact@emersion.fr> | 2022-11-26 20:16:42 +0100 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-11-28 13:28:15 -0500 |
| commit | 46170580b2ca7c2d484f9095f1ecd92c0a4ac04f (patch) | |
| tree | 53b4bcf9fe4feb15102c44a4e7b2e7ecf43b23f7 | |
| parent | e795ea6a0c5420fba505de074ad20797a9797d07 (diff) | |
Make session optional
| -rw-r--r-- | include/sway/server.h | 1 | ||||
| -rw-r--r-- | sway/input/keyboard.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 6f29b3f5..309d9d3e 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -3,7 +3,6 @@ #include <stdbool.h> #include <wayland-server-core.h> #include <wlr/backend.h> -#include <wlr/backend/session.h> #include <wlr/render/allocator.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_compositor.h> diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index 0b90b6af..2ac02b22 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -1,8 +1,8 @@ #include <assert.h> #include <limits.h> #include <strings.h> +#include <wlr/config.h> #include <wlr/backend/multi.h> -#include <wlr/backend/session.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_keyboard.h> @@ -16,6 +16,10 @@ #include "sway/ipc-server.h" #include "log.h" +#if WLR_HAS_SESSION +#include <wlr/backend/session.h> +#endif + static struct modifier_key { char *name; uint32_t mod; @@ -264,10 +268,12 @@ static bool keyboard_execute_compositor_binding(struct sway_keyboard *keyboard, xkb_keysym_t keysym = pressed_keysyms[i]; if (keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) { +#if WLR_HAS_SESSION if (server.session) { unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1; wlr_session_change_vt(server.session, vt); } +#endif return true; } } |