From 3e66a5e6822e36d9be821f11ff6eac55c710ffd0 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 9 Aug 2021 20:31:41 +0200 Subject: [PATCH] Don't manually parse XKB_* env vars libxkbcommon will do it for us if we provide a NULL struct xkb_rule_names. --- seat.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/seat.c b/seat.c index 08f25a3..ab6efbb 100644 --- a/seat.c +++ b/seat.c @@ -355,13 +355,7 @@ handle_new_keyboard(struct cg_seat *seat, struct wlr_input_device *device) return; } - struct xkb_rule_names rules = {0}; - rules.rules = getenv("XKB_DEFAULT_RULES"); - rules.model = getenv("XKB_DEFAULT_MODEL"); - rules.layout = getenv("XKB_DEFAULT_LAYOUT"); - rules.variant = getenv("XKB_DEFAULT_VARIANT"); - rules.options = getenv("XKB_DEFAULT_OPTIONS"); - struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS); + struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS); if (!keymap) { wlr_log(WLR_ERROR, "Unable to configure keyboard: keymap does not exist"); xkb_context_unref(context);