mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-11-03 11:52:25 +00:00
I couldn't reproduce this, but this is also what mangowm does. Fixes https://codeberg.org/dwl/dwl-patches/issues/675 Co-authored-by: Kaon <uriel@tuta.com>
219 lines
7.4 KiB
Diff
219 lines
7.4 KiB
Diff
From 7a5a1c34dd099c209fff3f4447a5a404af0f3f12 Mon Sep 17 00:00:00 2001
|
|
From: Guido Cella <guido@guidocella.xyz>
|
|
Date: Sun, 4 Oct 2026 22:48:42 +0200
|
|
Subject: [PATCH] hide the mouse cursor when it isn't being used
|
|
|
|
---
|
|
config.def.h | 2 +
|
|
dwl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++----
|
|
2 files changed, 99 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
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
|
|
*/
|
|
static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
|
|
|
|
+static const int cursor_timeout = 5;
|
|
+
|
|
/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
|
|
#define MODKEY WLR_MODIFIER_ALT
|
|
|
|
diff --git a/dwl.c b/dwl.c
|
|
index 216deb5..475733c 100644
|
|
--- a/dwl.c
|
|
+++ b/dwl.c
|
|
@@ -374,6 +374,10 @@ static Monitor *xytomon(double x, double y);
|
|
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
|
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
|
static void zoom(const Arg *arg);
|
|
+static void cursorsurfacedestroy(struct wl_listener *listener, void *data);
|
|
+static void handlecursoractivity(void);
|
|
+static int hidecursor(void *data);
|
|
+static void trackcursorsurface(struct wlr_surface *surface);
|
|
|
|
/* variables */
|
|
static pid_t child_pid = -1;
|
|
@@ -414,6 +418,18 @@ 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;
|
|
+ struct wl_listener surface_destroy;
|
|
+} last_cursor = {
|
|
+ .surface_destroy.notify = cursorsurfacedestroy,
|
|
+};
|
|
+
|
|
|
|
static struct wlr_scene_rect *root_bg;
|
|
static struct wlr_session_lock_manager_v1 *session_lock_mgr;
|
|
@@ -676,6 +692,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,
|
|
@@ -693,6 +710,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 WL_POINTER_BUTTON_STATE_PRESSED:
|
|
@@ -2067,6 +2085,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);
|
|
+ handlecursoractivity();
|
|
|
|
/* Update selmon (even while dragging a window) */
|
|
if (sloppyfocus)
|
|
@@ -2101,7 +2120,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. */
|
|
- if (!surface && !seat->drag)
|
|
+ if (!surface && !seat->drag && !cursor_hidden)
|
|
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
|
|
|
pointerfocus(c, l, surface, sx, sy, time);
|
|
@@ -2463,6 +2482,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");
|
|
+ handlecursoractivity();
|
|
|
|
/* Run the Wayland event loop. This does not return until you exit the
|
|
* compositor. Starting the backend rigged up all of the necessary event
|
|
@@ -2486,9 +2506,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)
|
|
- 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;
|
|
+ trackcursorsurface(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
|
|
@@ -2500,9 +2527,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;
|
|
+ trackcursorsurface(NULL);
|
|
+
|
|
+ if (!cursor_hidden)
|
|
+ wlr_cursor_set_xcursor(cursor, cursor_mgr,
|
|
+ wlr_cursor_shape_v1_name(event->shape));
|
|
+ }
|
|
}
|
|
|
|
void
|
|
@@ -2802,6 +2834,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);
|
|
|
|
+ hide_source = wl_event_loop_add_timer(event_loop, hidecursor, cursor);
|
|
+
|
|
/*
|
|
* Configures a seat, which is a single "seat" at which a user sits and
|
|
* operates the computer. This conceptually includes up to one keyboard,
|
|
@@ -3217,6 +3251,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);
|
|
+ handlecursoractivity();
|
|
}
|
|
|
|
Monitor *
|
|
@@ -3281,6 +3316,61 @@ zoom(const Arg *arg)
|
|
arrange(selmon);
|
|
}
|
|
|
|
+void
|
|
+cursorsurfacedestroy(struct wl_listener *listener, void *data)
|
|
+{
|
|
+ wl_list_remove(&listener->link);
|
|
+ last_cursor.surface = NULL;
|
|
+}
|
|
+
|
|
+void
|
|
+handlecursoractivity(void)
|
|
+{
|
|
+ wl_event_source_timer_update(hide_source, cursor_timeout * 1000);
|
|
+
|
|
+ if (!cursor_hidden)
|
|
+ return;
|
|
+
|
|
+ cursor_hidden = false;
|
|
+
|
|
+ if (last_cursor.shape)
|
|
+ wlr_cursor_set_xcursor(cursor, cursor_mgr,
|
|
+ wlr_cursor_shape_v1_name(last_cursor.shape));
|
|
+ else if (last_cursor.surface)
|
|
+ wlr_cursor_set_surface(cursor, last_cursor.surface,
|
|
+ last_cursor.hotspot_x, last_cursor.hotspot_y);
|
|
+ else
|
|
+ wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
|
+
|
|
+ /* 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 0;
|
|
+}
|
|
+
|
|
+void
|
|
+trackcursorsurface(struct wlr_surface *surface)
|
|
+{
|
|
+ if (last_cursor.surface)
|
|
+ wl_list_remove(&last_cursor.surface_destroy.link);
|
|
+ last_cursor.surface = surface;
|
|
+ if (surface)
|
|
+ wl_signal_add(&surface->events.destroy, &last_cursor.surface_destroy);
|
|
+}
|
|
+
|
|
#ifdef XWAYLAND
|
|
void
|
|
activatex11(struct wl_listener *listener, void *data)
|
|
--
|
|
2.56.0
|
|
|