From ac6087554123c98fa7bf80a37809344eee7c725f Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Sat, 26 Sep 2026 12:29:56 +0200 Subject: [PATCH] unclutter: update --- patches/unclutter/README.md | 2 +- patches/unclutter/unclutter.patch | 108 ++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 35 deletions(-) diff --git a/patches/unclutter/README.md b/patches/unclutter/README.md index 4de7d54..a50cda8 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-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) +- [2026-09-26](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 9c13dc1..0613a4f 100644 --- a/patches/unclutter/unclutter.patch +++ b/patches/unclutter/unclutter.patch @@ -1,15 +1,15 @@ -From 0987dd26a7b5dd0071fdb509b5ef61e0efbcb6cd Mon Sep 17 00:00:00 2001 +From 66537535757a3f0efe65a370f150506eb2a8d82f Mon Sep 17 00:00:00 2001 From: Guido Cella -Date: Thu, 17 Sep 2026 08:53:31 +0200 -Subject: [PATCH] hide the cursor when it isn't being used +Date: Sat, 26 Sep 2026 12:28:50 +0200 +Subject: [PATCH] hide the mouse cursor when it isn't being used --- config.def.h | 2 ++ - dwl.c | 40 +++++++++++++++++++++++++++++++++++++--- - 2 files changed, 39 insertions(+), 3 deletions(-) + dwl.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 75 insertions(+), 7 deletions(-) diff --git a/config.def.h b/config.def.h -index 13c5322..45c3c76 100644 +index a4019d3..fa640a1 100644 --- a/config.def.h +++ b/config.def.h @@ -103,6 +103,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right @@ -22,10 +22,10 @@ index 13c5322..45c3c76 100644 #define MODKEY WLR_MODIFIER_ALT diff --git a/dwl.c b/dwl.c -index f7bda0b..c8a2f3d 100644 +index ca97c30..7695341 100644 --- a/dwl.c +++ b/dwl.c -@@ -308,6 +308,8 @@ static void focusstack(const Arg *arg); +@@ -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); @@ -34,25 +34,31 @@ index f7bda0b..c8a2f3d 100644 static void handlesig(int signo); static void incnmaster(const Arg *arg); static void inputdevice(struct wl_listener *listener, void *data); -@@ -411,6 +413,8 @@ static struct wlr_pointer_constraint_v1 *active_constraint; +@@ -414,6 +416,15 @@ static struct wlr_pointer_constraint_v1 *active_constraint; static struct wlr_cursor *cursor; static struct wlr_xcursor_manager *cursor_mgr; +static struct wl_event_source *hide_source; +static bool cursor_hidden = false; ++static struct { ++ enum wp_cursor_shape_device_v1_shape shape; ++ struct wlr_surface *surface; ++ int hotspot_x; ++ int hotspot_y; ++} last_cursor; ++ static struct wlr_scene_rect *root_bg; static struct wlr_session_lock_manager_v1 *session_lock_mgr; -@@ -671,6 +675,8 @@ axisnotify(struct wl_listener *listener, void *data) +@@ -677,6 +688,7 @@ axisnotify(struct wl_listener *listener, void *data) + } + } + ++ handlecursoractivity(); + /* Notify the client with pointer focus of the axis event. */ wlr_seat_pointer_notify_axis(seat, event->time_msec, event->orientation, event->delta, - event->delta_discrete, event->source, event->relative_direction); -+ -+ handlecursoractivity(); - } - - void -@@ -684,6 +690,7 @@ buttonpress(struct wl_listener *listener, void *data) +@@ -694,6 +706,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -60,7 +66,7 @@ index f7bda0b..c8a2f3d 100644 switch (event->state) { case WL_POINTER_BUTTON_STATE_PRESSED: -@@ -1662,6 +1669,28 @@ handlesig(int signo) +@@ -1696,6 +1709,42 @@ handlesig(int signo) quit(NULL); } @@ -74,22 +80,36 @@ index f7bda0b..c8a2f3d 100644 + + cursor_hidden = false; + -+ wlr_seat_pointer_clear_focus(seat); -+ motionnotify(0, NULL, 0, 0, 0, 0); ++ if (last_cursor.shape) ++ wlr_cursor_set_xcursor(cursor, cursor_mgr, ++ wlr_cursor_shape_v1_name(last_cursor.shape)); ++ else ++ wlr_cursor_set_surface(cursor, last_cursor.surface, ++ last_cursor.hotspot_x, last_cursor.hotspot_y); ++ ++ /* Note that calling the functions below instead of manually saving the last ++ * cursor causes issues like making the cursor warp when clicking ReShade's ++ * menu, or can duplicate the cursor in the top left corner. */ ++ // wlr_seat_pointer_clear_focus(seat); ++ // motionnotify(0, NULL, 0, 0, 0, 0); +} + +int +hidecursor(void *data) +{ + wlr_cursor_unset_image(cursor); ++ /* Keep pointer focus so that things like browser tooltips don't disappear ++ * immediately if you set a short timeout. Uncomment the following line if you ++ * want them to disappear. */ ++ // wlr_seat_pointer_clear_focus(seat); + cursor_hidden = true; -+ return 1; ++ return 0; +} + void incnmaster(const Arg *arg) { -@@ -2032,6 +2061,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -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); @@ -97,7 +117,7 @@ index f7bda0b..c8a2f3d 100644 /* Update selmon (even while dragging a window) */ if (sloppyfocus) -@@ -2066,7 +2096,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -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. */ @@ -106,7 +126,7 @@ index f7bda0b..c8a2f3d 100644 wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); pointerfocus(c, l, surface, sx, sy, time); -@@ -2429,6 +2459,7 @@ run(char *startup_cmd) +@@ -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"); @@ -114,25 +134,45 @@ index f7bda0b..c8a2f3d 100644 /* Run the Wayland event loop. This does not return until you exit the * compositor. Starting the backend rigged up all of the necessary event -@@ -2452,7 +2483,7 @@ setcursor(struct wl_listener *listener, void *data) +@@ -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) -+ if (event->seat_client == seat->pointer_state.focused_client && !cursor_hidden) - wlr_cursor_set_surface(cursor, event->surface, - event->hotspot_x, event->hotspot_y); +- 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; ++ ++ if (!cursor_hidden) ++ wlr_cursor_set_surface(cursor, event->surface, ++ event->hotspot_x, event->hotspot_y); ++ } } -@@ -2466,7 +2497,7 @@ setcursorshape(struct wl_listener *listener, void *data) + + 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) -+ if (event->seat_client == seat->pointer_state.focused_client && !cursor_hidden) - wlr_cursor_set_xcursor(cursor, cursor_mgr, - wlr_cursor_shape_v1_name(event->shape)); +- 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)); ++ } } -@@ -2768,6 +2799,8 @@ setup(void) + + 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); @@ -141,7 +181,7 @@ index f7bda0b..c8a2f3d 100644 /* * Configures a seat, which is a single "seat" at which a user sits and * operates the computer. This conceptually includes up to one keyboard, -@@ -3185,6 +3218,7 @@ virtualpointer(struct wl_listener *listener, void *data) +@@ -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);