jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2026-09-19 13:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update unclutter

Browse Source
This commit is contained in:
Guido Cella
2026-09-16 20:25:35 +02:00
parent aec8bbf5c3
commit 005596c2e8
2 changed files with 37 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/unclutter/README.md
+1 -1
View File
@@ -2,8 +2,8 @@
Hide the mouse cursor if it isn't being used for a certain period of time. Hide the mouse cursor if it isn't being used for a certain period of time.
### Download ### Download
- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/unclutter/unclutter.patch)
- [git branch](https://codeberg.org/guidocella/dwl/src/branch/unclutter) - [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)
### Authors ### Authors
- [Guido Cella](https://github.com/guidocella) - [Guido Cella](https://github.com/guidocella)
patches/unclutter/unclutter.patch
+36 -80
View File
@@ -1,18 +1,22 @@
From 3e8ba5681dc34d7bf4229708af1f4eab243f520b Mon Sep 17 00:00:00 2001 From f8f6f6e20db7eaa0800b16f698907cfffab5f93e Mon Sep 17 00:00:00 2001
From: nate zhou <gnuunixchad@outlook.com> From: Guido Cella <guido@guidocella.xyz>
Date: Fri, 10 Apr 2026 19:13:25 +0800 Date: Wed, 16 Sep 2026 20:22:31 +0200
Subject: [PATCH] Patch: unclutter-0.8.patch Subject: [PATCH] =?UTF-8?q?hide=20the=20mouse=20cursor=20if=20it=20isn?=
=?UTF-8?q?=E2=80=99t=20being=20used?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--- ---
config.def.h | 2 ++ config.def.h | 2 ++
dwl.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------ dwl.c | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 65 insertions(+), 7 deletions(-) 2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index 8a6eda0..0a1fff5 100644 index 13c5322..45c3c76 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -102,6 +102,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right @@ -103,6 +103,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; static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
@@ -22,10 +26,10 @@ index 8a6eda0..0a1fff5 100644
#define MODKEY WLR_MODIFIER_ALT #define MODKEY WLR_MODIFIER_ALT
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 44f3ad9..ac21ca3 100644 index f7bda0b..aabaa0d 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -288,6 +288,8 @@ static void focusstack(const Arg *arg); @@ -308,6 +308,8 @@ static void focusstack(const Arg *arg);
static Client *focustop(Monitor *m); static Client *focustop(Monitor *m);
static void fullscreennotify(struct wl_listener *listener, void *data); static void fullscreennotify(struct wl_listener *listener, void *data);
static void gpureset(struct wl_listener *listener, void *data); static void gpureset(struct wl_listener *listener, void *data);
@@ -34,30 +38,25 @@ index 44f3ad9..ac21ca3 100644
static void handlesig(int signo); static void handlesig(int signo);
static void incnmaster(const Arg *arg); static void incnmaster(const Arg *arg);
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
@@ -389,6 +391,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint; @@ -411,6 +413,8 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
static struct wlr_cursor *cursor; static struct wlr_cursor *cursor;
static struct wlr_xcursor_manager *cursor_mgr; static struct wlr_xcursor_manager *cursor_mgr;
+static struct wl_event_source *hide_source; +static struct wl_event_source *hide_source;
+static bool cursor_hidden = false; +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_scene_rect *root_bg;
static struct wlr_session_lock_manager_v1 *session_lock_mgr; static struct wlr_session_lock_manager_v1 *session_lock_mgr;
@@ -610,6 +620,7 @@ axisnotify(struct wl_listener *listener, void *data) @@ -671,6 +675,8 @@ axisnotify(struct wl_listener *listener, void *data)
* for example when you move the scroll wheel. */ wlr_seat_pointer_notify_axis(seat,
struct wlr_pointer_axis_event *event = data; event->time_msec, event->orientation, event->delta,
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); event->delta_discrete, event->source, event->relative_direction);
+
+ handlecursoractivity(); + handlecursoractivity();
/* TODO: allow usage of scroll wheel for mousebindings, it can be implemented }
* by checking the event's orientation and the delta of the event */
/* Notify the client with pointer focus of the axis event. */ void
@@ -628,6 +639,7 @@ buttonpress(struct wl_listener *listener, void *data) @@ -684,6 +690,7 @@ buttonpress(struct wl_listener *listener, void *data)
const Button *b; const Button *b;
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -65,7 +64,7 @@ index 44f3ad9..ac21ca3 100644
switch (event->state) { switch (event->state) {
case WL_POINTER_BUTTON_STATE_PRESSED: case WL_POINTER_BUTTON_STATE_PRESSED:
@@ -1566,6 +1578,32 @@ handlesig(int signo) @@ -1662,6 +1669,28 @@ handlesig(int signo)
quit(NULL); quit(NULL);
} }
@@ -79,12 +78,8 @@ index 44f3ad9..ac21ca3 100644
+ +
+ cursor_hidden = false; + cursor_hidden = false;
+ +
+ if (last_cursor.shape) + wlr_seat_pointer_clear_focus(seat);
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, + motionnotify(0, NULL, 0, 0, 0, 0);
+ 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);
+} +}
+ +
+int +int
@@ -98,7 +93,7 @@ index 44f3ad9..ac21ca3 100644
void void
incnmaster(const Arg *arg) incnmaster(const Arg *arg)
{ {
@@ -1907,6 +1945,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -2032,6 +2061,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
wlr_cursor_move(cursor, device, dx, dy); wlr_cursor_move(cursor, device, dx, dy);
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -106,7 +101,7 @@ index 44f3ad9..ac21ca3 100644
/* Update selmon (even while dragging a window) */ /* Update selmon (even while dragging a window) */
if (sloppyfocus) if (sloppyfocus)
@@ -1931,7 +1970,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -2066,7 +2096,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 /* 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 * default. This is what makes the cursor image appear when you move it
* off of a client or over its border. */ * off of a client or over its border. */
@@ -114,8 +109,8 @@ index 44f3ad9..ac21ca3 100644
+ if (!surface && !seat->drag && !cursor_hidden) + if (!surface && !seat->drag && !cursor_hidden)
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
pointerfocus(c, surface, sx, sy, time); pointerfocus(c, l, surface, sx, sy, time);
@@ -2288,6 +2327,7 @@ run(char *startup_cmd) @@ -2429,6 +2459,7 @@ run(char *startup_cmd)
* monitor when displayed here */ * monitor when displayed here */
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y); wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
@@ -123,62 +118,23 @@ index 44f3ad9..ac21ca3 100644
/* Run the Wayland event loop. This does not return until you exit the /* Run the Wayland event loop. This does not return until you exit the
* compositor. Starting the backend rigged up all of the necessary event * compositor. Starting the backend rigged up all of the necessary event
@@ -2311,9 +2351,16 @@ setcursor(struct wl_listener *listener, void *data) @@ -2768,6 +2799,8 @@ setup(void)
* 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;
+
+ if (!cursor_hidden)
+ wlr_cursor_set_surface(cursor, event->surface,
+ event->hotspot_x, event->hotspot_y);
+ }
}
void
@@ -2325,9 +2372,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
@@ -2618,6 +2670,9 @@ setup(void)
cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); 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); 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), + hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor);
+ hidecursor, cursor);
+ +
/* /*
* Configures a seat, which is a single "seat" at which a user sits and * Configures a seat, which is a single "seat" at which a user sits and
* operates the computer. This conceptually includes up to one keyboard, * operates the computer. This conceptually includes up to one keyboard,
@@ -3002,6 +3057,7 @@ virtualpointer(struct wl_listener *listener, void *data) @@ -3185,6 +3218,7 @@ virtualpointer(struct wl_listener *listener, void *data)
wlr_cursor_attach_input_device(cursor, device);
if (event->suggested_output) if (event->suggested_output)
wlr_cursor_map_input_to_output(cursor, device, 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(); + handlecursoractivity();
} }
Monitor * Monitor *
-- --
2.53.0 2.55.0