From 639a724223bf02b191de8d2fa20185b058245ec2 Mon Sep 17 00:00:00 2001 From: Micah Gorrell Date: Fri, 12 May 2023 08:45:00 -0600 Subject: [PATCH] Applied the unclutter patch --- config.def.h | 2 + dwl.c | 37 +++++++++++- patches/unclutter.patch | 127 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 patches/unclutter.patch diff --git a/config.def.h b/config.def.h index e591644..5b1118d 100644 --- a/config.def.h +++ b/config.def.h @@ -84,6 +84,8 @@ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE */ static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; static const double accel_speed = 0.0; +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 diff --git a/dwl.c b/dwl.c index 272de05..6845054 100644 --- a/dwl.c +++ b/dwl.c @@ -265,6 +265,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(bool restore_focus); +static int hidecursor(void *data); static void incnmaster(const Arg *arg); static void inputdevice(struct wl_listener *listener, void *data); static int keybinding(uint32_t mods, xkb_keysym_t sym); @@ -357,6 +359,8 @@ static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr; 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 wlr_session_lock_manager_v1 *session_lock_mgr; static struct wlr_scene_rect *locked_bg; @@ -571,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; IDLE_NOTIFY_ACTIVITY; + handlecursoractivity(true); /* 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. */ @@ -589,6 +594,7 @@ buttonpress(struct wl_listener *listener, void *data) const Button *b; IDLE_NOTIFY_ACTIVITY; + handlecursoractivity(true); switch (event->state) { case WLR_BUTTON_PRESSED: @@ -1395,6 +1401,27 @@ swallow(Client *c, Client *w) { wlr_scene_node_set_enabled(&c->scene->node, 1); } +void +handlecursoractivity(bool restore_focus) +{ + wl_event_source_timer_update(hide_source, cursor_timeout * 1000); + if (cursor_hidden) { + wlr_xcursor_manager_set_cursor_image(cursor_mgr, "left_ptr", cursor); + cursor_hidden = false; + if (restore_focus) + motionnotify(0); + } +} + +int +hidecursor(void *data) +{ + wlr_cursor_set_image(cursor, NULL, 0, 0, 0, 0, 0, 0); + wlr_seat_pointer_notify_clear_focus(seat); + cursor_hidden = true; + return 1; +} + void incnmaster(const Arg *arg) { @@ -1718,6 +1745,7 @@ motionnotify(uint32_t time) /* time is 0 in internal calls meant to restore pointer focus. */ if (time) { IDLE_NOTIFY_ACTIVITY; + handlecursoractivity(false); /* Update selmon (even while dragging a window) */ if (sloppyfocus) @@ -1907,7 +1935,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 */ - wlr_seat_pointer_notify_enter(seat, surface, sx, sy); + /* Don't show the cursor when calling motionnotify(0) to restore pointer + * focus. */ + if (!cursor_hidden) + wlr_seat_pointer_notify_enter(seat, surface, sx, sy); wlr_seat_pointer_notify_motion(seat, time, sx, sy); } @@ -2070,6 +2101,7 @@ run(char *startup_cmd) * monitor when displayed here */ wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y); wlr_xcursor_manager_set_cursor_image(cursor_mgr, cursor_image, cursor); + handlecursoractivity(false); /* Run the Wayland event loop. This does not return until you exit the * compositor. Starting the backend rigged up all of the necessary event @@ -2362,6 +2394,9 @@ setup(void) wl_signal_add(&cursor->events.axis, &cursor_axis); wl_signal_add(&cursor->events.frame, &cursor_frame); + 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, diff --git a/patches/unclutter.patch b/patches/unclutter.patch new file mode 100644 index 0000000..26165f2 --- /dev/null +++ b/patches/unclutter.patch @@ -0,0 +1,127 @@ +From d02f6b28467880da4e51362f7f4411a0ecb17a4d Mon Sep 17 00:00:00 2001 +From: Dmitry Zakharchenko +Date: Thu, 5 Jan 2023 14:19:16 +0200 +Subject: [PATCH] sync with 0.4 + +--- + config.def.h | 2 ++ + dwl.c | 37 ++++++++++++++++++++++++++++++++++++- + 2 files changed, 38 insertions(+), 1 deletion(-) + +diff --git a/config.def.h b/config.def.h +index a4f7c13d..e145893c 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -85,6 +85,8 @@ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE + */ + static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; + static const double accel_speed = 0.0; ++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 +diff --git a/dwl.c b/dwl.c +index 19bb6ce3..de080689 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -253,6 +253,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(bool restore_focus); ++static int hidecursor(void *data); + static void incnmaster(const Arg *arg); + static void inputdevice(struct wl_listener *listener, void *data); + static int keybinding(uint32_t mods, xkb_keysym_t sym); +@@ -340,6 +342,8 @@ static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr; + + 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 wlr_session_lock_manager_v1 *session_lock_mgr; + static struct wlr_scene_rect *locked_bg; +@@ -551,6 +555,7 @@ axisnotify(struct wl_listener *listener, void *data) + * for example when you move the scroll wheel. */ + struct wlr_pointer_axis_event *event = data; + IDLE_NOTIFY_ACTIVITY; ++ handlecursoractivity(true); + /* 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. */ +@@ -569,6 +574,7 @@ buttonpress(struct wl_listener *listener, void *data) + const Button *b; + + IDLE_NOTIFY_ACTIVITY; ++ handlecursoractivity(true); + + switch (event->state) { + case WLR_BUTTON_PRESSED: +@@ -1308,6 +1314,27 @@ fullscreennotify(struct wl_listener *listener, void *data) + setfullscreen(c, client_wants_fullscreen(c)); + } + ++void ++handlecursoractivity(bool restore_focus) ++{ ++ wl_event_source_timer_update(hide_source, cursor_timeout * 1000); ++ if (cursor_hidden) { ++ wlr_xcursor_manager_set_cursor_image(cursor_mgr, "left_ptr", cursor); ++ cursor_hidden = false; ++ if (restore_focus) ++ motionnotify(0); ++ } ++} ++ ++int ++hidecursor(void *data) ++{ ++ wlr_cursor_set_image(cursor, NULL, 0, 0, 0, 0, 0, 0); ++ wlr_seat_pointer_notify_clear_focus(seat); ++ cursor_hidden = true; ++ return 1; ++} ++ + void + incnmaster(const Arg *arg) + { +@@ -1588,6 +1615,7 @@ motionnotify(uint32_t time) + /* time is 0 in internal calls meant to restore pointer focus. */ + if (time) { + IDLE_NOTIFY_ACTIVITY; ++ handlecursoractivity(false); + + /* Update selmon (even while dragging a window) */ + if (sloppyfocus) +@@ -1770,7 +1798,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 */ +- wlr_seat_pointer_notify_enter(seat, surface, sx, sy); ++ /* Don't show the cursor when calling motionnotify(0) to restore pointer ++ * focus. */ ++ if (!cursor_hidden) ++ wlr_seat_pointer_notify_enter(seat, surface, sx, sy); + wlr_seat_pointer_notify_motion(seat, time, sx, sy); + } + +@@ -1926,6 +1957,7 @@ run(char *startup_cmd) + * monitor when displayed here */ + wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y); + wlr_xcursor_manager_set_cursor_image(cursor_mgr, cursor_image, cursor); ++ handlecursoractivity(false); + + /* Run the Wayland event loop. This does not return until you exit the + * compositor. Starting the backend rigged up all of the necessary event +@@ -2210,6 +2242,9 @@ setup(void) + wl_signal_add(&cursor->events.axis, &cursor_axis); + wl_signal_add(&cursor->events.frame, &cursor_frame); + ++ 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,