diff --git a/patches/touch-input/README.md b/patches/touch-input/README.md index 1dde5a9..ca65782 100644 --- a/patches/touch-input/README.md +++ b/patches/touch-input/README.md @@ -6,12 +6,14 @@ KNOWN BUGS: ### Download - [git branch](https://codeberg.org/fauxmight/dwl/src/branch/touch-input) -- [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-wlroots-next-f1675a4.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input-wlroots-next-f1675a4.patch) - [touch-input-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input-0.8.patch) +- [touch-input-0.9.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input-0.9.patch) - [touch-input-0.8-osu-ver.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/touch-input/touch-input-0.8-osu-ver.patch) ### Authors #### Current +- [pi66](https://codeberg.org/pi66) - [fauxmight](https://codeberg.org/fauxmight) - [6z7y](https://codeberg.org/6z7y) -- maintaining `osu!` version of the `touch-input` patch #### Historic @@ -20,6 +22,7 @@ KNOWN BUGS: ### Changelog +- 2026-09-25 Update patch for dwl v0.9 and dwl wlroots-next branch commit f1675a4 - 2026-06-15 Add support for osu! fullscreen touch input (fix cursor stuck issue) - 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) diff --git a/patches/touch-input/touch-input-wlroots-next-f4249db.patch b/patches/touch-input/touch-input-0.9.patch similarity index 88% rename from patches/touch-input/touch-input-wlroots-next-f4249db.patch rename to patches/touch-input/touch-input-0.9.patch index 531ceb6..0cf26f0 100644 --- a/patches/touch-input/touch-input-wlroots-next-f4249db.patch +++ b/patches/touch-input/touch-input-0.9.patch @@ -1,17 +1,17 @@ -From fa06ad17d5f203be0dc6e1af29b1a21a3cac0455 Mon Sep 17 00:00:00 2001 -From: A Frederick Christensen -Date: Thu, 26 Feb 2026 22:13:43 -0600 -Subject: [PATCH] Apply touch-input patch +From 22342273e7dfb9af1e7e4b19b9b64ccc05a70023 Mon Sep 17 00:00:00 2001 +From: pi66 +Date: Fri, 25 Sep 2026 19:59:48 +0100 +Subject: [PATCH] fix: add missing touches list declaration --- dwl.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dwl.c b/dwl.c -index 8a9715d..8bf6023 100644 +index 4cfd0fd..e6d8433 100644 --- a/dwl.c +++ b/dwl.c -@@ -52,6 +52,7 @@ +@@ -58,6 +58,7 @@ #include #include #include @@ -19,7 +19,7 @@ index 8a9715d..8bf6023 100644 #include #include #include -@@ -163,6 +164,12 @@ typedef struct { +@@ -181,6 +182,12 @@ typedef struct { struct wl_listener destroy; } KeyboardGroup; @@ -32,7 +32,7 @@ index 8a9715d..8bf6023 100644 typedef struct { /* Must keep this field first */ unsigned int type; /* LayerShell */ -@@ -270,7 +277,9 @@ static void createnotify(struct wl_listener *listener, void *data); +@@ -289,7 +296,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); @@ -42,7 +42,7 @@ index 8a9715d..8bf6023 100644 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); +@@ -359,6 +368,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); @@ -53,15 +53,15 @@ index 8a9715d..8bf6023 100644 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; +@@ -429,6 +442,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; + static int consumed[KEY_MAX + 1]; /* global event handlers */ - static struct wl_listener cursor_axis = {.notify = axisnotify}; -@@ -436,6 +450,10 @@ static struct wl_listener request_set_sel = {.notify = setsel}; +@@ -459,6 +473,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}; @@ -70,9 +70,9 @@ index 8a9715d..8bf6023 100644 +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}; + static struct wl_listener new_foreign_toplevel_capture_request = {.notify = capturerequest}; - #ifdef XWAYLAND -@@ -783,6 +801,10 @@ cleanuplisteners(void) +@@ -874,6 +892,10 @@ cleanuplisteners(void) wl_list_remove(&request_set_cursor_shape.link); wl_list_remove(&request_start_drag.link); wl_list_remove(&start_drag.link); @@ -81,9 +81,9 @@ index 8a9715d..8bf6023 100644 + wl_list_remove(&touch_motion.link); + wl_list_remove(&touch_up.link); wl_list_remove(&new_session_lock.link); + wl_list_remove(&new_foreign_toplevel_capture_request.link); #ifdef XWAYLAND - wl_list_remove(&new_xwayland_surface.link); -@@ -1201,6 +1223,16 @@ createpopup(struct wl_listener *listener, void *data) +@@ -1297,6 +1319,16 @@ createpopup(struct wl_listener *listener, void *data) LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup); } @@ -100,7 +100,7 @@ index 8a9715d..8bf6023 100644 void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint) { -@@ -1592,6 +1624,9 @@ inputdevice(struct wl_listener *listener, void *data) +@@ -1703,6 +1735,9 @@ inputdevice(struct wl_listener *listener, void *data) case WLR_INPUT_DEVICE_POINTER: createpointer(wlr_pointer_from_input_device(device)); break; @@ -110,7 +110,7 @@ index 8a9715d..8bf6023 100644 default: /* TODO handle other input device types */ break; -@@ -1604,6 +1639,8 @@ inputdevice(struct wl_listener *listener, void *data) +@@ -1715,6 +1750,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; @@ -119,7 +119,7 @@ index 8a9715d..8bf6023 100644 wlr_seat_set_capabilities(seat, caps); } -@@ -2618,6 +2655,13 @@ setup(void) +@@ -2781,6 +2818,13 @@ setup(void) wl_signal_add(&cursor->events.axis, &cursor_axis); wl_signal_add(&cursor->events.frame, &cursor_frame); @@ -133,7 +133,7 @@ index 8a9715d..8bf6023 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); -@@ -2790,6 +2834,120 @@ toggleview(const Arg *arg) +@@ -2957,6 +3001,120 @@ toggleview(const Arg *arg) printstatus(); } @@ -255,5 +255,5 @@ index 8a9715d..8bf6023 100644 unlocksession(struct wl_listener *listener, void *data) { -- -2.52.0 +2.55.0 diff --git a/patches/touch-input/touch-input-wlroots-next-f1675a4.patch b/patches/touch-input/touch-input-wlroots-next-f1675a4.patch new file mode 100644 index 0000000..0cf26f0 --- /dev/null +++ b/patches/touch-input/touch-input-wlroots-next-f1675a4.patch @@ -0,0 +1,259 @@ +From 22342273e7dfb9af1e7e4b19b9b64ccc05a70023 Mon Sep 17 00:00:00 2001 +From: pi66 +Date: Fri, 25 Sep 2026 19:59:48 +0100 +Subject: [PATCH] fix: add missing touches list declaration + +--- + dwl.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 158 insertions(+) + +diff --git a/dwl.c b/dwl.c +index 4cfd0fd..e6d8433 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -58,6 +58,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -181,6 +182,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 */ +@@ -289,7 +296,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); +@@ -359,6 +368,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); +@@ -429,6 +442,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; + static int consumed[KEY_MAX + 1]; + + /* global event handlers */ +@@ -459,6 +473,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}; + static struct wl_listener new_foreign_toplevel_capture_request = {.notify = capturerequest}; + +@@ -874,6 +892,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); + wl_list_remove(&new_foreign_toplevel_capture_request.link); + #ifdef XWAYLAND +@@ -1297,6 +1319,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) + { +@@ -1703,6 +1735,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; +@@ -1715,6 +1750,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); + } + +@@ -2781,6 +2818,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); + +@@ -2957,6 +3001,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.55.0 +