diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-03-10 17:16:38 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-03-10 17:16:38 -0400 |
| commit | 87037b9953ebd47e9dbd99b3653050517aa490ff (patch) | |
| tree | e19937cc69ccbc664eb980603d567d6d2ff9bf6d | |
| parent | 71f4eaec7713643a7e2d07e27b9afeabd6f1ce02 (diff) | |
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.
| -rw-r--r-- | src/evdev.c | 4 |
1 files 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); |