aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-05-27 10:19:15 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-05-31 06:57:16 +1000
commita0d41af8969b91ec51ebdfb966ccc47e5c40329a (patch)
tree0055e984509885302933fdeb56b285df25b82719
parentFail to set up axes for devices that only have MT axes but no ABS_X/Y equival... (diff)
downloadxf86-input-evdev-a0d41af8969b91ec51ebdfb966ccc47e5c40329a.tar.gz
xf86-input-evdev-a0d41af8969b91ec51ebdfb966ccc47e5c40329a.tar.bz2
xf86-input-evdev-a0d41af8969b91ec51ebdfb966ccc47e5c40329a.zip
Switch default model to pc104.
As of xkeyboard-config 1.9, the evdev model is hidden (c887d2876) The server switched to pc105 with version 1.8 (1df4bd601). The evdev model resolves to pc104 anyway, so this commit has no real effect other than to switch from a catch-all rule to explicit. Use pc104 so this is easy to find for those investigating the code and wondering why. pc104 is the 'correct' geometry for the us layout, which is the default after all. Switching to pc105 would show keys missing if no model is set (e.g. on uk/de layouts) but it would be the wrong layout for the default. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r--src/evdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index aec1447..86af151 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -96,7 +96,7 @@
static const char *evdevDefaults[] = {
"XkbRules", "evdev",
- "XkbModel", "evdev",
+ "XkbModel", "pc104", /* the right model for 'us' */
"XkbLayout", "us",
NULL
};