diff --git a/unclutter/unclutter.patch b/unclutter/unclutter.patch index c490ea1..1683f44 100644 --- a/unclutter/unclutter.patch +++ b/unclutter/unclutter.patch @@ -1,31 +1,35 @@ -From e087e6a3fcbdddcc323985a06015519b9f179665 Mon Sep 17 00:00:00 2001 -From: Ben Collerson -Date: Mon, 4 Dec 2023 13:06:19 +1000 -Subject: [PATCH] unclutter +From 66ec76f9742ca8a60ef317be848355f28b307c78 Mon Sep 17 00:00:00 2001 +From: Guido Cella +Date: Thu, 25 Jan 2024 19:19:45 +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 | 42 +++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 43 insertions(+), 1 deletion(-) + dwl.c | 42 ++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h -index a8ed61d9..2e049f78 100644 +index 9009517..a85ca27 100644 --- a/config.def.h +++ b/config.def.h -@@ -95,6 +95,8 @@ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE +@@ -101,6 +101,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right */ - static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; - static const double accel_speed = 0.0; + static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; + +static const int cursor_timeout = 5; + - /* You can choose between: - LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle - LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right + /* 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 4d19357f..23cb42e8 100644 +index 76ed8aa..4239cf0 100644 --- a/dwl.c +++ b/dwl.c -@@ -269,6 +269,8 @@ static void focusmon(const Arg *arg); +@@ -271,6 +271,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); @@ -34,7 +38,7 @@ index 4d19357f..23cb42e8 100644 static void handlesig(int signo); static void incnmaster(const Arg *arg); static void inputdevice(struct wl_listener *listener, void *data); -@@ -364,6 +366,8 @@ static struct wlr_cursor_shape_manager_v1 *cursor_shape_mgr; +@@ -368,6 +370,8 @@ static struct wlr_cursor_shape_manager_v1 *cursor_shape_mgr; static struct wlr_cursor *cursor; static struct wlr_xcursor_manager *cursor_mgr; @@ -43,7 +47,7 @@ index 4d19357f..23cb42e8 100644 static struct wlr_scene_rect *root_bg; static struct wlr_session_lock_manager_v1 *session_lock_mgr; -@@ -540,6 +544,7 @@ axisnotify(struct wl_listener *listener, void *data) +@@ -549,6 +553,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); @@ -51,7 +55,7 @@ index 4d19357f..23cb42e8 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. */ -@@ -558,6 +563,7 @@ buttonpress(struct wl_listener *listener, void *data) +@@ -567,6 +572,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -59,7 +63,7 @@ index 4d19357f..23cb42e8 100644 switch (event->state) { case WLR_BUTTON_PRESSED: -@@ -1311,6 +1317,29 @@ handlesig(int signo) +@@ -1320,6 +1326,29 @@ handlesig(int signo) } } @@ -67,10 +71,11 @@ index 4d19357f..23cb42e8 100644 +handlecursoractivity(bool restore_focus) +{ + wl_event_source_timer_update(hide_source, cursor_timeout * 1000); -+ if (cursor_hidden) { -+ wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); + ++ if (cursor_hidden) { ++ wlr_cursor_set_xcursor(cursor, cursor_mgr, "left_ptr"); + cursor_hidden = false; ++ + if (restore_focus) + motionnotify(0); + } @@ -80,7 +85,6 @@ index 4d19357f..23cb42e8 100644 +hidecursor(void *data) +{ + wlr_cursor_unset_image(cursor); -+ + wlr_seat_pointer_notify_clear_focus(seat); + cursor_hidden = true; + return 1; @@ -89,7 +93,7 @@ index 4d19357f..23cb42e8 100644 void incnmaster(const Arg *arg) { -@@ -1613,6 +1642,7 @@ motionnotify(uint32_t time) +@@ -1621,6 +1650,7 @@ motionnotify(uint32_t time) /* time is 0 in internal calls meant to restore pointer focus. */ if (time) { wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -97,7 +101,16 @@ index 4d19357f..23cb42e8 100644 /* Update selmon (even while dragging a window) */ if (sloppyfocus) -@@ -1791,7 +1821,10 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, +@@ -1656,7 +1686,7 @@ motionnotify(uint32_t time) + /* 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); +@@ -1796,7 +1826,10 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, /* Let the client know that the mouse cursor has entered one * of its surfaces, and make keyboard focus follow if desired. * wlroots makes this a no-op if surface is already focused */ @@ -109,7 +122,7 @@ index 4d19357f..23cb42e8 100644 wlr_seat_pointer_notify_motion(seat, time, sx, sy); } -@@ -1994,6 +2027,7 @@ run(char *startup_cmd) +@@ -1999,6 +2032,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"); @@ -117,19 +130,24 @@ index 4d19357f..23cb42e8 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 -@@ -2284,6 +2318,12 @@ setup(void) - xdg_decoration_mgr = wlr_xdg_decoration_manager_v1_create(dpy); - LISTEN_STATIC(&xdg_decoration_mgr->events.new_toplevel_decoration, createdecoration); +@@ -2324,6 +2358,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 -+ ); ++ hide_source = wl_event_loop_add_timer(wl_display_get_event_loop(dpy), ++ hidecursor, cursor); + /* - * Creates a cursor, which is a wlroots utility for tracking the cursor - * image shown on screen. + * Configures a seat, which is a single "seat" at which a user sits and + * operates the computer. This conceptually includes up to one keyboard, +@@ -2746,6 +2783,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(false); + } + + Monitor * -- 2.43.0