From 1fa320cb9937e1f1c28b22c1b0b688758ed661d5 Mon Sep 17 00:00:00 2001
From: Simon Long <simon@raspberrypi.com>
Date: Sun, 20 Oct 2024 11:51:43 +0100
Subject: [PATCH] Add mouseEmulation parameter to touch devices

---
 docs/labwc-config.5.scd |  6 +++++-
 docs/rc.xml.all         |  5 ++++-
 include/config/touch.h  |  1 +
 src/config/rcxml.c      |  2 ++
 src/input/cursor.c      |  1 +
 src/seat.c              | 10 +++++++++-
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index f2088771..9a0fe7c0 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -622,7 +622,7 @@ extending outward from the snapped edge.
 ## TOUCH
 
 ```
-<touch deviceName="" mapToOutput="" />
+<touch deviceName="" mapToOutput="" mouseEmulation="no"/>
 ```
 
 *<touch deviceName="" />*
@@ -636,6 +636,10 @@ extending outward from the snapped edge.
 	Direct cursor movement to a specified output. If the compositor is
 	running in nested mode, this does not take effect.
 
+*<touch mouseEmulation="" />*
+	If mouseEmulation is enabled, all touch up/down/motion events are
+    translated to mouse button and motion events.
+
 ## TABLET
 
 ```
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 35e5c91b..566f9249 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -484,8 +484,11 @@
 
     Direct cursor movement to a specified output. If the compositor is
     running in nested mode, this does not take effect.
+
+    If mouseEmulation is enabled, all touch up/down/motion events are
+    translated to mouse button and motion events.
   -->
-  <touch deviceName="" mapToOutput="" />
+  <touch deviceName="" mapToOutput="" mouseEmulation="no"/>
 
   <!--
     The tablet cursor movement can be restricted to a single output.
diff --git a/include/config/touch.h b/include/config/touch.h
index e9880820..12f7b032 100644
--- a/include/config/touch.h
+++ b/include/config/touch.h
@@ -8,6 +8,7 @@
 struct touch_config_entry {
 	char *device_name;
 	char *output_name;
+	bool force_mouse_emulation;
 
 	struct wl_list link;     /* struct rcxml.touch_configs */
 };
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 0ff52bf3..de240374 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -491,6 +491,8 @@ fill_touch(char *nodename, char *content)
 		current_touch->device_name = xstrdup(content);
 	} else if (!strcasecmp(nodename, "mapToOutput.touch")) {
 		current_touch->output_name = xstrdup(content);
+	} else if (!strcasecmp(nodename, "mouseEmulation.touch")) {
+		set_bool(content, &current_touch->force_mouse_emulation);
 	} else {
 		wlr_log(WLR_ERROR, "Unexpected data in touch parser: %s=\"%s\"",
 			nodename, content);
diff --git a/src/input/cursor.c b/src/input/cursor.c
index 3c144154..663f419d 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -1237,6 +1237,7 @@ cursor_emulate_button(struct seat *seat, uint32_t button,
 		cursor_finish_button_release(seat);
 		break;
 	}
+	wlr_seat_pointer_notify_frame (seat->seat);
 }
 
 static int
diff --git a/src/seat.c b/src/seat.c
index ce1751c4..287c40a3 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -389,6 +389,7 @@ static void
 seat_update_capabilities(struct seat *seat)
 {
 	struct input *input = NULL;
+	struct touch_config_entry *config_entry;
 	uint32_t caps = 0;
 
 	wl_list_for_each(input, &seat->inputs, link) {
@@ -401,7 +402,14 @@ seat_update_capabilities(struct seat *seat)
 			caps |= WL_SEAT_CAPABILITY_POINTER;
 			break;
 		case WLR_INPUT_DEVICE_TOUCH:
-			caps |= WL_SEAT_CAPABILITY_TOUCH;
+			config_entry =
+				touch_find_config_for_device(input->wlr_input_device->name);
+			if (config_entry->force_mouse_emulation) {
+				caps |= WL_SEAT_CAPABILITY_POINTER;
+			}
+			else {
+				caps |= WL_SEAT_CAPABILITY_TOUCH;
+			}
 			break;
 		default:
 			break;