tiyn/dwl
1
0
Fork 0
mirror of https://github.com/tiyn/dwl.git synced 2026-01-11 09:29:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: tiyn:b5ac3f0ef61d6f3abbc3b50cbd1cc405f85a6032
Branches Tags
tiyn:master tiyn:config tiyn:foreign-toplevel-management tiyn:hide-behind-fullscreen tiyn:hide-behind-monocle tiyn:unclutter tiyn:xwayland-handle-minimize tiyn:swallow tiyn:togglekblayoutandoptions tiyn:en-keycodes tiyn:warpcursor tiyn:bottomstack tiyn:attachtop tiyn:fakefullscreenclient tiyn:inputdevicerules tiyn:ipc tiyn:pertag tiyn:smartborders tiyn:deck tiyn:base
..
compare: tiyn:unclutter
Branches Tags
tiyn:master tiyn:config tiyn:foreign-toplevel-management tiyn:hide-behind-fullscreen tiyn:hide-behind-monocle tiyn:unclutter tiyn:xwayland-handle-minimize tiyn:swallow tiyn:togglekblayoutandoptions tiyn:en-keycodes tiyn:warpcursor tiyn:bottomstack tiyn:attachtop tiyn:fakefullscreenclient tiyn:inputdevicerules tiyn:ipc tiyn:pertag tiyn:smartborders tiyn:deck tiyn:base

1 Commits
b5ac3f0ef6 ... unclutter

Author SHA1 Message Date
tiyn
772c7869b8 patched unclutter 2025-04-23 02:23:46 +02:00
4 changed files with 306 additions and 131 deletions
Expand all files Collapse all files

169
config.def.h
View File

@@ -6,7 +6,6 @@
/* appearance */ /* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */ static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const int smartborders = 1;
static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int borderpx = 1; /* border pixel of windows */
static const float rootcolor[] = COLOR(0x222222ff); static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x444444ff); static const float bordercolor[] = COLOR(0x444444ff);
@@ -14,53 +13,27 @@ static const float focuscolor[] = COLOR(0x005577ff);
static const float urgentcolor[] = COLOR(0xff0000ff); static const float urgentcolor[] = COLOR(0xff0000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */ static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
static int enableautoswallow = 0; /* enables autoswallowing newly spawned clients */
static float swallowborder = 1.0f; /* add this multiplied by borderpx to border when a client is swallowed */
/* tagging - TAGCOUNT must be no greater than 31 */ /* tagging - TAGCOUNT must be no greater than 31 */
#define TAGCOUNT (10) #define TAGCOUNT (9)
/* logging */ /* logging */
static int log_level = WLR_ERROR; static int log_level = WLR_ERROR;
/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */ /* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
static const Rule rules[] = { static const Rule rules[] = {
/* app_id title tags mask isfloating isterm noswallow monitor */ /* app_id title tags mask isfloating monitor */
/* examples: */ /* examples: */
{ "firefox", NULL, 1 << 1, 0, 0, 0, -1 }, { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
{ "zen", NULL, 1 << 1, 0, 0, 0, -1 }, { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
{ "Lutris", NULL, 1 << 2, 0, 0, 0, 0 },
{ "zenity", NULL, 0, 1, 0, 0, -1 },
{ "steam", NULL, 1 << 2, 0, 0, 0, 0 },
{ "discord", NULL, 1 << 2, 0, 0, 0, 1 },
{ "TeamSpeak", NULL, 1 << 2, 0, 0, 0, 1 },
{ "Mattermost", NULL, 1 << 2, 0, 0, 0, 1 },
{ "Element", NULL, 1 << 2, 0, 0, 0, 1 },
{ "signal", NULL, 1 << 4, 0, 0, 0, 1 },
{ "telegram", NULL, 1 << 4, 0, 0, 0, 1 },
{ "Threema", NULL, 1 << 4, 0, 0, 0, 1 },
{ "Thunderbird", NULL, 1 << 4, 0, 0, 0, 1 },
{ "Sonixd", NULL, 1 << 8, 0, 0, 0, 1 },
{ "KeePassXC", "Unlock Database - KeePassXC", 1 << 1, 1, 0, 0, 0 },
{ "KeePassXC", NULL, 1 << 9, 0, 0, 0, 0 },
{ "com.obsproject.Studio",NULL, 1 << 7, 0, 0, 0, 1 },
{ "easyeffects", NULL, 1 << 9, 0, 0, 0, 1 },
{ "pavucontrol", NULL, 1 << 9, 0, 0, 0, 1 },
{ "nextcloud", NULL, 0, 1, 0, 0, -1 },
{ "st", NULL, 0, 0, 1, 0, -1 },
{ "vifm", NULL, 0, 0, 1, 0, -1 },
{ "vifmrun", NULL, 0, 0, 1, 0, -1 },
}; };
/* layout(s) */ /* layout(s) */
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "M", monocle }, { "[]=", tile },
{ "T", tile }, { "><>", NULL }, /* no layout function means floating behavior */
{ "D", deck }, { "[M]", monocle },
{ "B", bstack },
{ "B", bstackhoriz },
{ "F", NULL }, /* no layout function means floating behavior */
}; };
/* monitors */ /* monitors */
@@ -79,33 +52,12 @@ static const MonitorRule monrules[] = {
}; };
/* keyboard */ /* keyboard */
static const struct xkb_rule_names xkb_rules[] = { static const struct xkb_rule_names xkb_rules = {
{ /* can specify fields: rules, model, layout, variant, options */
.layout = "de", /* example:
.options = NULL, .options = "ctrl:nocaps",
}, */
{ .options = NULL,
.layout = "de",
.variant = "nodeadkeys",
.options = NULL,
},
{
.layout = "de",
.variant = "ru",
.options = NULL,
}
};
/* input devices */
static const InputRule inputrules[] = {
/* name kbcreate ptrcreate */
/* ignore bad device - like a touchpad ;) */
{ "BAD DEVICE", NULL, NULL },
/* ungroup ydotool device - fixes a bug */
{ "ydotoold virtual device", createungroupedkeyboard, createpointer },
/* put your touchpad name here to enable toggle touchpad */
{ "SYNA8020:00 06CB:CE5C Touchpad", createkeyboard, createtogglepointer },
{ NULL, createkeyboard, createpointer },
}; };
static const int repeat_rate = 25; static const int repeat_rate = 25;
@@ -157,7 +109,7 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
static const int cursor_timeout = 5; 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_LOGO #define MODKEY WLR_MODIFIER_ALT
#define TAGKEYS(KEY,SKEY,TAG) \ #define TAGKEYS(KEY,SKEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
@@ -169,66 +121,45 @@ static const int cursor_timeout = 5;
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */ /* commands */
static const char *termcmd[] = { "st", NULL }; static const char *termcmd[] = { "foot", NULL };
static const char *filecmd[] = { "st", "-e", "vifmrun", NULL }; static const char *menucmd[] = { "wmenu-run", NULL };
static const char *menucmd[] = { "dmenu_run", "-F", "-i", "-c", "-l", "20", NULL };
static const Key keys[] = { static const Key keys[] = {
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Escape, quit, {0} }, { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_D, togglefloating, {0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, togglefullscreen, {0} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
{ MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL, XKB_KEY_F, togglefakefullscreen, {0} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
{ MODKEY, XKB_KEY_h, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H, zoom, {0} }, { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J, incnmaster, {.i = -1} }, { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_Return, zoom, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K, incnmaster, {.i = +1} }, { MODKEY, XKB_KEY_Tab, view, {0} },
{ MODKEY, XKB_KEY_l, focusstack, {.i = +1} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_U, setmfact, {.f = -0.05f} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_I, setmfact, {.f = -0.05f} }, { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_space, setlayout, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_P, setmfact, {.f = +0.05f} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, killclient, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_T, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, setlayout, {.v = &layouts[2]} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_V, setlayout, {.v = &layouts[3]} }, { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S, setlayout, {.v = &layouts[4]} }, { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H, setmfact, {.f = -0.05f} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L, incxkbrules, {.i = +1} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
{ MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon, tagmon, {.i = WLR_DIRECTION_LEFT} }, TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_colon, tagmon, {.i = WLR_DIRECTION_RIGHT} }, TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
{ MODKEY, XKB_KEY_r, spawn, {.v = menucmd} }, TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5),
{ MODKEY, XKB_KEY_f, spawn, {.v = filecmd} }, TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
{ MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} }, TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
{ MODKEY, XKB_KEY_space, togglepointer, {0} }, TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
{ WLR_MODIFIER_ALT, XKB_KEY_Tab, focusstack, {.i = +1} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
TAGKEYS(XKB_KEY_1, XKB_KEY_exclam, 0),
TAGKEYS(XKB_KEY_2, XKB_KEY_quotedbl, 1),
TAGKEYS(XKB_KEY_3, XKB_KEY_section, 2),
TAGKEYS(XKB_KEY_4, XKB_KEY_dollar, 3),
TAGKEYS(XKB_KEY_5, XKB_KEY_percent, 4),
TAGKEYS(XKB_KEY_6, XKB_KEY_ampersand, 5),
TAGKEYS(XKB_KEY_7, XKB_KEY_slash, 6),
TAGKEYS(XKB_KEY_8, XKB_KEY_parenleft, 7),
TAGKEYS(XKB_KEY_9, XKB_KEY_parenright, 8),
TAGKEYS(XKB_KEY_0, XKB_KEY_equal, 9),
// TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
// TAGKEYS( XKB_KEY_2, XKB_KEY_quotedbl, 1),
// TAGKEYS( XKB_KEY_3, XKB_KEY_paragraph, 2),
// TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
// TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
// TAGKEYS( XKB_KEY_6, XKB_KEY_ampersand, 5),
// TAGKEYS( XKB_KEY_7, XKB_KEY_asciicircum, 6),
// TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 7),
// TAGKEYS( XKB_KEY_9, XKB_KEY_parenright, 8),
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} }, { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },

8
config.mk
View File

@@ -24,11 +24,11 @@ WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19`
# -I$(PWD)/wlroots/0.19/include/wlroots-0.19 # -I$(PWD)/wlroots/0.19/include/wlroots-0.19
#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19 #WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19
# XWAYLAND = XWAYLAND =
# XLIBS = XLIBS =
# Uncomment to build XWayland support # Uncomment to build XWayland support
XWAYLAND = -DXWAYLAND #XWAYLAND = -DXWAYLAND
XLIBS = xcb xcb-icccm #XLIBS = xcb xcb-icccm
# dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11). # dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11).
# To avoid warnings about them, we do not use -std=c99 and instead of using the # To avoid warnings about them, we do not use -std=c99 and instead of using the

72
dwl.c
View File

@@ -288,6 +288,8 @@ 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 gpureset(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 handlesig(int signo);
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);
@@ -389,6 +391,14 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
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 {
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_scene_rect *root_bg;
static struct wlr_session_lock_manager_v1 *session_lock_mgr; static struct wlr_session_lock_manager_v1 *session_lock_mgr;
@@ -609,6 +619,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;
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
handlecursoractivity();
/* 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. */
@@ -627,6 +638,7 @@ buttonpress(struct wl_listener *listener, void *data)
const Button *b; const Button *b;
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
handlecursoractivity();
switch (event->state) { switch (event->state) {
case WL_POINTER_BUTTON_STATE_PRESSED: case WL_POINTER_BUTTON_STATE_PRESSED:
@@ -1563,6 +1575,32 @@ handlesig(int signo)
quit(NULL); quit(NULL);
} }
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 void
incnmaster(const Arg *arg) incnmaster(const Arg *arg)
{ {
@@ -1829,7 +1867,7 @@ monocle(Monitor *m)
n++; n++;
} }
if (n) if (n)
snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "%d", n); snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
if ((c = focustop(m))) if ((c = focustop(m)))
wlr_scene_node_raise_to_top(&c->scene->node); wlr_scene_node_raise_to_top(&c->scene->node);
} }
@@ -1904,6 +1942,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
wlr_cursor_move(cursor, device, dx, dy); wlr_cursor_move(cursor, device, dx, dy);
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
handlecursoractivity();
/* Update selmon (even while dragging a window) */ /* Update selmon (even while dragging a window) */
if (sloppyfocus) if (sloppyfocus)
@@ -1928,7 +1967,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 /* 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) if (!surface && !seat->drag && !cursor_hidden)
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
pointerfocus(c, surface, sx, sy, time); pointerfocus(c, surface, sx, sy, time);
@@ -2283,6 +2322,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_cursor_set_xcursor(cursor, cursor_mgr, "default"); wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
handlecursoractivity();
/* 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
@@ -2306,9 +2346,16 @@ setcursor(struct wl_listener *listener, void *data)
* use the provided surface as the cursor image. It will set the * 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 * hardware cursor on the output that it's currently on and continue to
* do so as the cursor moves between outputs. */ * do so as the cursor moves between outputs. */
if (event->seat_client == seat->pointer_state.focused_client) if (event->seat_client == seat->pointer_state.focused_client) {
wlr_cursor_set_surface(cursor, event->surface, last_cursor.shape = 0;
event->hotspot_x, event->hotspot_y); 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 void
@@ -2320,9 +2367,14 @@ setcursorshape(struct wl_listener *listener, void *data)
/* This can be sent by any client, so we check to make sure this one is /* 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 * actually has pointer focus first. If so, we can tell the cursor to
* use the provided cursor shape. */ * use the provided cursor shape. */
if (event->seat_client == seat->pointer_state.focused_client) if (event->seat_client == seat->pointer_state.focused_client) {
wlr_cursor_set_xcursor(cursor, cursor_mgr, last_cursor.shape = event->shape;
wlr_cursor_shape_v1_name(event->shape)); last_cursor.surface = NULL;
if (!cursor_hidden)
wlr_cursor_set_xcursor(cursor, cursor_mgr,
wlr_cursor_shape_v1_name(event->shape));
}
} }
void void
@@ -2613,6 +2665,9 @@ setup(void)
cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1); cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape); wl_signal_add(&cursor_shape_mgr->events.request_set_shape, &request_set_cursor_shape);
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,
@@ -2997,6 +3052,7 @@ virtualpointer(struct wl_listener *listener, void *data)
wlr_cursor_attach_input_device(cursor, device); wlr_cursor_attach_input_device(cursor, device);
if (event->suggested_output) if (event->suggested_output)
wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); wlr_cursor_map_input_to_output(cursor, device, event->suggested_output);
handlecursoractivity();
} }
Monitor * Monitor *

188
unclutter.patch Normal file
View File

@@ -0,0 +1,188 @@
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