mirror of
https://github.com/X11Libre/xf86-input-evdev.git
synced 2026-04-14 11:44:16 +00:00
Force xkb_model to be "evdev".
Or at least, refuse to recognise the config option. It's nonsensical to use a model of something other than evdev, and it'll just break if you try.
This commit is contained in:
@@ -678,9 +678,9 @@ EvdevAddKeyClass(DeviceIntPtr device)
|
||||
SetXkbOption(pInfo, "xkb_rules", &pEvdev->xkb_rules);
|
||||
if (!pEvdev->xkb_rules)
|
||||
SetXkbOption(pInfo, "XkbRules", &pEvdev->xkb_rules);
|
||||
/* sorry, no model change allowed for you */
|
||||
xf86ReplaceStrOption(pInfo->options, "xkb_model", "evdev");
|
||||
SetXkbOption(pInfo, "xkb_model", &pEvdev->xkb_model);
|
||||
if (!pEvdev->xkb_model)
|
||||
SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_model);
|
||||
SetXkbOption(pInfo, "xkb_layout", &pEvdev->xkb_layout);
|
||||
if (!pEvdev->xkb_layout)
|
||||
SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout);
|
||||
|
||||
Reference in New Issue
Block a user