From 624ffa45162d7df1ae0796b283bef2f4a0d6a0d7 Mon Sep 17 00:00:00 2001 From: Jari Ronkainen Date: Fri, 8 Oct 2021 19:18:21 +0300 Subject: [PATCH] Improve built-in touchscreen detection Adds detection code to handle pci-*-platform-* strings in ID_PATH References: https://github.com/swaywm/sway/issues/6590 Signed-off-by: Jari Ronkainen --- sway/input/libinput.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sway/input/libinput.c b/sway/input/libinput.c index 060a584a..3c0f359d 100644 --- a/sway/input/libinput.c +++ b/sway/input/libinput.c @@ -332,6 +332,13 @@ bool sway_libinput_device_is_builtin(struct sway_input_device *sway_device) { return false; } - const char prefix[] = "platform-"; - return strncmp(id_path, prefix, strlen(prefix)) == 0; + const char prefix_platform[] = "platform-"; + if (strncmp(id_path, prefix_platform, strlen(prefix_platform)) != 0) { + return false; + } + + const char prefix_pci[] = "pci-"; + const char infix_platform[] = "-platform-"; + return (strncmp(id_path, prefix_pci, strlen(prefix_pci)) == 0) && + strstr(id_path, infix_platform); }