From 20598d28dc15655637f95fe829afd03d8fcb8e73 Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Sun, 4 Oct 2026 22:50:40 +0200 Subject: [PATCH] unclutter: fix a rare crash when last_cursor points to freed memory I couldn't reproduce this, but this is also what mangowm does. Fixes https://codeberg.org/dwl/dwl-patches/issues/675 Co-authored-by: Kaon --- patches/unclutter/README.md | 2 +- patches/unclutter/unclutter.patch | 228 +++++++++++++++++------------- 2 files changed, 127 insertions(+), 103 deletions(-) diff --git a/patches/unclutter/README.md b/patches/unclutter/README.md index a50cda8..e3724e3 100644 --- a/patches/unclutter/README.md +++ b/patches/unclutter/README.md @@ -3,7 +3,7 @@ Hide the mouse cursor if it isn't being used for a certain period of time. ### Download - [git branch](https://codeberg.org/guidocella/dwl/src/branch/unclutter) -- [2026-09-26](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) +- [2026-10-04](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) ### Authors - [Guido Cella](https://github.com/guidocella) diff --git a/patches/unclutter/unclutter.patch b/patches/unclutter/unclutter.patch index 0613a4f..5abfed2 100644 --- a/patches/unclutter/unclutter.patch +++ b/patches/unclutter/unclutter.patch @@ -1,12 +1,12 @@ -From 66537535757a3f0efe65a370f150506eb2a8d82f Mon Sep 17 00:00:00 2001 +From 7a5a1c34dd099c209fff3f4447a5a404af0f3f12 Mon Sep 17 00:00:00 2001 From: Guido Cella -Date: Sat, 26 Sep 2026 12:28:50 +0200 +Date: Sun, 4 Oct 2026 22:48:42 +0200 Subject: [PATCH] hide the mouse cursor when it isn't being used --- - config.def.h | 2 ++ - dwl.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++----- - 2 files changed, 75 insertions(+), 7 deletions(-) + config.def.h | 2 + + dwl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/config.def.h b/config.def.h index a4019d3..fa640a1 100644 @@ -22,19 +22,21 @@ index a4019d3..fa640a1 100644 #define MODKEY WLR_MODIFIER_ALT diff --git a/dwl.c b/dwl.c -index ca97c30..7695341 100644 +index 216deb5..475733c 100644 --- a/dwl.c +++ b/dwl.c -@@ -311,6 +311,8 @@ static void focusstack(const Arg *arg); - static Client *focustop(Monitor *m); - static void fullscreennotify(struct wl_listener *listener, void *data); - static void gpureset(struct wl_listener *listener, void *data); +@@ -374,6 +374,10 @@ static Monitor *xytomon(double x, double y); + static void xytonode(double x, double y, struct wlr_surface **psurface, + Client **pc, LayerSurface **pl, double *nx, double *ny); + static void zoom(const Arg *arg); ++static void cursorsurfacedestroy(struct wl_listener *listener, void *data); +static void handlecursoractivity(void); +static int hidecursor(void *data); - static void handlesig(int signo); - static void incnmaster(const Arg *arg); - static void inputdevice(struct wl_listener *listener, void *data); -@@ -414,6 +416,15 @@ static struct wlr_pointer_constraint_v1 *active_constraint; ++static void trackcursorsurface(struct wlr_surface *surface); + + /* variables */ + static pid_t child_pid = -1; +@@ -414,6 +418,18 @@ static struct wlr_pointer_constraint_v1 *active_constraint; static struct wlr_cursor *cursor; static struct wlr_xcursor_manager *cursor_mgr; @@ -45,12 +47,15 @@ index ca97c30..7695341 100644 + struct wlr_surface *surface; + int hotspot_x; + int hotspot_y; -+} last_cursor; ++ struct wl_listener surface_destroy; ++} last_cursor = { ++ .surface_destroy.notify = cursorsurfacedestroy, ++}; + static struct wlr_scene_rect *root_bg; static struct wlr_session_lock_manager_v1 *session_lock_mgr; -@@ -677,6 +688,7 @@ axisnotify(struct wl_listener *listener, void *data) +@@ -676,6 +692,7 @@ axisnotify(struct wl_listener *listener, void *data) } } @@ -58,7 +63,7 @@ index ca97c30..7695341 100644 /* Notify the client with pointer focus of the axis event. */ wlr_seat_pointer_notify_axis(seat, event->time_msec, event->orientation, event->delta, -@@ -694,6 +706,7 @@ buttonpress(struct wl_listener *listener, void *data) +@@ -693,6 +710,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -66,10 +71,97 @@ index ca97c30..7695341 100644 switch (event->state) { case WL_POINTER_BUTTON_STATE_PRESSED: -@@ -1696,6 +1709,42 @@ handlesig(int signo) - quit(NULL); +@@ -2067,6 +2085,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d + + wlr_cursor_move(cursor, device, dx, dy); + wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); ++ handlecursoractivity(); + + /* Update selmon (even while dragging a window) */ + if (sloppyfocus) +@@ -2101,7 +2120,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d + /* If there's no client surface under the cursor, set the cursor image to a + * default. This is what makes the cursor image appear when you move it + * off of a client or over its border. */ +- if (!surface && !seat->drag) ++ if (!surface && !seat->drag && !cursor_hidden) + wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); + + pointerfocus(c, l, surface, sx, sy, time); +@@ -2463,6 +2482,7 @@ run(char *startup_cmd) + * monitor when displayed here */ + wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y); + wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); ++ handlecursoractivity(); + + /* Run the Wayland event loop. This does not return until you exit the + * compositor. Starting the backend rigged up all of the necessary event +@@ -2486,9 +2506,16 @@ setcursor(struct wl_listener *listener, void *data) + * use the provided surface as the cursor image. It will set the + * hardware cursor on the output that it's currently on and continue to + * do so as the cursor moves between outputs. */ +- if (event->seat_client == seat->pointer_state.focused_client) +- wlr_cursor_set_surface(cursor, event->surface, +- event->hotspot_x, event->hotspot_y); ++ if (event->seat_client == seat->pointer_state.focused_client) { ++ last_cursor.shape = 0; ++ trackcursorsurface(event->surface); ++ last_cursor.hotspot_x = event->hotspot_x; ++ last_cursor.hotspot_y = event->hotspot_y; ++ ++ if (!cursor_hidden) ++ wlr_cursor_set_surface(cursor, event->surface, ++ event->hotspot_x, event->hotspot_y); ++ } } + void +@@ -2500,9 +2527,14 @@ setcursorshape(struct wl_listener *listener, void *data) + /* This can be sent by any client, so we check to make sure this one + * actually has pointer focus first. If so, we can tell the cursor to + * use the provided cursor shape. */ +- if (event->seat_client == seat->pointer_state.focused_client) +- wlr_cursor_set_xcursor(cursor, cursor_mgr, +- wlr_cursor_shape_v1_name(event->shape)); ++ if (event->seat_client == seat->pointer_state.focused_client) { ++ last_cursor.shape = event->shape; ++ trackcursorsurface(NULL); ++ ++ if (!cursor_hidden) ++ wlr_cursor_set_xcursor(cursor, cursor_mgr, ++ wlr_cursor_shape_v1_name(event->shape)); ++ } + } + + void +@@ -2802,6 +2834,8 @@ setup(void) + 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); + ++ hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor); ++ + /* + * Configures a seat, which is a single "seat" at which a user sits and + * operates the computer. This conceptually includes up to one keyboard, +@@ -3217,6 +3251,7 @@ virtualpointer(struct wl_listener *listener, void *data) + if (event->suggested_output) + wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); + wlr_seat_set_capabilities(seat, seat->capabilities | WL_SEAT_CAPABILITY_POINTER); ++ handlecursoractivity(); + } + + Monitor * +@@ -3281,6 +3316,61 @@ zoom(const Arg *arg) + arrange(selmon); + } + ++void ++cursorsurfacedestroy(struct wl_listener *listener, void *data) ++{ ++ wl_list_remove(&listener->link); ++ last_cursor.surface = NULL; ++} ++ +void +handlecursoractivity(void) +{ @@ -83,9 +175,11 @@ index ca97c30..7695341 100644 + if (last_cursor.shape) + wlr_cursor_set_xcursor(cursor, cursor_mgr, + wlr_cursor_shape_v1_name(last_cursor.shape)); -+ else ++ else if (last_cursor.surface) + wlr_cursor_set_surface(cursor, last_cursor.surface, + last_cursor.hotspot_x, last_cursor.hotspot_y); ++ else ++ wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); + + /* Note that calling the functions below instead of manually saving the last + * cursor causes issues like making the cursor warp when clicking ReShade's @@ -106,89 +200,19 @@ index ca97c30..7695341 100644 + return 0; +} + - void - incnmaster(const Arg *arg) - { -@@ -2069,6 +2118,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d - - wlr_cursor_move(cursor, device, dx, dy); - wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); -+ handlecursoractivity(); - - /* Update selmon (even while dragging a window) */ - if (sloppyfocus) -@@ -2103,7 +2153,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d - /* If there's no client surface under the cursor, set the cursor image to a - * default. This is what makes the cursor image appear when you move it - * off of a client or over its border. */ -- if (!surface && !seat->drag) -+ if (!surface && !seat->drag && !cursor_hidden) - wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); - - pointerfocus(c, l, surface, sx, sy, time); -@@ -2465,6 +2515,7 @@ run(char *startup_cmd) - * monitor when displayed here */ - wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y); - wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); -+ handlecursoractivity(); - - /* Run the Wayland event loop. This does not return until you exit the - * compositor. Starting the backend rigged up all of the necessary event -@@ -2488,9 +2539,16 @@ setcursor(struct wl_listener *listener, void *data) - * use the provided surface as the cursor image. It will set the - * hardware cursor on the output that it's currently on and continue to - * do so as the cursor moves between outputs. */ -- if (event->seat_client == seat->pointer_state.focused_client) -- wlr_cursor_set_surface(cursor, event->surface, -- event->hotspot_x, event->hotspot_y); -+ if (event->seat_client == seat->pointer_state.focused_client) { -+ last_cursor.shape = 0; -+ last_cursor.surface = event->surface; -+ last_cursor.hotspot_x = event->hotspot_x; -+ last_cursor.hotspot_y = event->hotspot_y; ++void ++trackcursorsurface(struct wlr_surface *surface) ++{ ++ if (last_cursor.surface) ++ wl_list_remove(&last_cursor.surface_destroy.link); ++ last_cursor.surface = surface; ++ if (surface) ++ wl_signal_add(&surface->events.destroy, &last_cursor.surface_destroy); ++} + -+ if (!cursor_hidden) -+ wlr_cursor_set_surface(cursor, event->surface, -+ event->hotspot_x, event->hotspot_y); -+ } - } - + #ifdef XWAYLAND void -@@ -2502,9 +2560,14 @@ setcursorshape(struct wl_listener *listener, void *data) - /* This can be sent by any client, so we check to make sure this one - * actually has pointer focus first. If so, we can tell the cursor to - * use the provided cursor shape. */ -- if (event->seat_client == seat->pointer_state.focused_client) -- wlr_cursor_set_xcursor(cursor, cursor_mgr, -- wlr_cursor_shape_v1_name(event->shape)); -+ if (event->seat_client == seat->pointer_state.focused_client) { -+ last_cursor.shape = event->shape; -+ last_cursor.surface = NULL; -+ -+ if (!cursor_hidden) -+ wlr_cursor_set_xcursor(cursor, cursor_mgr, -+ wlr_cursor_shape_v1_name(event->shape)); -+ } - } - - void -@@ -2804,6 +2867,8 @@ setup(void) - 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); - -+ hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor); -+ - /* - * Configures a seat, which is a single "seat" at which a user sits and - * operates the computer. This conceptually includes up to one keyboard, -@@ -3219,6 +3284,7 @@ virtualpointer(struct wl_listener *listener, void *data) - if (event->suggested_output) - wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); - wlr_seat_set_capabilities(seat, seat->capabilities | WL_SEAT_CAPABILITY_POINTER); -+ handlecursoractivity(); - } - - Monitor * + activatex11(struct wl_listener *listener, void *data) -- -2.55.0 +2.56.0