From 4c5d1df47f82195d46b2caab1b666c3c0c3df4e7 Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Tue, 16 Jul 2024 10:15:08 +0200 Subject: [PATCH] update unclutter --- patches/unclutter/README.md | 2 +- patches/unclutter/unclutter.patch | 38 +++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/patches/unclutter/README.md b/patches/unclutter/README.md index b3c17fe..7f3dde8 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-04-06](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) +- [2024-07-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch) - [v0.4](https://github.com/djpohly/dwl/compare/main...dm1tz:04-unclutter.patch) - [2022-02-12](https://github.com/djpohly/dwl/compare/main...guidocella:unclutter.patch) diff --git a/patches/unclutter/unclutter.patch b/patches/unclutter/unclutter.patch index 24e8c65..2ba9381 100644 --- a/patches/unclutter/unclutter.patch +++ b/patches/unclutter/unclutter.patch @@ -1,4 +1,4 @@ -From 0ee17f953cf86b799cfff6b47beedb666b391e64 Mon Sep 17 00:00:00 2001 +From 18781b51330a56198b359497377edd426376b72d Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Wed, 27 Mar 2024 18:36:15 +0100 Subject: [PATCH] =?UTF-8?q?hide=20the=20mouse=20cursor=20if=20it=20isn?= @@ -13,10 +13,10 @@ Content-Transfer-Encoding: 8bit 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/config.def.h b/config.def.h -index 8847e58..9e3ab79 100644 +index 22d2171..790c73d 100644 --- a/config.def.h +++ b/config.def.h -@@ -101,6 +101,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right +@@ -106,6 +106,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right */ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; @@ -26,19 +26,19 @@ index 8847e58..9e3ab79 100644 #define MODKEY WLR_MODIFIER_ALT diff --git a/dwl.c b/dwl.c -index bf763df..a19e026 100644 +index 5bf995e..dc3b0c2 100644 --- a/dwl.c +++ b/dwl.c -@@ -283,6 +283,8 @@ static void focusmon(const Arg *arg); - static void focusstack(const Arg *arg); +@@ -291,6 +291,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); +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); -@@ -385,6 +387,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; +@@ -395,6 +397,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 bf763df..a19e026 100644 static struct wlr_scene_rect *root_bg; static struct wlr_session_lock_manager_v1 *session_lock_mgr; -@@ -565,6 +575,7 @@ axisnotify(struct wl_listener *listener, void *data) +@@ -587,6 +597,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,15 +61,15 @@ index bf763df..a19e026 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. */ -@@ -583,6 +594,7 @@ buttonpress(struct wl_listener *listener, void *data) +@@ -605,6 +616,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); + handlecursoractivity(); switch (event->state) { - case WLR_BUTTON_PRESSED: -@@ -1388,6 +1400,32 @@ handlesig(int signo) + case WL_POINTER_BUTTON_STATE_PRESSED: +@@ -1514,6 +1526,32 @@ handlesig(int signo) } } @@ -102,7 +102,7 @@ index bf763df..a19e026 100644 void incnmaster(const Arg *arg) { -@@ -1721,6 +1759,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -1853,6 +1891,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 bf763df..a19e026 100644 /* Update selmon (even while dragging a window) */ if (sloppyfocus) -@@ -1756,7 +1795,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d +@@ -1877,7 +1916,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 bf763df..a19e026 100644 wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); pointerfocus(c, surface, sx, sy, time); -@@ -2102,6 +2141,7 @@ run(char *startup_cmd) +@@ -2260,6 +2299,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 bf763df..a19e026 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 -@@ -2125,9 +2165,16 @@ setcursor(struct wl_listener *listener, void *data) +@@ -2283,9 +2323,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 bf763df..a19e026 100644 } void -@@ -2139,9 +2186,14 @@ setcursorshape(struct wl_listener *listener, void *data) +@@ -2297,9 +2344,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 bf763df..a19e026 100644 } void -@@ -2434,6 +2486,9 @@ setup(void) +@@ -2598,6 +2650,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,7 +175,7 @@ index bf763df..a19e026 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, -@@ -2856,6 +2911,7 @@ virtualpointer(struct wl_listener *listener, void *data) +@@ -2980,6 +3035,7 @@ virtualpointer(struct wl_listener *listener, void *data) wlr_cursor_attach_input_device(cursor, &pointer.base); if (event->suggested_output) wlr_cursor_map_input_to_output(cursor, &pointer.base, event->suggested_output); @@ -184,5 +184,5 @@ index bf763df..a19e026 100644 Monitor * -- -2.44.0 +2.45.2