From 87037b9953ebd47e9dbd99b3653050517aa490ff Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 10 Mar 2008 17:16:38 -0400 Subject: 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. --- src/evdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index e53e449..89ff6a5 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -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); -- cgit v1.2.3