If it's display- or system-integrated it can only be a touchscreen.

Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Tested-by: Benjamin Tissoires <benjamin.tissoi...@gmail.com>
---
 tools/generate-udev-rules.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/generate-udev-rules.c b/tools/generate-udev-rules.c
index ff95e60..d6769bd 100644
--- a/tools/generate-udev-rules.c
+++ b/tools/generate-udev-rules.c
@@ -83,8 +83,12 @@ static void print_udev_entry_for_match (WacomDevice *device, 
const WacomMatch *m
        /* unset joystick, set tablet */
        printf ("%s ENV{ID_INPUT}=\"1\", ENV{ID_INPUT_JOYSTICK}=\"\", 
ENV{ID_INPUT_TABLET}=\"1\"\n", matchstr);
 
-       if (libwacom_has_touch (device))
-               printf( "ATTRS{name}==\"* Finger\", %s 
ENV{ID_INPUT_TOUCHPAD}=\"1\"\n", matchstr);
+       if (libwacom_has_touch (device)) {
+               const char *touchtype = "ID_INPUT_TOUCHPAD";
+               if (libwacom_get_integration_flags (device) != 
WACOM_DEVICE_INTEGRATED_NONE)
+                       touchtype = "ID_INPUT_TOUCHSCREEN";
+               printf( "ATTRS{name}==\"* Finger\", %s ENV{%s}=\"1\"\n", 
matchstr, touchtype);
+       }
 
        /* set ID_INPUT_TABLET_PAD for pads */
        if (libwacom_get_num_buttons (device) > 0)
-- 
2.3.4


------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to