tablet-input: Alphabetize includes

touch-input: Update for 0.8 and for wlroots-next-f4249db
tablet-input: Update for 0.8 and for wlroots-next-f4249db
2026-03-22 00:41:30 +00:00 · 2026-02-26 23:13:05 -06:00 · 2026-02-26 22:18:41 -06:00 · 2026-02-26 22:05:54 -06:00
6 changed files with 342 additions and 71 deletions
--- a/patches/tablet-input/README.md
+++ b/patches/tablet-input/README.md
@ -3,21 +3,10 @@ implements wlr-tablet-v2 for drawing tablets and supports cursor emulation

 inspired by @guyuming76's [branch](https://codeberg.org/guyuming76/dwl/commits/branch/graphic_tablet), with coding help from @Palanix and testing by @Thanatos

-**Please note:** wlroots modified the order of arguments to the function `wlr_surface_accepts_tablet_v2`  
-In versions less than or equal to 0.18.1 (against which, dwl 0.7 is typically built), the order is `tablet, surface`.  
-In the master branch and (anticipated) in versions later than 0.18.1, the order is `surface, tablet`.  
-The git branch for this patch uses the `surface, tablet` order.
-
-If you are attempting to use this codebase to make your own modifications to the patch, there is only one call to the `wlr_surface_accepts_tablet_v2` function, but you will need to make the argument order change if you expect to build against wlroots 0.18.1 or earlier.
-
-The `0.7` patch linked here accounts for the change and uses the `tablet, surface` order, but the patch is orphaned from a codebase.
-
-There was discussion of this matter in [Issue #141](https://codeberg.org/dwl/dwl-patches/issues/141).
-
 ### Download
 - [git branch](https://codeberg.org/fauxmight/dwl/src/branch/tablet-input)
- [main 2025-05-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/tablet-input/tablet-input.patch)
- [0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/tablet-input/tablet-input-0.7.patch)
+- [tablet-input-wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/tablet-input/tablet-input-wlroots-next-f4249db.patch)
+- [tablet-input-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/tablet-input/tablet-input-0.8.patch)

 ### Authors
 - [fauxmight](https://codeberg.org/fauxmight)
--- a/patches/tablet-input/tablet-input-0.8.patch
+++ b/patches/tablet-input/tablet-input-0.8.patch
@ -1,7 +1,7 @@
-From f639289974285207be396eac085cce6a316294c0 Mon Sep 17 00:00:00 2001
-From: Fernando Otto <fernandootto369@gmail.com>
-Date: Tue, 14 Oct 2025 12:20:37 -0300
-Subject: [PATCH] Fixing disconnect with the graphics tablet
+From 1069919d0252e554faddccc1f9da154e171ccdda Mon Sep 17 00:00:00 2001
+From: A Frederick Christensen <dwl@ivories.org>
+Date: Thu, 26 Feb 2026 21:56:13 -0600
+Subject: [PATCH] Apply tablet-input patch

 ---
 Makefile     |   6 +-
@ -34,7 +34,7 @@ index 578194f..e0d1835 100644
 config.h:
 	cp config.def.h $@
 diff --git a/config.def.h b/config.def.h
-index 95c2afa..1f06356 100644
+index 8a6eda0..1f20dfd 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -4,6 +4,7 @@
@ -46,15 +46,15 @@ index 95c2afa..1f06356 100644
 static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
 diff --git a/dwl.c b/dwl.c
-index 12f441e..43566fe 100644
+index 44f3ad9..4ef2cc8 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -51,6 +51,9 @@
 #include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_single_pixel_buffer_v1.h>
 #include <wlr/types/wlr_subcompositor.h>
-+#include <wlr/types/wlr_tablet_tool.h>
 +#include <wlr/types/wlr_tablet_pad.h>
+#include <wlr/types/wlr_tablet_tool.h>
 +#include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_viewporter.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
@ -188,7 +188,7 @@ index 12f441e..43566fe 100644
 	default:
 		/* TODO handle other input device types */
 		break;
-@@ -2584,6 +2660,8 @@ setup(void)
+@@ -2585,6 +2661,8 @@ setup(void)
 
 	relative_pointer_mgr = wlr_relative_pointer_manager_v1_create(dpy);
 
@ -197,7 +197,7 @@ index 12f441e..43566fe 100644
 	/*
 	 * Creates a cursor, which is a wlroots utility for tracking the cursor
 	 * image shown on screen.
-@@ -2613,6 +2691,11 @@ setup(void)
+@@ -2614,6 +2692,11 @@ setup(void)
 	wl_signal_add(&cursor->events.button, &cursor_button);
 	wl_signal_add(&cursor->events.axis, &cursor_axis);
 	wl_signal_add(&cursor->events.frame, &cursor_frame);
@ -209,7 +209,7 @@ index 12f441e..43566fe 100644
 
 	cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
 	wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape);
-@@ -2708,6 +2791,163 @@ tagmon(const Arg *arg)
+@@ -2709,6 +2792,163 @@ tagmon(const Arg *arg)
 		setmon(sel, dirtomon(arg->i), 0);
 }
 
@ -374,5 +374,5 @@ index 12f441e..43566fe 100644
 tile(Monitor *m)
 {
 -- 
-2.51.0
+2.52.0

--- a/patches/tablet-input/tablet-input-wlroots-next-f4249db.patch
+++ b/patches/tablet-input/tablet-input-wlroots-next-f4249db.patch
@ -1,16 +1,16 @@
-From 6063acfd61538c621a3124f3da38f9b47a56c292 Mon Sep 17 00:00:00 2001
+From 55f35863fa9c5a379c9315192c6bc072c3b2ebb6 Mon Sep 17 00:00:00 2001
 From: A Frederick Christensen <dwl@ivories.org>
-Date: Fri, 19 Dec 2025 13:34:20 -0600
-Subject: [PATCH] Correct the tablet-input patch for dwl 0.7
+Date: Thu, 26 Feb 2026 21:58:37 -0600
+Subject: [PATCH] Apply tablet-input patch

 ---
 Makefile     |   6 +-
 config.def.h |   1 +
- dwl.c        | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 231 insertions(+), 1 deletion(-)
+ dwl.c        | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 246 insertions(+), 1 deletion(-)

 diff --git a/Makefile b/Makefile
-index ff53040..66c06b2 100644
+index 578194f..e0d1835 100644
 --- a/Makefile
 +++ b/Makefile
@@ -21,7 +21,8 @@ dwl: dwl.o util.o
@ -34,7 +34,7 @@ index ff53040..66c06b2 100644
 config.h:
 	cp config.def.h $@
 diff --git a/config.def.h b/config.def.h
-index 22d2171..3ad98ef 100644
+index 8a6eda0..1f20dfd 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -4,6 +4,7 @@
@ -46,15 +46,15 @@ index 22d2171..3ad98ef 100644
 static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
 diff --git a/dwl.c b/dwl.c
-index c717c1d..ed7e056 100644
+index 8a9715d..e7d796b 100644
 --- a/dwl.c
 +++ b/dwl.c
-@@ -50,6 +50,9 @@
+@@ -52,6 +52,9 @@
 #include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_single_pixel_buffer_v1.h>
 #include <wlr/types/wlr_subcompositor.h>
-+#include <wlr/types/wlr_tablet_tool.h>
 +#include <wlr/types/wlr_tablet_pad.h>
+#include <wlr/types/wlr_tablet_tool.h>
 +#include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_viewporter.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
@ -67,9 +67,9 @@ index c717c1d..ed7e056 100644
 static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
 static void cursorframe(struct wl_listener *listener, void *data);
 static void cursorwarptohint(void);
-@@ -284,6 +288,9 @@ static void destroypointerconstraint(struct wl_listener *listener, void *data);
+@@ -283,6 +287,9 @@ static void destroynotify(struct wl_listener *listener, void *data);
+ static void destroypointerconstraint(struct wl_listener *listener, void *data);
 static void destroysessionlock(struct wl_listener *listener, void *data);
- static void destroysessionmgr(struct wl_listener *listener, void *data);
 static void destroykeyboardgroup(struct wl_listener *listener, void *data);
 +static void destroytablet(struct wl_listener *listener, void *data);
 +static void destroytabletsurfacenotify(struct wl_listener *listener, void *data);
@ -77,7 +77,7 @@ index c717c1d..ed7e056 100644
 static Monitor *dirtomon(enum wlr_direction dir);
 static void focusclient(Client *c, int lift);
 static void focusmon(const Arg *arg);
-@@ -337,6 +344,11 @@ static void spawn(const Arg *arg);
+@@ -335,6 +342,11 @@ static void spawn(const Arg *arg);
 static void startdrag(struct wl_listener *listener, void *data);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
@ -89,7 +89,7 @@ index c717c1d..ed7e056 100644
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
-@@ -396,6 +408,13 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
+@@ -392,6 +404,13 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
 static struct wlr_cursor *cursor;
 static struct wlr_xcursor_manager *cursor_mgr;
 
@ -103,7 +103,20 @@ index c717c1d..ed7e056 100644
 static struct wlr_scene_rect *root_bg;
 static struct wlr_session_lock_manager_v1 *session_lock_mgr;
 static struct wlr_scene_rect *locked_bg;
-@@ -1137,6 +1156,28 @@ createpopup(struct wl_listener *listener, void *data)
+@@ -414,6 +433,12 @@ static struct wl_listener cursor_button = {.notify = buttonpress};
+ static struct wl_listener cursor_frame = {.notify = cursorframe};
+ static struct wl_listener cursor_motion = {.notify = motionrelative};
+ static struct wl_listener cursor_motion_absolute = {.notify = motionabsolute};
+static struct wl_listener tablet_device_destroy = {.notify = destroytablet};
+static struct wl_listener tablet_tool_axis = {.notify = tablettoolaxis};
+static struct wl_listener tablet_tool_button = {.notify = tablettoolbutton};
+static struct wl_listener tablet_tool_destroy = {.notify = destroytablettool};
+static struct wl_listener tablet_tool_proximity = {.notify = tablettoolproximity};
+static struct wl_listener tablet_tool_tip = {.notify = tablettooltip};
+ static struct wl_listener gpu_reset = {.notify = gpureset};
+ static struct wl_listener layout_change = {.notify = updatemons};
+ static struct wl_listener new_idle_inhibitor = {.notify = createidleinhibitor};
+@@ -1201,6 +1226,28 @@ createpopup(struct wl_listener *listener, void *data)
 	LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
 }
 
@ -117,7 +130,7 @@ index c717c1d..ed7e056 100644
 +			return;
 +
 +		tablet = wlr_tablet_create(tablet_mgr, seat, device);
-+		LISTEN_STATIC(&tablet->wlr_device->events.destroy, destroytablet);
+		wl_signal_add(&tablet->wlr_device->events.destroy, &tablet_device_destroy);
 +		if (libinput_device_config_send_events_get_modes(device_handle)) {
 +			libinput_device_config_send_events_set_mode(device_handle, send_events_mode);
 +			wlr_cursor_attach_input_device(cursor, device);
@ -132,13 +145,14 @@ index c717c1d..ed7e056 100644
 void
 cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
 {
-@@ -1323,6 +1364,28 @@ destroykeyboardgroup(struct wl_listener *listener, void *data)
+@@ -1385,6 +1432,29 @@ destroykeyboardgroup(struct wl_listener *listener, void *data)
 	free(group);
 }
 
 +void
 +destroytablet(struct wl_listener *listener, void *data)
 +{
+  wl_list_remove(&tablet_device_destroy.link);
 +  wlr_cursor_detach_input_device(cursor, tablet->wlr_device);
 +	tablet = NULL;
 +}
@ -161,7 +175,7 @@ index c717c1d..ed7e056 100644
 Monitor *
 dirtomon(enum wlr_direction dir)
 {
-@@ -1542,6 +1605,12 @@ inputdevice(struct wl_listener *listener, void *data)
+@@ -1592,6 +1662,12 @@ inputdevice(struct wl_listener *listener, void *data)
 	case WLR_INPUT_DEVICE_POINTER:
 		createpointer(wlr_pointer_from_input_device(device));
 		break;
@ -174,7 +188,7 @@ index c717c1d..ed7e056 100644
 	default:
 		/* TODO handle other input device types */
 		break;
-@@ -2569,6 +2638,8 @@ setup(void)
+@@ -2588,6 +2664,8 @@ setup(void)
 
 	relative_pointer_mgr = wlr_relative_pointer_manager_v1_create(dpy);
 
@ -183,18 +197,19 @@ index c717c1d..ed7e056 100644
 	/*
 	 * Creates a cursor, which is a wlroots utility for tracking the cursor
 	 * image shown on screen.
-@@ -2598,6 +2669,10 @@ setup(void)
- 	LISTEN_STATIC(&cursor->events.button, buttonpress);
- 	LISTEN_STATIC(&cursor->events.axis, axisnotify);
- 	LISTEN_STATIC(&cursor->events.frame, cursorframe);
-+        LISTEN_STATIC(&cursor->events.tablet_tool_proximity, tablettoolproximity);
-+	LISTEN_STATIC(&cursor->events.tablet_tool_axis, tablettoolaxis);
-+	LISTEN_STATIC(&cursor->events.tablet_tool_button, tablettoolbutton);
-+	LISTEN_STATIC(&cursor->events.tablet_tool_tip, tablettooltip);
+@@ -2617,6 +2695,11 @@ setup(void)
+ 	wl_signal_add(&cursor->events.button, &cursor_button);
+ 	wl_signal_add(&cursor->events.axis, &cursor_axis);
+ 	wl_signal_add(&cursor->events.frame, &cursor_frame);
+	wl_signal_add(&cursor->events.tablet_tool_proximity, &tablet_tool_proximity);
+	wl_signal_add(&cursor->events.tablet_tool_axis, &tablet_tool_axis);
+	wl_signal_add(&cursor->events.tablet_tool_button, &tablet_tool_button);
+	wl_signal_add(&cursor->events.tablet_tool_tip, &tablet_tool_tip);
+
 
 	cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
- 	LISTEN_STATIC(&cursor_shape_mgr->events.request_set_shape, setcursorshape);
-@@ -2691,6 +2766,156 @@ tagmon(const Arg *arg)
+ 	wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape);
+@@ -2712,6 +2795,163 @@ tagmon(const Arg *arg)
 		setmon(sel, dirtomon(arg->i), 0);
 }
 
@ -243,7 +258,7 @@ index c717c1d..ed7e056 100644
 +	motionnotify(0, NULL, 0, 0, 0, 0);
 +
 +	xytonode(cursor->x, cursor->y, &surface, NULL, NULL, &sx, &sy);
-+	if (surface && !wlr_surface_accepts_tablet_v2(tablet, surface))
+	if (surface && !wlr_surface_accepts_tablet_v2(surface, tablet))
 +		surface = NULL;
 +
 +	if (surface != tablet_curr_surface) {
@ -277,8 +292,8 @@ index c717c1d..ed7e056 100644
 +
 +	if (!tablet_tool) {
 +		tablet_tool = wlr_tablet_tool_create(tablet_mgr, seat, tool);
-+		LISTEN_STATIC(&tablet_tool->wlr_tool->events.destroy, destroytablettool);
-+		LISTEN_STATIC(&tablet_tool->events.set_cursor, setcursor);
+		wl_signal_add(&tablet_tool->wlr_tool->events.destroy, &tablet_tool_destroy);
+		wl_signal_add(&tablet_tool->events.set_cursor, &request_cursor);
 +	}
 +
 +	switch (event->state) {
@ -292,6 +307,9 @@ index c717c1d..ed7e056 100644
 +	}
 +}
 +
+double tilt_x = 0;
+double tilt_y = 0;
+
 +void
 +tablettoolaxis(struct wl_listener *listener, void *data)
 +{
@ -306,8 +324,12 @@ index c717c1d..ed7e056 100644
 +		wlr_tablet_v2_tablet_tool_notify_pressure(tablet_tool, event->pressure);
 +	if (event->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE)
 +		wlr_tablet_v2_tablet_tool_notify_distance(tablet_tool, event->distance);
+	if (event->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_X)
+		tilt_x = event->tilt_x;
+	if (event->updated_axes & WLR_TABLET_TOOL_AXIS_TILT_Y)
+		tilt_y = event->tilt_y;
 +	if (event->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y))
-+		wlr_tablet_v2_tablet_tool_notify_tilt(tablet_tool, event->tilt_x, event->tilt_y);
+		wlr_tablet_v2_tablet_tool_notify_tilt(tablet_tool, tilt_x, tilt_y);
 +	if (event->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION)
 +		wlr_tablet_v2_tablet_tool_notify_rotation(tablet_tool, event->rotation);
 +	if (event->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER)
@ -352,5 +374,5 @@ index c717c1d..ed7e056 100644
 tile(Monitor *m)
 {
 -- 
-2.51.2
+2.52.0

--- a/patches/touch-input/README.md
+++ b/patches/touch-input/README.md
@ -6,7 +6,8 @@ KNOWN BUGS:

 ### Download
 - [git branch](https://codeberg.org/fauxmight/dwl/src/branch/touch-input)
- [2025-05-17](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input.patch)
+- [touch-input-wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input-wlroots-next-f4249db.patch)
+- [touch-input-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input-0.8.patch)

 ### Authors
 - [fauxmight](https://codeberg.org/fauxmight)
@ -14,6 +15,7 @@ KNOWN BUGS:
 - [Unprex](https://github.com/Unprex)

 ### Changelog
+- 2026-02-26 Update patch for dwl v0.8 and dwl wlroots-next branch commit f4249db
 - 2025-01-01 @fauxmight took over maintenance. Previous maintainer @minego notes [lack of available time](https://codeberg.org/dwl/dwl-patches/pulls/102#issuecomment-2557944)
 - 2024-02-11 Corrected issue where motion events where not sending notifications for unfocused clients such as an on screen keyboard
 - 2024-03-26 Rebased, and removed #ifdef's for the pointer constraints patch which has been merged into upstream
--- a/patches/touch-input/touch-input-0.8.patch
+++ b/patches/touch-input/touch-input-0.8.patch
@ -1,15 +1,14 @@
-From f133af7120e28f3d8bda4d4e14b3bfd477b46426 Mon Sep 17 00:00:00 2001
+From 44dfe863a00f4bdc646df3d761ac97711dd2107a Mon Sep 17 00:00:00 2001
 From: A Frederick Christensen <dwl@ivories.org>
-Date: Sat, 17 May 2025 21:59:37 -0500
-Subject: [PATCH] Add support for touchscreen input devices
+Date: Thu, 26 Feb 2026 22:12:53 -0600
+Subject: [PATCH] Apply touch-input patch

-and send the appropriate events to clients
 ---
 dwl.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)

 diff --git a/dwl.c b/dwl.c
-index 4816159..3a378f9 100644
+index 44f3ad9..ccfe33c 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -51,6 +51,7 @@
@ -73,7 +72,7 @@ index 4816159..3a378f9 100644
 static struct wl_listener new_session_lock = {.notify = locksession};
 
 #ifdef XWAYLAND
-@@ -778,6 +796,10 @@ cleanuplisteners(void)
+@@ -781,6 +799,10 @@ cleanuplisteners(void)
 	wl_list_remove(&request_set_cursor_shape.link);
 	wl_list_remove(&request_start_drag.link);
 	wl_list_remove(&start_drag.link);
@ -84,7 +83,7 @@ index 4816159..3a378f9 100644
 	wl_list_remove(&new_session_lock.link);
 #ifdef XWAYLAND
 	wl_list_remove(&new_xwayland_surface.link);
-@@ -1196,6 +1218,16 @@ createpopup(struct wl_listener *listener, void *data)
+@@ -1199,6 +1221,16 @@ createpopup(struct wl_listener *listener, void *data)
 	LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
 }
 
@ -101,7 +100,7 @@ index 4816159..3a378f9 100644
 void
 cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
 {
-@@ -1587,6 +1619,9 @@ inputdevice(struct wl_listener *listener, void *data)
+@@ -1590,6 +1622,9 @@ inputdevice(struct wl_listener *listener, void *data)
 	case WLR_INPUT_DEVICE_POINTER:
 		createpointer(wlr_pointer_from_input_device(device));
 		break;
@ -111,7 +110,7 @@ index 4816159..3a378f9 100644
 	default:
 		/* TODO handle other input device types */
 		break;
-@@ -1599,6 +1634,8 @@ inputdevice(struct wl_listener *listener, void *data)
+@@ -1602,6 +1637,8 @@ inputdevice(struct wl_listener *listener, void *data)
 	caps = WL_SEAT_CAPABILITY_POINTER;
 	if (!wl_list_empty(&kb_group->wlr_group->devices))
 		caps |= WL_SEAT_CAPABILITY_KEYBOARD;
@ -120,7 +119,7 @@ index 4816159..3a378f9 100644
 	wlr_seat_set_capabilities(seat, caps);
 }
 
-@@ -2610,6 +2647,13 @@ setup(void)
+@@ -2615,6 +2652,13 @@ setup(void)
 	wl_signal_add(&cursor->events.axis, &cursor_axis);
 	wl_signal_add(&cursor->events.frame, &cursor_frame);
 
@ -134,7 +133,7 @@ index 4816159..3a378f9 100644
 	cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
 	wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape);
 
-@@ -2782,6 +2826,120 @@ toggleview(const Arg *arg)
+@@ -2787,6 +2831,120 @@ toggleview(const Arg *arg)
 	printstatus();
 }
 
@ -256,5 +255,5 @@ index 4816159..3a378f9 100644
 unlocksession(struct wl_listener *listener, void *data)
 {
 -- 
-2.49.0
+2.52.0

--- a/patches/touch-input/touch-input-wlroots-next-f4249db.patch
+++ b/patches/touch-input/touch-input-wlroots-next-f4249db.patch
@ -0,0 +1,259 @@
+From fa06ad17d5f203be0dc6e1af29b1a21a3cac0455 Mon Sep 17 00:00:00 2001
+From: A Frederick Christensen <dwl@ivories.org>
+Date: Thu, 26 Feb 2026 22:13:43 -0600
+Subject: [PATCH] Apply touch-input patch
+
+---
+ dwl.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 158 insertions(+)
+
+diff --git a/dwl.c b/dwl.c
+index 8a9715d..8bf6023 100644
+--- a/dwl.c
+++ b/dwl.c
+@@ -52,6 +52,7 @@
+ #include <wlr/types/wlr_session_lock_v1.h>
+ #include <wlr/types/wlr_single_pixel_buffer_v1.h>
+ #include <wlr/types/wlr_subcompositor.h>
+#include <wlr/types/wlr_touch.h>
+ #include <wlr/types/wlr_viewporter.h>
+ #include <wlr/types/wlr_virtual_keyboard_v1.h>
+ #include <wlr/types/wlr_virtual_pointer_v1.h>
+@@ -163,6 +164,12 @@ typedef struct {
+ 	struct wl_listener destroy;
+ } KeyboardGroup;
+ 
+typedef struct TouchGroup {
+	struct wl_list link;
+	struct wlr_touch *touch;
+	Monitor *m;
+} TouchGroup;
+
+ typedef struct {
+ 	/* Must keep this field first */
+ 	unsigned int type; /* LayerShell */
+@@ -270,7 +277,9 @@ static void createnotify(struct wl_listener *listener, void *data);
+ static void createpointer(struct wlr_pointer *pointer);
+ static void createpointerconstraint(struct wl_listener *listener, void *data);
+ static void createpopup(struct wl_listener *listener, void *data);
+static void createtouch(struct wlr_touch *touch);
+ static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
+static void createtouch(struct wlr_touch *touch);
+ static void cursorframe(struct wl_listener *listener, void *data);
+ static void cursorwarptohint(void);
+ static void destroydecoration(struct wl_listener *listener, void *data);
+@@ -340,6 +349,10 @@ static void togglefloating(const Arg *arg);
+ static void togglefullscreen(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+static void touchdown(struct wl_listener *listener, void *data);
+static void touchup(struct wl_listener *listener, void *data);
+static void touchframe(struct wl_listener *listener, void *data);
+static void touchmotion(struct wl_listener *listener, void *data);
+ static void unlocksession(struct wl_listener *listener, void *data);
+ static void unmaplayersurfacenotify(struct wl_listener *listener, void *data);
+ static void unmapnotify(struct wl_listener *listener, void *data);
+@@ -407,6 +420,7 @@ static struct wlr_output_layout *output_layout;
+ static struct wlr_box sgeom;
+ static struct wl_list mons;
+ static Monitor *selmon;
+static struct wl_list touches;
+ 
+ /* global event handlers */
+ static struct wl_listener cursor_axis = {.notify = axisnotify};
+@@ -436,6 +450,10 @@ static struct wl_listener request_set_sel = {.notify = setsel};
+ static struct wl_listener request_set_cursor_shape = {.notify = setcursorshape};
+ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
+ static struct wl_listener start_drag = {.notify = startdrag};
+static struct wl_listener touch_down = {.notify = touchdown};
+static struct wl_listener touch_frame = {.notify = touchframe};
+static struct wl_listener touch_motion = {.notify = touchmotion};
+static struct wl_listener touch_up = {.notify = touchup};
+ static struct wl_listener new_session_lock = {.notify = locksession};
+ 
+ #ifdef XWAYLAND
+@@ -783,6 +801,10 @@ cleanuplisteners(void)
+ 	wl_list_remove(&request_set_cursor_shape.link);
+ 	wl_list_remove(&request_start_drag.link);
+ 	wl_list_remove(&start_drag.link);
+	wl_list_remove(&touch_down.link);
+	wl_list_remove(&touch_frame.link);
+	wl_list_remove(&touch_motion.link);
+	wl_list_remove(&touch_up.link);
+ 	wl_list_remove(&new_session_lock.link);
+ #ifdef XWAYLAND
+ 	wl_list_remove(&new_xwayland_surface.link);
+@@ -1201,6 +1223,16 @@ createpopup(struct wl_listener *listener, void *data)
+ 	LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
+ }
+ 
+void
+createtouch(struct wlr_touch *wlr_touch)
+{
+	TouchGroup *touch = ecalloc(1, sizeof(TouchGroup));
+
+	touch->touch = wlr_touch;
+	wl_list_insert(&touches, &touch->link);
+	wlr_cursor_attach_input_device(cursor, &wlr_touch->base);
+}
+
+ void
+ cursorconstrain(struct wlr_pointer_constraint_v1 *constraint)
+ {
+@@ -1592,6 +1624,9 @@ inputdevice(struct wl_listener *listener, void *data)
+ 	case WLR_INPUT_DEVICE_POINTER:
+ 		createpointer(wlr_pointer_from_input_device(device));
+ 		break;
+	case WLR_INPUT_DEVICE_TOUCH:
+		createtouch(wlr_touch_from_input_device(device));
+		break;
+ 	default:
+ 		/* TODO handle other input device types */
+ 		break;
+@@ -1604,6 +1639,8 @@ inputdevice(struct wl_listener *listener, void *data)
+ 	caps = WL_SEAT_CAPABILITY_POINTER;
+ 	if (!wl_list_empty(&kb_group->wlr_group->devices))
+ 		caps |= WL_SEAT_CAPABILITY_KEYBOARD;
+	if (!wl_list_empty(&touches))
+		caps |= WL_SEAT_CAPABILITY_TOUCH;
+ 	wlr_seat_set_capabilities(seat, caps);
+ }
+ 
+@@ -2618,6 +2655,13 @@ setup(void)
+ 	wl_signal_add(&cursor->events.axis, &cursor_axis);
+ 	wl_signal_add(&cursor->events.frame, &cursor_frame);
+ 
+	wl_list_init(&touches);
+
+	wl_signal_add(&cursor->events.touch_down, &touch_down);
+	wl_signal_add(&cursor->events.touch_frame, &touch_frame);
+	wl_signal_add(&cursor->events.touch_motion, &touch_motion);
+	wl_signal_add(&cursor->events.touch_up, &touch_up);
+
+ 	cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
+ 	wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape);
+ 
+@@ -2790,6 +2834,120 @@ toggleview(const Arg *arg)
+ 	printstatus();
+ }
+ 
+void
+touchdown(struct wl_listener *listener, void *data)
+{
+	struct wlr_touch_down_event *event = data;
+	double lx, ly;
+	double sx, sy;
+	struct wlr_surface *surface;
+	Client *c = NULL;
+	uint32_t serial = 0;
+	Monitor *m;
+
+	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+
+	// Map the input to the appropriate output, to ensure that rotation is
+	// handled.
+	wl_list_for_each(m, &mons, link) {
+		if (m == NULL || m->wlr_output == NULL) {
+			continue;
+		}
+		if (event->touch->output_name != NULL && 0 != strcmp(event->touch->output_name, m->wlr_output->name)) {
+			continue;
+		}
+
+		wlr_cursor_map_input_to_output(cursor, &event->touch->base, m->wlr_output);
+	}
+
+	wlr_cursor_absolute_to_layout_coords(cursor, &event->touch->base, event->x, event->y, &lx, &ly);
+
+	/* Find the client under the pointer and send the event along. */
+	xytonode(lx, ly, &surface, &c, NULL, &sx, &sy);
+	if (sloppyfocus)
+		focusclient(c, 0);
+
+	if (surface != NULL) {
+		serial = wlr_seat_touch_notify_down(seat, surface, event->time_msec, event->touch_id, sx, sy);
+	}
+
+	if (serial && wlr_seat_touch_num_points(seat) == 1) {
+		/* Emulate a mouse click if the touch event wasn't handled */
+		struct wlr_pointer_button_event *button_event = data;
+		struct wlr_pointer_motion_absolute_event *motion_event = data;
+		double dx, dy;
+
+		wlr_cursor_absolute_to_layout_coords(cursor, &motion_event->pointer->base, motion_event->x, motion_event->y, &lx, &ly);
+		wlr_cursor_warp_closest(cursor, &motion_event->pointer->base, lx, ly);
+		dx = lx - cursor->x;
+		dy = ly - cursor->y;
+		motionnotify(motion_event->time_msec, &motion_event->pointer->base, dx, dy, dx, dy);
+
+		button_event->button = BTN_LEFT;
+		button_event->state = WL_POINTER_BUTTON_STATE_PRESSED;
+		buttonpress(listener, button_event);
+	}
+}
+
+void
+touchup(struct wl_listener *listener, void *data)
+{
+	struct wlr_touch_up_event *event = data;
+
+	if (!wlr_seat_touch_get_point(seat, event->touch_id)) {
+		return;
+	}
+
+	if (wlr_seat_touch_num_points(seat) == 1) {
+		struct wlr_pointer_button_event *button_event = data;
+
+		button_event->button = BTN_LEFT;
+		button_event->state = WL_POINTER_BUTTON_STATE_RELEASED;
+		buttonpress(listener, button_event);
+	}
+
+	wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id);
+	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+}
+
+void
+touchframe(struct wl_listener *listener, void *data)
+{
+	wlr_seat_touch_notify_frame(seat);
+	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+}
+
+void
+touchmotion(struct wl_listener *listener, void *data)
+{
+	struct wlr_touch_motion_event *event = data;
+	double lx, ly;
+	double sx, sy;
+	struct wlr_surface *surface;
+	Client *c = NULL;
+
+	if (!wlr_seat_touch_get_point(seat, event->touch_id)) {
+		return;
+	}
+
+	wlr_cursor_absolute_to_layout_coords(cursor, &event->touch->base, event->x, event->y, &lx, &ly);
+	xytonode(lx, ly, &surface, &c, NULL, &sx, &sy);
+
+	if (c != NULL && surface != NULL) {
+		if (sloppyfocus)
+			focusclient(c, 0);
+		wlr_seat_touch_point_focus(seat, surface, event->time_msec, event->touch_id, sx, sy);
+	} else {
+		if (sloppyfocus)
+			focusclient(NULL, 0);
+		wlr_seat_touch_point_clear_focus(seat, event->time_msec, event->touch_id);
+	}
+	wlr_seat_touch_notify_motion(seat, event->time_msec, event->touch_id, sx, sy);
+
+	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+}
+
+
+ void
+ unlocksession(struct wl_listener *listener, void *data)
+ {
+-- 
+2.52.0
+
Author	SHA1	Message	Date
A Frederick Christensen	c5b24427c7	tablet-input: Alphabetize includes	2026-02-26 23:13:05 -06:00
A Frederick Christensen	77df1eb16e	touch-input: Update for 0.8 and for wlroots-next-f4249db	2026-02-26 22:18:41 -06:00
A Frederick Christensen	f4039c0252	tablet-input: Update for 0.8 and for wlroots-next-f4249db	2026-02-26 22:05:54 -06:00