mirror of
				https://codeberg.org/dwl/dwl-patches.git
				synced 2025-11-04 05:54:20 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			189 lines
		
	
	
		
			6.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			189 lines
		
	
	
		
			6.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 52d5a05a6b4ca9555c072e103c2db454d2b35021 Mon Sep 17 00:00:00 2001
 | 
						|
From: Guido Cella <guido@guidocella.xyz>
 | 
						|
Date: Thu, 25 Jul 2024 17:59:05 +0200
 | 
						|
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 ++
 | 
						|
 dwl.c        | 70 ++++++++++++++++++++++++++++++++++++++++++++++------
 | 
						|
 2 files changed, 65 insertions(+), 7 deletions(-)
 | 
						|
 | 
						|
diff --git a/config.def.h b/config.def.h
 | 
						|
index 22d2171..790c73d 100644
 | 
						|
--- a/config.def.h
 | 
						|
+++ b/config.def.h
 | 
						|
@@ -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;
 | 
						|
 
 | 
						|
+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 72892d9..4090d73 100644
 | 
						|
--- a/dwl.c
 | 
						|
+++ b/dwl.c
 | 
						|
@@ -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);
 | 
						|
+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);
 | 
						|
@@ -396,6 +398,14 @@ 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;
 | 
						|
+} last_cursor;
 | 
						|
 
 | 
						|
 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)
 | 
						|
 	 * for example when you move the scroll wheel. */
 | 
						|
 	struct wlr_pointer_axis_event *event = data;
 | 
						|
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
 | 
						|
+	handlecursoractivity();
 | 
						|
 	/* 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)
 | 
						|
 	const Button *b;
 | 
						|
 
 | 
						|
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
 | 
						|
+	handlecursoractivity();
 | 
						|
 
 | 
						|
 	switch (event->state) {
 | 
						|
 	case WL_POINTER_BUTTON_STATE_PRESSED:
 | 
						|
@@ -1517,6 +1529,32 @@ handlesig(int signo)
 | 
						|
 	}
 | 
						|
 }
 | 
						|
 
 | 
						|
+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
 | 
						|
+		wlr_cursor_set_surface(cursor, last_cursor.surface,
 | 
						|
+				last_cursor.hotspot_x, last_cursor.hotspot_y);
 | 
						|
+}
 | 
						|
+
 | 
						|
+int
 | 
						|
+hidecursor(void *data)
 | 
						|
+{
 | 
						|
+	wlr_cursor_unset_image(cursor);
 | 
						|
+	cursor_hidden = true;
 | 
						|
+	return 1;
 | 
						|
+}
 | 
						|
+
 | 
						|
 void
 | 
						|
 incnmaster(const Arg *arg)
 | 
						|
 {
 | 
						|
@@ -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);
 | 
						|
+		handlecursoractivity();
 | 
						|
 
 | 
						|
 		/* 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
 | 
						|
 	/* 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, surface, sx, sy, time);
 | 
						|
@@ -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");
 | 
						|
+	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
 | 
						|
@@ -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. */
 | 
						|
-	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
 | 
						|
@@ -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. */
 | 
						|
-	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
 | 
						|
@@ -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);
 | 
						|
 
 | 
						|
+	hide_source = wl_event_loop_add_timer(wl_display_get_event_loop(dpy),
 | 
						|
+			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,
 | 
						|
@@ -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, device, event->suggested_output);
 | 
						|
+	handlecursoractivity();
 | 
						|
 }
 | 
						|
 
 | 
						|
 Monitor *
 | 
						|
-- 
 | 
						|
2.45.2
 | 
						|
 |