[evdev] Add the default evdev config

Submitted by Peter Hutterer on May 5, 2015, 5:54 a.m.

Details

Message ID 1430805260-26645-1-git-send-email-peter.hutterer@who-t.net
State Accepted
Commit 66c997886424a20e92ce30fcfda46cbb5c7352ab
Headers show

Not browsing as part of any series.

Commit Message

Peter Hutterer May 5, 2015, 5:54 a.m.
This used to be part of the server but now that we have two drivers doing the
same thing (libinput, evdev) shift the configuration defaults to the driver.
This way you get what you install.

https://bugs.freedesktop.org/show_bug.cgi?id=89023

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 10-evdev.conf | 40 ++++++++++++++++++++++++++++++++++++++++
 Makefile.am   |  1 +
 configure.ac  |  7 +++++++
 3 files changed, 48 insertions(+)
 create mode 100644 10-evdev.conf

Patch hide | download patch | download mbox

diff --git a/10-evdev.conf b/10-evdev.conf
new file mode 100644
index 0000000..cc83ab2
--- /dev/null
+++ b/10-evdev.conf
@@ -0,0 +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 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/Makefile.am b/Makefile.am
index 00c7940..1cc3ea6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@  MAINTAINERCLEANFILES = ChangeLog INSTALL
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-evdev.pc
 
+dist_xorgconf_DATA = 10-evdev.conf
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index e0d480a..f6fd2e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,13 @@  AC_ARG_WITH(xorg-module-dir,
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 
+AC_ARG_WITH(xorg-conf-dir,
+            AC_HELP_STRING([--with-xorg-conf-dir=DIR],
+                           [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
+            [xorgconfdir="$withval"],
+            [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
+AC_SUBST(xorgconfdir)
+
 # X Server SDK location is required to install evdev header files
 # This location is also relayed in the xorg-evdev.pc file
 sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`

Comments

Hi,

On 05-05-15 07:54, Peter Hutterer wrote:
> This used to be part of the server but now that we have two drivers doing the
> same thing (libinput, evdev) shift the configuration defaults to the driver.
> This way you get what you install.
>
> https://bugs.freedesktop.org/show_bug.cgi?id=89023
>
> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

The set LGTM:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>   10-evdev.conf | 40 ++++++++++++++++++++++++++++++++++++++++
>   Makefile.am   |  1 +
>   configure.ac  |  7 +++++++
>   3 files changed, 48 insertions(+)
>   create mode 100644 10-evdev.conf
>
> diff --git a/10-evdev.conf b/10-evdev.conf
> new file mode 100644
> index 0000000..cc83ab2
> --- /dev/null
> +++ b/10-evdev.conf
> @@ -0,0 +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 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/Makefile.am b/Makefile.am
> index 00c7940..1cc3ea6 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -28,6 +28,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
>   pkgconfigdir = $(libdir)/pkgconfig
>   pkgconfig_DATA = xorg-evdev.pc
>
> +dist_xorgconf_DATA = 10-evdev.conf
>
>   .PHONY: ChangeLog INSTALL
>
> diff --git a/configure.ac b/configure.ac
> index e0d480a..f6fd2e4 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -59,6 +59,13 @@ AC_ARG_WITH(xorg-module-dir,
>   inputdir=${moduledir}/input
>   AC_SUBST(inputdir)
>
> +AC_ARG_WITH(xorg-conf-dir,
> +            AC_HELP_STRING([--with-xorg-conf-dir=DIR],
> +                           [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
> +            [xorgconfdir="$withval"],
> +            [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
> +AC_SUBST(xorgconfdir)
> +
>   # X Server SDK location is required to install evdev header files
>   # This location is also relayed in the xorg-evdev.pc file
>   sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
>