From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 15 Dec 2023 15:36:29 +0000 (-0800)
Subject: Add `touchpad` device type
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=6faee17d20637df35e27cd2cac462323e4d665a1;p=proto%2Flabwc.git

Add `touchpad` device type

It is nice to have finer granularity for device types to allow for
configurations such as using `naturalScroll` on touchpads, but not on
regular pointer devices such as mice.
---

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index a7c9dda3..ac20dcb7 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -435,11 +435,11 @@ windows using the mouse.
 *<libinput><device category="">*
 	Define a category of devices to use the configuration values that
 	follow. The category can be set to touch (devices that define a width
-	and height), non-touch, default, or the name of a device. You can obtain
-	your devices name by running *libinput list-devices* (you may need to
-	be root or a part of the input group to perform this.) Any members of
-	this category that are not set use the default for the device. With the
-	exception of tap-to-click, which is enabled by default.
+	and height), touchpad, non-touch, default, or the name of a device. You
+	can obtain your devices name by running *libinput list-devices* (you may
+	need to be root or a part of the input group to perform this.) Any
+	members of this category that are not set use the default for the
+	device. With the exception of tap-to-click, which is enabled by default.
 
 *<libinput><device category=""><naturalScroll>* [yes|no]
 	Use natural scrolling for this category if available.
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 316586d9..bc0e092c 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -394,9 +394,9 @@
   </mouse>
 
   <!--
-    The *category* element can be set to touch, non-touch, default or the name
-    of a device. You can obtain device names by running *libinput list-devices*
-    as root or member of the input group.
+    The *category* element can be set to touch, touchpad, non-touch, default or
+    the name of a device. You can obtain device names by running *libinput
+    list-devices* as root or member of the input group.
 
     Tap is set to *yes* be default. All others are left blank in order to use
     device defaults.
diff --git a/include/config/libinput.h b/include/config/libinput.h
index 61505b11..83d512e4 100644
--- a/include/config/libinput.h
+++ b/include/config/libinput.h
@@ -9,6 +9,7 @@
 enum device_type {
 	DEFAULT_DEVICE,
 	TOUCH_DEVICE,
+	TOUCHPAD_DEVICE,
 	NON_TOUCH_DEVICE,
 };
 
diff --git a/src/config/libinput.c b/src/config/libinput.c
index e66060a0..8a447582 100644
--- a/src/config/libinput.c
+++ b/src/config/libinput.c
@@ -32,6 +32,9 @@ get_device_type(const char *s)
 	if (!strcasecmp(s, "touch")) {
 		return TOUCH_DEVICE;
 	}
+	if (!strcasecmp(s, "touchpad")) {
+		return TOUCHPAD_DEVICE;
+	}
 	if (!strcasecmp(s, "non-touch")) {
 		return NON_TOUCH_DEVICE;
 	}
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 0ff22edd..d5d57592 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -460,6 +460,7 @@ fill_libinput_category(char *nodename, char *content)
 
 	if (!strcmp(nodename, "category")) {
 		if (!strcmp(content, "touch")
+				|| !strcmp(content, "touchpad")
 				|| !strcmp(content, "non-touch")
 				|| !strcmp(content, "default")) {
 			current_libinput_category->type = get_device_type(content);
diff --git a/src/seat.c b/src/seat.c
index ce78d479..5a603c5a 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -33,17 +33,28 @@ input_device_destroy(struct wl_listener *listener, void *data)
 	free(input);
 }
 
-static bool
-is_touch_device(struct wlr_input_device *wlr_input_device)
+static enum device_type
+device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
 {
 	switch (wlr_input_device->type) {
 	case WLR_INPUT_DEVICE_TOUCH:
 	case WLR_INPUT_DEVICE_TABLET_TOOL:
-		return true;
+		return TOUCH_DEVICE;
 	default:
 		break;
 	}
-	return false;
+
+	if (wlr_input_device->type == WLR_INPUT_DEVICE_POINTER &&
+			wlr_input_device_is_libinput(wlr_input_device)) {
+		struct libinput_device *libinput_device =
+			wlr_libinput_get_device_handle(wlr_input_device);
+
+		if (libinput_device_config_tap_get_finger_count(libinput_device) > 0) {
+			return TOUCHPAD_DEVICE;
+		}
+	}
+
+	return NON_TOUCH_DEVICE;
 }
 
 static void
@@ -64,9 +75,8 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
 		return;
 	}
 
-	enum device_type current_type;
-	current_type = is_touch_device(wlr_input_device)
-			? TOUCH_DEVICE : NON_TOUCH_DEVICE;
+	enum device_type current_type =
+		device_type_from_wlr_device(wlr_input_device);
 
 	struct libinput_category *device_category, *dc = NULL;
 	wl_list_for_each(device_category, &rc.libinput_categories, link) {