From c626f3e946d2720bfc277dffe380ce19a8b77c37 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Fri, 14 Nov 2025 16:28:27 +0100 Subject: [PATCH 1/6] feat: apply touch-input patch --- src/mango.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/src/mango.c b/src/mango.c index 8fdff709..8fcc98d1 100644 --- a/src/mango.c +++ b/src/mango.c @@ -72,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -451,6 +452,12 @@ typedef struct { struct wl_listener destroy; } KeyboardGroup; +typedef struct TouchGroup { + struct wl_list link; + struct wlr_touch *touch; + Monitor *m; +} TouchGroup; + typedef struct { struct wlr_keyboard_shortcuts_inhibitor_v1 *inhibitor; struct wl_listener destroy; @@ -605,6 +612,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data); static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint); static void commitpopup(struct wl_listener *listener, void *data); static void createpopup(struct wl_listener *listener, void *data); +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); @@ -681,6 +689,11 @@ static void setsel(struct wl_listener *listener, void *data); static void setup(void); static void startdrag(struct wl_listener *listener, void *data); +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); @@ -881,6 +894,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 int32_t enablegaps = 1; /* enables gaps, used by togglegaps */ static int32_t axis_apply_time = 0; @@ -979,6 +993,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 drm_lease_request = {.notify = requestdrmlease}; static struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor = { @@ -2273,6 +2291,10 @@ void 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(&tearing_new_object.link); wl_list_remove(&keyboard_shortcuts_inhibit_new_inhibitor.link); @@ -3337,6 +3359,14 @@ void createpointerconstraint(struct wl_listener *listener, void *data) { &pointer_constraint->destroy, destroypointerconstraint); } +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) { if (active_constraint == constraint) return; @@ -3697,6 +3727,9 @@ void inputdevice(struct wl_listener *listener, void *data) { case WLR_INPUT_DEVICE_SWITCH: createswitch(wlr_switch_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; @@ -3710,6 +3743,8 @@ void 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); } @@ -5721,6 +5756,13 @@ void 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); + // 这两句代码会造成obs窗口里的鼠标光标消失,不知道注释有什么影响 cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); wl_signal_add(&cursor_shape_mgr->events.request_set_shape, @@ -5835,6 +5877,122 @@ void startdrag(struct wl_listener *listener, void *data) { LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon); } +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 tag_client(const Arg *arg, Client *target_client) { Client *fc = NULL; if (target_client && arg->ui & TAGMASK) { From 23cfc323beb3ac7fbdb83b6ce7465a1a181dbd52 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Fri, 14 Nov 2025 16:58:27 +0100 Subject: [PATCH 2/6] fix: reuse client in touch motion event --- src/mango.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mango.c b/src/mango.c index 8fcc98d1..c251107a 100644 --- a/src/mango.c +++ b/src/mango.c @@ -5967,16 +5967,20 @@ void touchmotion(struct wl_listener *listener, void *data) { double sx, sy; struct wlr_surface *surface; Client *c = NULL; + struct wlr_touch_point *p = wlr_seat_touch_get_point(seat, event->touch_id); - if (!wlr_seat_touch_get_point(seat, event->touch_id)) { + if (!p) { 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); + surface = p->surface; + c = surface ? get_client_from_surface(surface) : NULL; + sx = lx - c->current.x; + sy = ly - c->current.y; - if (c != NULL && surface != NULL) { + if (c != NULL) { if (sloppyfocus) focusclient(c, 0); wlr_seat_touch_point_focus(seat, surface, event->time_msec, From 47c5adfb37887fc36bd04bab5d39bbbad88aacee Mon Sep 17 00:00:00 2001 From: werapi Date: Sun, 30 Nov 2025 07:10:46 +0100 Subject: [PATCH 3/6] fix: prevent client focus loss on touch interaction with layer surfaces --- src/mango.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mango.c b/src/mango.c index c251107a..17386923 100644 --- a/src/mango.c +++ b/src/mango.c @@ -5908,7 +5908,7 @@ void touchdown(struct wl_listener *listener, void *data) { /* Find the client under the pointer and send the event along. */ xytonode(lx, ly, &surface, &c, NULL, &sx, &sy); - if (sloppyfocus) + if (sloppyfocus && c) focusclient(c, 0); if (surface != NULL) { From afd0f9278c4184e2f5c143cec3e661588bec4697 Mon Sep 17 00:00:00 2001 From: werapi Date: Sun, 30 Nov 2025 06:51:05 +0100 Subject: [PATCH 4/6] fix: correct emulation of cursor pointer from unhandled touch events --- src/mango.c | 101 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 37 deletions(-) diff --git a/src/mango.c b/src/mango.c index 17386923..5d2ebcba 100644 --- a/src/mango.c +++ b/src/mango.c @@ -5881,9 +5881,9 @@ void touchdown(struct wl_listener *listener, void *data) { struct wlr_touch_down_event *event = data; double lx, ly; double sx, sy; + double dx, dy; struct wlr_surface *surface; Client *c = NULL; - uint32_t serial = 0; Monitor *m; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -5908,48 +5908,54 @@ void touchdown(struct wl_listener *listener, void *data) { /* Find the client under the pointer and send the event along. */ xytonode(lx, ly, &surface, &c, NULL, &sx, &sy); - if (sloppyfocus && c) - focusclient(c, 0); + if (surface != NULL && wlr_surface_accepts_touch(surface, seat)) { + if (sloppyfocus && c) + focusclient(c, 0); - if (surface != NULL) { - serial = wlr_seat_touch_notify_down(seat, surface, event->time_msec, - event->touch_id, sx, sy); + wlr_seat_touch_notify_down(seat, surface, event->time_msec, + event->touch_id, sx, sy); + emulating_pointer_from_touch = false; + return; } - 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; + /* Emulate a mouse click if the touch event wasn't handled */ + if (!emulating_pointer_from_touch) { + emulating_pointer_from_touch = true; + emulated_pointer_touch_id = event->touch_id; - 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); + wlr_cursor_warp_closest(cursor, &event->touch->base, lx, ly); dx = lx - cursor->x; dy = ly - cursor->y; - motionnotify(motion_event->time_msec, &motion_event->pointer->base, dx, - dy, dx, dy); + motionnotify(event->time_msec, &event->touch->base, dx, dy, dx, dy); - button_event->button = BTN_LEFT; - button_event->state = WL_POINTER_BUTTON_STATE_PRESSED; - buttonpress(listener, button_event); + struct wlr_pointer_button_event button_event = { + .pointer = (struct wlr_pointer *)event->touch, + .time_msec = event->time_msec, + .button = BTN_LEFT, + .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)) { + if (emulating_pointer_from_touch) { + if (emulated_pointer_touch_id == event->touch_id) { + struct wlr_pointer_button_event button_event = { + .pointer = (struct wlr_pointer *)event->touch, + .time_msec = event->time_msec, + .button = BTN_LEFT, + .state = WL_POINTER_BUTTON_STATE_RELEASED}; + buttonpress(listener, &button_event); + + emulating_pointer_from_touch = false; + } 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); + if (!wlr_seat_touch_get_point(seat, event->touch_id)) { + return; } wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id); @@ -5957,7 +5963,11 @@ void touchup(struct wl_listener *listener, void *data) { } void touchframe(struct wl_listener *listener, void *data) { - wlr_seat_touch_notify_frame(seat); + if (emulating_pointer_from_touch) { + wlr_seat_pointer_notify_frame(seat); + } else { + wlr_seat_touch_notify_frame(seat); + } wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); } @@ -5965,9 +5975,23 @@ void touchmotion(struct wl_listener *listener, void *data) { struct wlr_touch_motion_event *event = data; double lx, ly; double sx, sy; + double dx, dy; struct wlr_surface *surface; Client *c = NULL; - struct wlr_touch_point *p = wlr_seat_touch_get_point(seat, event->touch_id); + struct wlr_touch_point *p = NULL; + + if (emulating_pointer_from_touch) { + if (emulated_pointer_touch_id == event->touch_id) { + wlr_cursor_absolute_to_layout_coords(cursor, &event->touch->base, + event->x, event->y, &lx, &ly); + dx = lx - cursor->x; + dy = ly - cursor->y; + motionnotify(event->time_msec, &event->touch->base, dx, dy, dx, dy); + } + return; + } + + p = wlr_seat_touch_get_point(seat, event->touch_id); if (!p) { return; @@ -5977,20 +6001,23 @@ void touchmotion(struct wl_listener *listener, void *data) { event->y, &lx, &ly); surface = p->surface; c = surface ? get_client_from_surface(surface) : NULL; - sx = lx - c->current.x; - sy = ly - c->current.y; - if (c != NULL) { - if (sloppyfocus) - focusclient(c, 0); - wlr_seat_touch_point_focus(seat, surface, event->time_msec, - event->touch_id, sx, sy); - } else { + if (!c) { if (sloppyfocus) focusclient(NULL, 0); wlr_seat_touch_point_clear_focus(seat, event->time_msec, event->touch_id); + wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); + return; } + + sx = lx - c->current.x; + sy = ly - c->current.y; + + if (sloppyfocus) + focusclient(c, 0); + wlr_seat_touch_point_focus(seat, surface, event->time_msec, event->touch_id, + sx, sy); wlr_seat_touch_notify_motion(seat, event->time_msec, event->touch_id, sx, sy); From c5d0eb78c2eb5f38b0a95adb6216bc3d5bf5cbd1 Mon Sep 17 00:00:00 2001 From: werapi Date: Mon, 1 Dec 2025 14:45:18 +0100 Subject: [PATCH 5/6] opt: hide cursor on touchdown --- src/mango.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/mango.c b/src/mango.c index 5d2ebcba..8a42b188 100644 --- a/src/mango.c +++ b/src/mango.c @@ -2098,7 +2098,11 @@ buttonpress(struct wl_listener *listener, void *data) { struct wlr_surface *old_pointer_focus_surface = seat->pointer_state.focused_surface; - handlecursoractivity(); + if (!event->pointer || + event->pointer->base.type != WLR_INPUT_DEVICE_TOUCH) { + handlecursoractivity(); + } + wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); if (check_trackpad_disabled(event->pointer)) { @@ -4431,7 +4435,9 @@ void motionnotify(uint32_t time, struct wlr_input_device *device, double dx, } wlr_cursor_move(cursor, device, dx, dy); - handlecursoractivity(); + if (!device || device->type != WLR_INPUT_DEVICE_TOUCH) { + handlecursoractivity(); + } wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); /* Update selmon (even while dragging a window) */ @@ -5888,6 +5894,10 @@ void touchdown(struct wl_listener *listener, void *data) { wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); + if (!cursor_hidden) { + hidecursor(NULL); + } + // Map the input to the appropriate output, to ensure that rotation is // handled. wl_list_for_each(m, &mons, link) { From 518185f64f24257ed9c53fe468b90094a657edbc Mon Sep 17 00:00:00 2001 From: werapi Date: Mon, 1 Dec 2025 19:35:29 +0100 Subject: [PATCH 6/6] fix: prevent crash when touch motion occurs over layer surfaces --- src/mango.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/mango.c b/src/mango.c index 8a42b188..64e7a464 100644 --- a/src/mango.c +++ b/src/mango.c @@ -6021,11 +6021,17 @@ void touchmotion(struct wl_listener *listener, void *data) { return; } - sx = lx - c->current.x; - sy = ly - c->current.y; + if (c->type == XDGShell || c->type == X11) { + sx = lx - c->current.x; + sy = ly - c->current.y; + if (sloppyfocus) + focusclient(c, 0); + } else { + LayerSurface *l = (LayerSurface *)c; + sx = lx - l->current.x; + sy = ly - l->current.y; + } - if (sloppyfocus) - focusclient(c, 0); wlr_seat_touch_point_focus(seat, surface, event->time_msec, event->touch_id, sx, sy); wlr_seat_touch_notify_motion(seat, event->time_msec, event->touch_id, sx,