diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-07 10:04:38 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-09 11:49:21 +1000 |
| commit | ad6c5e450cacee3777e7c541d4841ee580339a5d (patch) | |
| tree | ff2b1477f02760d5643e151a741a09d19ad674cc | |
| parent | c01250576ffadcd6c4591978b78da878d91ec11c (diff) | |
config: only match sane devices in 10-evdev.conf
Having a generic catchall also adds devices like accelerometers. These
devices make X unusable, hence restrict matching to "known sane" devices
like pointers, touchpads, keyboards, tablets and touchscreens.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Julien Cristau <jcristau@debian.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: James Cloos <cloos@jhcloos.com>
(cherry picked from commit c8a608cb6ce8f9c86258c1ab49084f691fa9cc51)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | config/10-evdev.conf | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/config/10-evdev.conf b/config/10-evdev.conf index 7406f4ef2..cc83ab232 100644 --- a/config/10-evdev.conf +++ b/config/10-evdev.conf @@ -1,8 +1,40 @@ # # Catch-all evdev loader for udev-based systems -# +# We don't simply match on any device since that also adds accelerometers +# and other devices that we don't really want to use. The list below +# matches everything but joysticks. + Section "InputClass" - Identifier "evdev-catchall" + Identifier "evdev pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev keyboard catchall" + MatchIsKeyboard "on" MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev tablet catchall" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" EndSection |