From 5453b7407535a7c7e079048c768979857b27d0ed Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Tue, 6 Aug 2024 21:02:45 +0200 Subject: [PATCH] update unclutter --- patches/unclutter/README.md | 2 +- patches/unclutter/unclutter.patch | 32 +++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/unclutter/README.md b/patches/unclutter/README.md index 9581257..0eeec1f 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-07-25](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) +- [2024-08-06](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 a43b033..406e5a7 100644 --- a/patches/unclutter/unclutter.patch +++ b/patches/unclutter/unclutter.patch @@ -1,4 +1,4 @@ -From 25765c6ff4a764010f2cbe5adfb024750e39f300 Mon Sep 17 00:00:00 2001 +From 52d5a05a6b4ca9555c072e103c2db454d2b35021 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?= @@ -26,10 +26,10 @@ index 22d2171..790c73d 100644 #define MODKEY WLR_MODIFIER_ALT diff --git a/dwl.c b/dwl.c -index 5f9491b..270fbf0 100644 +index 72892d9..4090d73 100644 --- a/dwl.c +++ b/dwl.c -@@ -291,6 +291,8 @@ static void focusstack(const Arg *arg); +@@ -292,6 +292,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 5f9491b..270fbf0 100644 static void handlesig(int signo); static void incnmaster(const Arg *arg); static void inputdevice(struct wl_listener *listener, void *data); -@@ -395,6 +397,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; +@@ -396,6 +398,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; static struct wlr_cursor *cursor; static struct wlr_xcursor_manager *cursor_mgr; @@ -53,7 +53,7 @@ index 5f9491b..270fbf0 100644 static struct wlr_scene_rect *root_bg; static struct wlr_session_lock_manager_v1 *session_lock_mgr; -@@ -587,6 +597,7 @@ axisnotify(struct wl_listener *listener, void *data) +@@ -588,6 +598,7 @@ 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); @@ -61,7 +61,7 @@ index 5f9491b..270fbf0 100644 /* 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. */ -@@ -605,6 +616,7 @@ buttonpress(struct wl_listener *listener, void *data) +@@ -606,6 +617,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -69,7 +69,7 @@ index 5f9491b..270fbf0 100644 switch (event->state) { case WL_POINTER_BUTTON_STATE_PRESSED: -@@ -1515,6 +1527,32 @@ handlesig(int signo) +@@ -1517,6 +1529,32 @@ handlesig(int signo) } } @@ -102,7 +102,7 @@ index 5f9491b..270fbf0 100644 void incnmaster(const Arg *arg) { -@@ -1854,6 +1892,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -1856,6 +1894,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 +110,7 @@ index 5f9491b..270fbf0 100644 /* Update selmon (even while dragging a window) */ if (sloppyfocus) -@@ -1878,7 +1917,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -1880,7 +1919,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 +119,7 @@ index 5f9491b..270fbf0 100644 wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); pointerfocus(c, surface, sx, sy, time); -@@ -2261,6 +2300,7 @@ run(char *startup_cmd) +@@ -2263,6 +2302,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 +127,7 @@ index 5f9491b..270fbf0 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 -@@ -2284,9 +2324,16 @@ setcursor(struct wl_listener *listener, void *data) +@@ -2286,9 +2326,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,7 +147,7 @@ index 5f9491b..270fbf0 100644 } void -@@ -2298,9 +2345,14 @@ setcursorshape(struct wl_listener *listener, void *data) +@@ -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 * actually has pointer focus first. If so, we can tell the cursor to * use the provided cursor shape. */ @@ -165,7 +165,7 @@ index 5f9491b..270fbf0 100644 } void -@@ -2599,6 +2651,9 @@ setup(void) +@@ -2604,6 +2656,9 @@ setup(void) cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); LISTEN_STATIC(&cursor_shape_mgr->events.request_set_shape, setcursorshape); @@ -175,10 +175,10 @@ index 5f9491b..270fbf0 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, -@@ -2981,6 +3036,7 @@ virtualpointer(struct wl_listener *listener, void *data) - wlr_cursor_attach_input_device(cursor, &pointer.base); +@@ -2986,6 +3041,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, &pointer.base, event->suggested_output); + wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); + handlecursoractivity(); }