diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-08-16 15:33:23 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-08-16 15:34:03 +0300 |
| commit | 36d702006d5aace50083ca52b7065d465b497077 (patch) | |
| tree | fddfd00f0d2ee57044c9d0abf90974e9755c88ff | |
| parent | Revert "Don't grab devices unless specified through the config options." (diff) | |
| download | xf86-input-evdev-36d702006d5aace50083ca52b7065d465b497077.tar.gz xf86-input-evdev-36d702006d5aace50083ca52b7065d465b497077.tar.bz2 xf86-input-evdev-36d702006d5aace50083ca52b7065d465b497077.zip | |
Force rules, not model, to be evdev
xkeyboard-config recently changed to a separate ruleset for the evdev
driver, so match that by only forcing the ruleset, not the model, to be
evdev.
| -rw-r--r-- | src/evdev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/evdev.c b/src/evdev.c index 38a211b..806c228 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -89,7 +89,7 @@ #define COMPOSEFLAG 16 static const char *evdevDefaults[] = { - "XkbRules", "base", + "XkbRules", "evdev", "XkbModel", "evdev", "XkbLayout", "us", NULL @@ -686,12 +686,12 @@ EvdevAddKeyClass(DeviceIntPtr device) #ifdef XKB else { + /* sorry, no rules change allowed for you */ + xf86ReplaceStrOption(pInfo->options, "xkb_rules", "evdev"); 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_rules); SetXkbOption(pInfo, "xkb_layout", &pEvdev->xkb_layout); if (!pEvdev->xkb_layout) SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout); |