mirror of
https://codeberg.org/dwl/dwl.git
synced 2025-12-18 19:03:18 +00:00
Hide the mouse cursor if it isn’t being used
This commit is contained in:
parent
797e0c74b2
commit
e9823d972c
@ -90,6 +90,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 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 */
|
/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
|
||||||
#define MODKEY WLR_MODIFIER_ALT
|
#define MODKEY WLR_MODIFIER_ALT
|
||||||
|
|
||||||
|
|||||||
39
dwl.c
39
dwl.c
@ -260,6 +260,8 @@ static void focusmon(const Arg *arg);
|
|||||||
static void focusstack(const Arg *arg);
|
static void focusstack(const Arg *arg);
|
||||||
static Client *focustop(Monitor *m);
|
static Client *focustop(Monitor *m);
|
||||||
static void fullscreennotify(struct wl_listener *listener, void *data);
|
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 incnmaster(const Arg *arg);
|
||||||
static void inputdevice(struct wl_listener *listener, void *data);
|
static void inputdevice(struct wl_listener *listener, void *data);
|
||||||
static int keybinding(uint32_t mods, xkb_keysym_t sym);
|
static int keybinding(uint32_t mods, xkb_keysym_t sym);
|
||||||
@ -348,6 +350,8 @@ static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr;
|
|||||||
|
|
||||||
static struct wlr_cursor *cursor;
|
static struct wlr_cursor *cursor;
|
||||||
static struct wlr_xcursor_manager *cursor_mgr;
|
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_session_lock_manager_v1 *session_lock_mgr;
|
||||||
static struct wlr_scene_rect *locked_bg;
|
static struct wlr_scene_rect *locked_bg;
|
||||||
@ -558,6 +562,7 @@ axisnotify(struct wl_listener *listener, void *data)
|
|||||||
* for example when you move the scroll wheel. */
|
* for example when you move the scroll wheel. */
|
||||||
struct wlr_pointer_axis_event *event = data;
|
struct wlr_pointer_axis_event *event = data;
|
||||||
IDLE_NOTIFY_ACTIVITY;
|
IDLE_NOTIFY_ACTIVITY;
|
||||||
|
handlecursoractivity(true);
|
||||||
/* TODO: allow usage of scroll whell for mousebindings, it can be implemented
|
/* TODO: allow usage of scroll whell for mousebindings, it can be implemented
|
||||||
* checking the event's orientation and the delta of the event */
|
* checking the event's orientation and the delta of the event */
|
||||||
/* Notify the client with pointer focus of the axis event. */
|
/* Notify the client with pointer focus of the axis event. */
|
||||||
@ -576,6 +581,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
|||||||
const Button *b;
|
const Button *b;
|
||||||
|
|
||||||
IDLE_NOTIFY_ACTIVITY;
|
IDLE_NOTIFY_ACTIVITY;
|
||||||
|
handlecursoractivity(true);
|
||||||
|
|
||||||
switch (event->state) {
|
switch (event->state) {
|
||||||
case WLR_BUTTON_PRESSED:
|
case WLR_BUTTON_PRESSED:
|
||||||
@ -1325,6 +1331,27 @@ fullscreennotify(struct wl_listener *listener, void *data)
|
|||||||
setfullscreen(c, client_wants_fullscreen(c));
|
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, (cursor_image = "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
|
void
|
||||||
incnmaster(const Arg *arg)
|
incnmaster(const Arg *arg)
|
||||||
{
|
{
|
||||||
@ -1634,6 +1661,7 @@ motionnotify(uint32_t time)
|
|||||||
/* time is 0 in internal calls meant to restore pointer focus. */
|
/* time is 0 in internal calls meant to restore pointer focus. */
|
||||||
if (time) {
|
if (time) {
|
||||||
IDLE_NOTIFY_ACTIVITY;
|
IDLE_NOTIFY_ACTIVITY;
|
||||||
|
handlecursoractivity(false);
|
||||||
|
|
||||||
/* Update selmon (even while dragging a window) */
|
/* Update selmon (even while dragging a window) */
|
||||||
if (sloppyfocus)
|
if (sloppyfocus)
|
||||||
@ -1672,7 +1700,7 @@ motionnotify(uint32_t time)
|
|||||||
/* If there's no client surface under the cursor, set the cursor image to a
|
/* 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
|
* default. This is what makes the cursor image appear when you move it
|
||||||
* off of a client or over its border. */
|
* off of a client or over its border. */
|
||||||
if (!surface && !seat->drag && (!cursor_image || strcmp(cursor_image, "left_ptr")))
|
if (!surface && !seat->drag && (!cursor_image || strcmp(cursor_image, "left_ptr")) && !cursor_hidden)
|
||||||
wlr_xcursor_manager_set_cursor_image(cursor_mgr, (cursor_image = "left_ptr"), cursor);
|
wlr_xcursor_manager_set_cursor_image(cursor_mgr, (cursor_image = "left_ptr"), cursor);
|
||||||
|
|
||||||
pointerfocus(c, surface, sx, sy, time);
|
pointerfocus(c, surface, sx, sy, time);
|
||||||
@ -1816,7 +1844,10 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
|
|||||||
/* Let the client know that the mouse cursor has entered one
|
/* Let the client know that the mouse cursor has entered one
|
||||||
* of its surfaces, and make keyboard focus follow if desired.
|
* of its surfaces, and make keyboard focus follow if desired.
|
||||||
* wlroots makes this a no-op if surface is already focused */
|
* 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);
|
wlr_seat_pointer_notify_motion(seat, time, sx, sy);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1979,6 +2010,7 @@ run(char *startup_cmd)
|
|||||||
* monitor when displayed here */
|
* monitor when displayed here */
|
||||||
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
|
wlr_cursor_warp_closest(cursor, NULL, cursor->x, cursor->y);
|
||||||
wlr_xcursor_manager_set_cursor_image(cursor_mgr, cursor_image, cursor);
|
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
|
/* Run the Wayland event loop. This does not return until you exit the
|
||||||
* compositor. Starting the backend rigged up all of the necessary event
|
* compositor. Starting the backend rigged up all of the necessary event
|
||||||
@ -2271,6 +2303,9 @@ setup(void)
|
|||||||
wl_signal_add(&cursor->events.axis, &cursor_axis);
|
wl_signal_add(&cursor->events.axis, &cursor_axis);
|
||||||
wl_signal_add(&cursor->events.frame, &cursor_frame);
|
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
|
* Configures a seat, which is a single "seat" at which a user sits and
|
||||||
* operates the computer. This conceptually includes up to one keyboard,
|
* operates the computer. This conceptually includes up to one keyboard,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user