aboutsummaryrefslogtreecommitdiff
path: root/tinywl
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-04-16 09:05:39 +0200
committerSimon Ser <contact@emersion.fr>2021-04-19 17:33:28 +0200
commitfbc2182b9fbe9437181caf23a8cb0b9ada90800f (patch)
treef908eebdb93716b47854be4e65d52f706293dc2d /tinywl
parent83670fce65edc76127bf9595a2f993eaa80a3d59 (diff)
Stop specifying xkb_rule_names
If a NULL xkb_rule_names pointer is passed to xkb_keymap_new_from_names, libxkbcommon will default to reading the XKB_* env variables. So there's no need to do it ourselves. Also s/xkb_map_new_from_names/xkb_keymap_new_from_names/ since the latter is more consistent with the returned struct name. [1]: https://xkbcommon.org/doc/current/structxkb__rule__names.html
Diffstat (limited to 'tinywl')
-rw-r--r--tinywl/tinywl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
index 3232df3a..2f2257ec 100644
--- a/tinywl/tinywl.c
+++ b/tinywl/tinywl.c
@@ -222,9 +222,8 @@ static void server_new_keyboard(struct tinywl_server *server,
/* We need to prepare an XKB keymap and assign it to the keyboard. This
* assumes the defaults (e.g. layout = "us"). */
- struct xkb_rule_names rules = { 0 };
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
- struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
+ struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, NULL,
XKB_KEYMAP_COMPILE_NO_FLAGS);
wlr_keyboard_set_keymap(device->keyboard, keymap);