From b878e48619495e0b307d93ef1989fa5a78d923ce Mon Sep 17 00:00:00 2001 From: project-repo Date: Thu, 16 Sep 2021 14:06:15 +0200 Subject: [PATCH] Do not parse XKB_* env vars manually --- seat.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/seat.c b/seat.c index ae2f748..1694a7f 100644 --- a/seat.c +++ b/seat.c @@ -437,14 +437,8 @@ new_keyboard(struct cg_seat *seat, struct cg_input_device *input_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); + xkb_map_new_from_names(context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS); if(!keymap) { wlr_log(WLR_ERROR, "Unable to configure keyboard: keymap does not exist");