Commit dda952fa authored by Peter Hutterer's avatar Peter Hutterer

Leave the XKB defaults up to the server

Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 17302c33
......@@ -387,16 +387,30 @@ xf86libinput_init_keyboard(InputInfoPtr pInfo)
{
DeviceIntPtr dev= pInfo->dev;
XkbRMLVOSet rmlvo = {0};
rmlvo.rules = xf86SetStrOption(pInfo->options, "xkb_rules", "evdev");
rmlvo.model = xf86SetStrOption(pInfo->options, "xkb_model", "pc104");
rmlvo.layout = xf86SetStrOption(pInfo->options, "xkb_layout", "us");
rmlvo.variant = xf86SetStrOption(pInfo->options, "xkb_variant", NULL);
rmlvo.options = xf86SetStrOption(pInfo->options, "xkb_options", NULL);
XkbRMLVOSet defaults = {0};
XkbGetRulesDflts(&defaults);
rmlvo.rules = xf86SetStrOption(pInfo->options,
"xkb_rules",
defaults.rules);
rmlvo.model = xf86SetStrOption(pInfo->options,
"xkb_model",
defaults.model);
rmlvo.layout = xf86SetStrOption(pInfo->options,
"xkb_layout",
defaults.layout);
rmlvo.variant = xf86SetStrOption(pInfo->options,
"xkb_variant",
defaults.variant);
rmlvo.options = xf86SetStrOption(pInfo->options,
"xkb_options",
defaults.options);
InitKeyboardDeviceStruct(dev, &rmlvo, NULL,
xf86libinput_kbd_ctrl);
XkbFreeRMLVOSet(&rmlvo, FALSE);
XkbFreeRMLVOSet(&defaults, FALSE);
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment