aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Ronan Pigott <ronan@rjp.ie>2022-12-14 19:12:36 -0700
committerLibravatar Simon Ser <contact@emersion.fr>2023-01-11 11:32:09 +0100
commit2f2cdd60def006f6d3cbe318f9edd7d68fcb239a (patch)
treea6f980693918ff12a9c7b1c97b481473c3ad9360
parentImprove tablet tool button handling. (diff)
downloadsway-2f2cdd60def006f6d3cbe318f9edd7d68fcb239a.tar.gz
sway-2f2cdd60def006f6d3cbe318f9edd7d68fcb239a.tar.zst
sway-2f2cdd60def006f6d3cbe318f9edd7d68fcb239a.zip
input: enable user xkb configs with cap_sys_nice
-rw-r--r--meson.build2
-rw-r--r--sway/config.c2
-rw-r--r--sway/input/keyboard.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index fa008332..84e7c6c5 100644
--- a/meson.build
+++ b/meson.build
@@ -68,7 +68,7 @@ wayland_server = dependency('wayland-server', version: '>=1.21.0')
68wayland_client = dependency('wayland-client') 68wayland_client = dependency('wayland-client')
69wayland_cursor = dependency('wayland-cursor') 69wayland_cursor = dependency('wayland-cursor')
70wayland_protos = dependency('wayland-protocols', version: '>=1.24') 70wayland_protos = dependency('wayland-protocols', version: '>=1.24')
71xkbcommon = dependency('xkbcommon') 71xkbcommon = dependency('xkbcommon', version: '>=1.5.0')
72cairo = dependency('cairo') 72cairo = dependency('cairo')
73pango = dependency('pango') 73pango = dependency('pango')
74pangocairo = dependency('pangocairo') 74pangocairo = dependency('pangocairo')
diff --git a/sway/config.c b/sway/config.c
index 1f2bb686..f5efa98a 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
37 37
38static struct xkb_state *keysym_translation_state_create( 38static struct xkb_state *keysym_translation_state_create(
39 struct xkb_rule_names rules) { 39 struct xkb_rule_names rules) {
40 struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); 40 struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
41 struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names( 41 struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
42 context, 42 context,
43 &rules, 43 &rules,
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 3f4a7289..45a588ec 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
754 754
755struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic, 755struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
756 char **error) { 756 char **error) {
757 struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); 757 struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
758 if (!sway_assert(context, "cannot create XKB context")) { 758 if (!sway_assert(context, "cannot create XKB context")) {
759 return NULL; 759 return NULL;
760 } 760 }