Call a input_set_default_property() in evdev_device_create if this function is exist

Change-Id: Ib47c6115248204d9ff63ced802c557b1bf5ad5f5

diff --git a/meson.build b/meson.build
index 8a79cbeeb5a18e8267cbfccff94940a343e78432..b1785e5c858c4d0fcfd532b008be67f727ac5c4c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -157,6 +157,11 @@ if dep_ttrace.found()
        config_h.set10('ENABLE_TTRACE', 1)
 endif
 
+############ check udev function  ############
+
+if cc.has_function('input_set_default_property', dependencies : dep_udev)
+       config_h.set10('HAVE_INPUT_SET_DEFAULT_PROPERTY', 1)
+endif
 
 ############ udev bits ############
 

diff --git a/src/evdev.c b/src/evdev.c
index 9931b3ee9dcc06315462345a20e38e68e21c522c..420b3a2edba98486678416cc3bcfe4b086333f25 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2213,10 +2213,16 @@ evdev_device_create(struct libinput_seat *seat,
        int rc;
        int fd;
        int unhandled_device = 0;
-       const char *devnode = udev_device_get_devnode(udev_device);
+       const char *devnode;
        const char *sysname = udev_device_get_sysname(udev_device);
        char buf[STRERR_BUFSIZE] = {0, };
 
+#ifdef HAVE_INPUT_SET_DEFAULT_PROPERTY
+       if (input_set_default_property(udev_device) < 0)
+               return NULL;
+#endif
+       devnode = udev_device_get_devnode(udev_device);
+
        if (!devnode) {
                log_info(libinput, "%s: no device node associated\n", sysname);
                return NULL;