From 938cd817a46d4196bbcbfef5213653d708e2b968 Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Mon, 9 Jun 2025 11:13:52 +0200 Subject: [PATCH] update unclutter --- patches/unclutter/README.md | 2 +- patches/unclutter/unclutter.patch | 48 +++++++++++++++++-------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/patches/unclutter/README.md b/patches/unclutter/README.md index 0eeec1f..48bf85a 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) -- [2024-08-06](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) +- [2025-06-09](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 406e5a7..4c9aede 100644 --- a/patches/unclutter/unclutter.patch +++ b/patches/unclutter/unclutter.patch @@ -1,4 +1,4 @@ -From 52d5a05a6b4ca9555c072e103c2db454d2b35021 Mon Sep 17 00:00:00 2001 +From 68914f40359ebccc7b684a1f74d82419b1796cdf Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Thu, 25 Jul 2024 17:59:05 +0200 Subject: [PATCH] =?UTF-8?q?hide=20the=20mouse=20cursor=20if=20it=20isn?= @@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit --- config.def.h | 2 ++ - dwl.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------ - 2 files changed, 65 insertions(+), 7 deletions(-) + dwl.c | 74 +++++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/config.def.h b/config.def.h index 22d2171..790c73d 100644 @@ -26,10 +26,10 @@ index 22d2171..790c73d 100644 #define MODKEY WLR_MODIFIER_ALT diff --git a/dwl.c b/dwl.c -index 72892d9..4090d73 100644 +index 775dadf..621779e 100644 --- a/dwl.c +++ b/dwl.c -@@ -292,6 +292,8 @@ static void focusstack(const Arg *arg); +@@ -288,6 +288,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); @@ -38,7 +38,7 @@ index 72892d9..4090d73 100644 static void handlesig(int signo); static void incnmaster(const Arg *arg); static void inputdevice(struct wl_listener *listener, void *data); -@@ -396,6 +398,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; +@@ -389,6 +391,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; static struct wlr_cursor *cursor; static struct wlr_xcursor_manager *cursor_mgr; @@ -53,15 +53,19 @@ index 72892d9..4090d73 100644 static struct wlr_scene_rect *root_bg; static struct wlr_session_lock_manager_v1 *session_lock_mgr; -@@ -588,6 +598,7 @@ axisnotify(struct wl_listener *listener, void *data) +@@ -609,8 +619,9 @@ axisnotify(struct wl_listener *listener, void *data) * for example when you move the scroll wheel. */ struct wlr_pointer_axis_event *event = data; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); +- /* TODO: allow usage of scroll wheel for mousebindings, it can be implemented +- * by checking the event's orientation and the delta of the event */ + handlecursoractivity(); - /* TODO: allow usage of scroll whell for mousebindings, it can be implemented - * checking the event's orientation and the delta of the event */ ++ /* TODO: allow usage of scroll whell for mousebindings, it can be implemented ++ * checking the event's orientation and the delta of the event */ /* Notify the client with pointer focus of the axis event. */ -@@ -606,6 +617,7 @@ buttonpress(struct wl_listener *listener, void *data) + wlr_seat_pointer_notify_axis(seat, + event->time_msec, event->orientation, event->delta, +@@ -627,6 +638,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -69,8 +73,8 @@ index 72892d9..4090d73 100644 switch (event->state) { case WL_POINTER_BUTTON_STATE_PRESSED: -@@ -1517,6 +1529,32 @@ handlesig(int signo) - } +@@ -1563,6 +1575,32 @@ handlesig(int signo) + quit(NULL); } +void @@ -102,7 +106,7 @@ index 72892d9..4090d73 100644 void incnmaster(const Arg *arg) { -@@ -1856,6 +1894,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -1903,6 +1941,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); @@ -110,7 +114,7 @@ index 72892d9..4090d73 100644 /* Update selmon (even while dragging a window) */ if (sloppyfocus) -@@ -1880,7 +1919,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -1927,7 +1966,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. */ @@ -119,7 +123,7 @@ index 72892d9..4090d73 100644 wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); pointerfocus(c, surface, sx, sy, time); -@@ -2263,6 +2302,7 @@ run(char *startup_cmd) +@@ -2284,6 +2323,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"); @@ -127,7 +131,7 @@ index 72892d9..4090d73 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 -@@ -2286,9 +2326,16 @@ setcursor(struct wl_listener *listener, void *data) +@@ -2307,9 +2347,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. */ @@ -147,8 +151,8 @@ index 72892d9..4090d73 100644 } void -@@ -2300,9 +2347,14 @@ setcursorshape(struct wl_listener *listener, void *data) - /* This can be sent by any client, so we check to make sure this one is +@@ -2321,9 +2368,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) @@ -165,9 +169,9 @@ index 72892d9..4090d73 100644 } void -@@ -2604,6 +2656,9 @@ setup(void) +@@ -2614,6 +2666,9 @@ setup(void) cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); - LISTEN_STATIC(&cursor_shape_mgr->events.request_set_shape, setcursorshape); + wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape); + hide_source = wl_event_loop_add_timer(wl_display_get_event_loop(dpy), + hidecursor, cursor); @@ -175,7 +179,7 @@ index 72892d9..4090d73 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, -@@ -2986,6 +3041,7 @@ virtualpointer(struct wl_listener *listener, void *data) +@@ -2998,6 +3053,7 @@ virtualpointer(struct wl_listener *listener, void *data) wlr_cursor_attach_input_device(cursor, device); if (event->suggested_output) wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); @@ -184,5 +188,5 @@ index 72892d9..4090d73 100644 Monitor * -- -2.45.2 +2.49.0