mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-09-09 12:45:00 +00:00

Remember the last cursor shape when restoring the cursor. Remove the condition that returns early when a pointer constraint is active because it is not necessary now that pointer focus is no longer cleared. I didn't call wlr_seat_pointer_notify_enter() while the cursor is hidden to avoid restoring it, but this is no longer necessary now that setcursor() and setcursorshape() don't change the cursor while it is hidden: those calls were what restored the cursor. By calling wlr_seat_pointer_notify_enter() even when the cursor is hidden, we no longer have to manually restore pointer focus when the cursor is restored.
189 lines
6.5 KiB
Diff
189 lines
6.5 KiB
Diff
From 0ee17f953cf86b799cfff6b47beedb666b391e64 Mon Sep 17 00:00:00 2001
|
|
From: Guido Cella <guido@guidocella.xyz>
|
|
Date: Wed, 27 Mar 2024 18:36:15 +0100
|
|
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 8847e58..9e3ab79 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
|
|
*/
|
|
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 bf763df..a19e026 100644
|
|
--- a/dwl.c
|
|
+++ b/dwl.c
|
|
@@ -283,6 +283,8 @@ static void focusmon(const Arg *arg);
|
|
static void focusstack(const Arg *arg);
|
|
static Client *focustop(Monitor *m);
|
|
static void fullscreennotify(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;
|
|
|
|
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;
|
|
@@ -565,6 +575,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. */
|
|
@@ -583,6 +594,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)
|
|
}
|
|
}
|
|
|
|
+void
|
|
+handlecursoractivity()
|
|
+{
|
|
+ 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)
|
|
{
|
|
@@ -1721,6 +1759,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)
|
|
@@ -1756,7 +1795,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);
|
|
@@ -2102,6 +2141,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
|
|
@@ -2125,9 +2165,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
|
|
@@ -2139,9 +2186,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
|
|
@@ -2434,6 +2486,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,
|
|
@@ -2856,6 +2911,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);
|
|
+ handlecursoractivity();
|
|
}
|
|
|
|
Monitor *
|
|
--
|
|
2.44.0
|
|
|