diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
| commit | 0b8629ada4293370d220bbb7e6c195c711baee7d (patch) | |
| tree | a7774b45662db90282ae18b17eb3d8f77d8c746d /xorg-server/config | |
| parent | 8654ee514b4d79feec936501717a06892090d3b7 (diff) | |
| download | vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.gz vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.bz2 vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.zip | |
svn merge -r534:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/10-evdev.conf | 36 | ||||
| -rw-r--r-- | xorg-server/config/Makefile.am | 2 |
2 files changed, 35 insertions, 3 deletions
diff --git a/xorg-server/config/10-evdev.conf b/xorg-server/config/10-evdev.conf index 7406f4ef2..cc83ab232 100644 --- a/xorg-server/config/10-evdev.conf +++ b/xorg-server/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 diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index eed745483..675a3b260 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -9,7 +9,7 @@ AM_CFLAGS += $(UDEV_CFLAGS) libconfig_la_SOURCES += udev.c libconfig_la_LIBADD = $(UDEV_LIBS) -xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) +xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) xorgconfd_DATA = 10-evdev.conf else |