From 191b07a13f21e069f1e9e6d979efc5913d8adcc5 Mon Sep 17 00:00:00 2001 From: Johannes Herman Date: Sun, 28 Dec 2025 02:28:37 +0100 Subject: cleanup config file, fix warnings --- config.def.h | 186 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 98 insertions(+), 88 deletions(-) (limited to 'config.def.h') diff --git a/config.def.h b/config.def.h index dcd4d68..fc4bea1 100644 --- a/config.def.h +++ b/config.def.h @@ -32,6 +32,7 @@ static const Rule rules[] = { /* app_id title tags mask isfloating isterm noswallow monitor */ /* examples: */ { "foot", NULL, 0, 0, 1, 1, -1 }, + { "wev", NULL, 0, 0, 0, 1, -1 }, { "Gimp_EXAMPLE", NULL, 0, 1, 0, 0, -1 }, /* Start on currently visible tags floating, not tiled */ { "firefox_EXAMPLE", NULL, 1 << 8, 0, 0, 0, -1 }, /* Start on ONLY tag "9" */ }; @@ -122,11 +123,17 @@ static const int cursor_timeout = 2; #define SHIFT WLR_MODIFIER_SHIFT #define CTRL WLR_MODIFIER_CTRL -#define TAGKEYS(KEY,SKEY,TAG) \ - { MODKEY, -1, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|CTRL, -1, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|CTRL|SHIFT, -1,SKEY,toggletag, {.ui = 1 << TAG} } +#define KEY(MOD,CHAIN,KEY,FUNC,ARG) \ + { MOD, CHAIN, KEY, FUNC, ARG, 0, 0, 0 } + +#define PRESSKEY(MOD,CHAIN,KEY,FUNC,ARG) \ + { MOD, CHAIN, KEY, FUNC, ARG, 1, 0, 0 } + +#define TAGKEYS(KKEY,SKEY,TAG) \ + KEY( MODKEY, -1, KKEY, view, {.ui = 1 << TAG} ), \ + KEY( MODKEY|CTRL, -1, KKEY, toggleview, {.ui = 1 << TAG} ), \ + KEY( MODKEY|SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} ), \ + KEY( MODKEY|CTRL|SHIFT, -1,SKEY,toggletag, {.ui = 1 << TAG} ) /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -144,100 +151,102 @@ static const char *volume_lower_small[] = { "volume", "-1%", NULL }; static const char *volume_mute[] = { "volume", "mute", NULL }; static const Key keys[] = { - /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ - /* modifier key function argument */ + /* Note that Shift changes certain key codes: 2 -> at, etc. */ + /* modifier chain key function argument */ /* Window managment */ - { MODKEY, -1, XKB_KEY_d, spawn, {.v = menucmd} }, - { MODKEY, -1, XKB_KEY_q, spawn, {.v = termcmd} }, - { MODKEY|SHIFT, -1, XKB_KEY_q, spawn, {.v = alttermcmd} }, - { MODKEY, -1, XKB_KEY_w, spawn, {.v = browsercmd} }, - { MODKEY, -1, XKB_KEY_j, focusstack, {.i = +1} }, - { MODKEY, -1, XKB_KEY_k, focusstack, {.i = -1} }, - { MODKEY|SHIFT, -1, XKB_KEY_h, incnmaster, {.i = +1} }, - { MODKEY|SHIFT, -1, XKB_KEY_l, incnmaster, {.i = -1} }, - { MODKEY, -1, XKB_KEY_h, setmfact, {.f = -0.05f} }, - { MODKEY, -1, XKB_KEY_l, setmfact, {.f = +0.05f} }, - { MODKEY, -1, XKB_KEY_f, togglefullscreen, {0} }, - { MODKEY|SHIFT, -1, XKB_KEY_space, togglefloating, {0} }, - { MODKEY, -1, XKB_KEY_Return, zoom, {0} }, - { MODKEY, -1, XKB_KEY_Tab, view, {0} }, - { MODKEY, -1, XKB_KEY_g, togglegaps, {0} }, - { MODKEY, -1, XKB_KEY_p, togglesticky, {0} }, - { MODKEY, -1, XKB_KEY_c, killclient, {0} }, - { MODKEY, -1, XKB_KEY_b, togglebar, {0} }, - { MODKEY, -1, XKB_KEY_o, spawn, SHCMD("linkhandler") }, - + KEY( MODKEY, -1, XKB_KEY_d, spawn, {.v = menucmd} ), + KEY( MODKEY, -1, XKB_KEY_q, spawn, {.v = termcmd}), + KEY( MODKEY|SHIFT, -1, XKB_KEY_q, spawn, {.v = alttermcmd} ), + KEY( MODKEY, -1, XKB_KEY_w, spawn, {.v = browsercmd} ), + KEY( MODKEY, -1, XKB_KEY_j, focusstack, {.i = +1} ), + KEY( MODKEY, -1, XKB_KEY_k, focusstack, {.i = -1} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_h, incnmaster, {.i = +1} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_l, incnmaster, {.i = -1} ), + KEY( MODKEY, -1, XKB_KEY_h, setmfact, {.f = -0.05f} ), + KEY( MODKEY, -1, XKB_KEY_l, setmfact, {.f = +0.05f} ), + KEY( MODKEY, -1, XKB_KEY_f, togglefullscreen, {0} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_space, togglefloating, {0} ), + KEY( MODKEY, -1, XKB_KEY_Return, zoom, {0} ), + KEY( MODKEY, -1, XKB_KEY_Tab, view, {0} ), + KEY( MODKEY, -1, XKB_KEY_g, togglegaps, {0} ), + KEY( MODKEY, -1, XKB_KEY_p, togglesticky, {0} ), + KEY( MODKEY, -1, XKB_KEY_u, toggleswallow, {0} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_u, toggleautoswallow, {0} ), + KEY( MODKEY, -1, XKB_KEY_c, killclient, {0} ), + KEY( MODKEY, -1, XKB_KEY_b, togglebar, {0} ), + KEY( MODKEY, -1, XKB_KEY_o, spawn, SHCMD("linkhandler") ), /* Layout */ - { MODKEY, XKB_KEY_t, XKB_KEY_space, setlayout, {0} }, - { MODKEY, XKB_KEY_t, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XKB_KEY_t, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XKB_KEY_t, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XKB_KEY_t, XKB_KEY_s, setlayout, {.v = &layouts[3]} }, + KEY( MODKEY, XKB_KEY_t, XKB_KEY_space, setlayout, {0} ), + KEY( MODKEY, XKB_KEY_t, XKB_KEY_t, setlayout, {.v = &layouts[0]} ), + KEY( MODKEY, XKB_KEY_t, XKB_KEY_f, setlayout, {.v = &layouts[1]} ), + KEY( MODKEY, XKB_KEY_t, XKB_KEY_m, setlayout, {.v = &layouts[2]} ), + KEY( MODKEY, XKB_KEY_t, XKB_KEY_s, setlayout, {.v = &layouts[3]} ), /* Shortcuts */ - { MODKEY, -1, XKB_KEY_s, spawn, SHCMD("snap") }, - // { MODKEY|ShiftMask, -1, XK_s, spawn, SHCMD("snap -s") }, + KEY( MODKEY, -1, XKB_KEY_s, spawn, SHCMD("snap") ), + // KEY( MODKEY|ShiftMask, -1, XK_s, spawn, SHCMD("snap -s") ), /* Popups */ - { MODKEY, XKB_KEY_n, XKB_KEY_d, spawn, SHCMD("vis pop-cal 60") }, - { MODKEY, XKB_KEY_n, XKB_KEY_c, spawn, SHCMD("vis pop-clock 1") }, - { MODKEY, XKB_KEY_n, XKB_KEY_b, spawn, SHCMD("vis pop-bat 5") }, - { MODKEY, XKB_KEY_n, XKB_KEY_n, spawn, SHCMD("vis pop-net 10") }, - { MODKEY, XKB_KEY_n, XKB_KEY_e, spawn, SHCMD("vis pop-con 10") }, - { MODKEY, XKB_KEY_n, XKB_KEY_m, spawn, SHCMD("vis pop-mem 1") }, - { MODKEY, XKB_KEY_n, XKB_KEY_s, spawn, SHCMD("vis pop-sens 1") }, - { MODKEY, XKB_KEY_n, XKB_KEY_w, spawn, SHCMD("vis pop-yr 600") }, - { MODKEY, XKB_KEY_n, XKB_KEY_k, spawn, SHCMD("vis pop-khal 600") }, - { MODKEY, -1, XKB_KEY_Escape, spawn, SHCMD("vis dismiss") }, + KEY( MODKEY, XKB_KEY_n, XKB_KEY_d, spawn, SHCMD("vis pop-cal 60") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_c, spawn, SHCMD("vis pop-clock 1") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_b, spawn, SHCMD("vis pop-bat 5") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_n, spawn, SHCMD("vis pop-net 10") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_e, spawn, SHCMD("vis pop-con 10") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_m, spawn, SHCMD("vis pop-mem 1") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_s, spawn, SHCMD("vis pop-sens 1") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_w, spawn, SHCMD("vis pop-yr 600") ), + KEY( MODKEY, XKB_KEY_n, XKB_KEY_k, spawn, SHCMD("vis pop-khal 600") ), + KEY( MODKEY, -1, XKB_KEY_Escape, spawn, SHCMD("vis dismiss") ), /* Menus */ - { MODKEY, XKB_KEY_m, XKB_KEY_e, spawn, SHCMD("menu-emoji") }, - { MODKEY, XKB_KEY_m, XKB_KEY_c, spawn, SHCMD("menu-clip") }, - { MODKEY, XKB_KEY_m, XKB_KEY_p, spawn, SHCMD("menu-power") }, - { MODKEY, XKB_KEY_m, XKB_KEY_v, spawn, SHCMD("menu-video") }, - { MODKEY, XKB_KEY_m, XKB_KEY_w, spawn, SHCMD("menu-yr") }, - { MODKEY, XKB_KEY_m, XKB_KEY_s, spawn, SHCMD("menu-symbols") }, - { MODKEY, XKB_KEY_m, XKB_KEY_m, spawn, SHCMD("menu-mpvhist") }, - { MODKEY, XKB_KEY_m, XKB_KEY_b, spawn, SHCMD("menu-bluetooth") }, - - /* Volume */ - { MODKEY|CTRL, -1, XKB_KEY_v, spawn, {.v = volume_mute } }, - { MODKEY, -1, XKB_KEY_v, spawn, {.v = volume_raise } }, - { MODKEY|SHIFT, -1, XKB_KEY_v, spawn, {.v = volume_lower } }, - { 0, -1, XKB_KEY_XF86AudioMute, spawn, {.v = volume_mute } }, - { 0, -1, XKB_KEY_XF86AudioRaiseVolume, spawn, {.v = volume_raise } }, - { 0, -1, XKB_KEY_XF86AudioLowerVolume, spawn, {.v = volume_lower } }, - { SHIFT, -1, XKB_KEY_XF86AudioRaiseVolume, spawn, {.v = volume_raise_small } }, - { SHIFT, -1, XKB_KEY_XF86AudioLowerVolume, spawn, {.v = volume_lower_small } }, + KEY( MODKEY, XKB_KEY_m, XKB_KEY_e, spawn, SHCMD("menu-emoji") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_c, spawn, SHCMD("menu-clip") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_p, spawn, SHCMD("menu-power") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_v, spawn, SHCMD("menu-video") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_w, spawn, SHCMD("menu-yr") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_s, spawn, SHCMD("menu-symbols") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_m, spawn, SHCMD("menu-mpvhist") ), + KEY( MODKEY, XKB_KEY_m, XKB_KEY_b, spawn, SHCMD("menu-bluetooth") ), + + /* Volume / Mic */ + KEY( MODKEY|CTRL, -1, XKB_KEY_v, spawn, {.v = volume_mute } ), + KEY( MODKEY, -1, XKB_KEY_v, spawn, {.v = volume_raise } ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_v, spawn, {.v = volume_lower } ), + KEY( 0, -1, XKB_KEY_XF86AudioMute, spawn, {.v = volume_mute } ), + KEY( 0, -1, XKB_KEY_XF86AudioRaiseVolume, spawn, {.v = volume_raise } ), + KEY( 0, -1, XKB_KEY_XF86AudioLowerVolume, spawn, {.v = volume_lower } ), + KEY( SHIFT, -1, XKB_KEY_XF86AudioRaiseVolume, spawn, {.v = volume_raise_small } ), + KEY( SHIFT, -1, XKB_KEY_XF86AudioLowerVolume, spawn, {.v = volume_lower_small } ), + KEY( 0, -1, XKB_KEY_XF86AudioMicMute, spawn, SHCMD("mic mute") ), /* Backlight */ - { MODKEY, -1, XKB_KEY_a, spawn, SHCMD("lampe raise") }, - { MODKEY|SHIFT, -1, XKB_KEY_a, spawn, SHCMD("lampe lower") }, - { 0, -1, XKB_KEY_XF86MonBrightnessUp, spawn, SHCMD("lampe raise") }, - { 0, -1, XKB_KEY_XF86MonBrightnessDown, spawn, SHCMD("lampe lower") }, + KEY( MODKEY, -1, XKB_KEY_a, spawn, SHCMD("lampe raise") ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_a, spawn, SHCMD("lampe lower") ), + KEY( 0, -1, XKB_KEY_XF86MonBrightnessUp, spawn, SHCMD("lampe raise") ), + KEY( 0, -1, XKB_KEY_XF86MonBrightnessDown, spawn, SHCMD("lampe lower") ), - { 0, -1, XKB_KEY_XF86AudioMicMute, spawn, SHCMD("mic mute") }, - { 0, -1, XKB_KEY_XF86RotateWindows, spawn, SHCMD("warrelroll flip"), 1, 0, 0 }, - { 0, -1, XKB_KEY_XF86TaskPane, spawn, SHCMD("warrelroll rotate"), 1, 0, 0 }, - { 0, -1, XKB_KEY_XF86ScreenSaver, spawn, SHCMD("lock") }, - { 0, -1, XKB_KEY_XF86Sleep, spawn, SHCMD("systemctl sleep") }, + /* Misc */ + PRESSKEY( 0, -1, XKB_KEY_XF86RotateWindows, spawn, SHCMD("warrelroll flip") ), + PRESSKEY( 0, -1, XKB_KEY_XF86TaskPane, spawn, SHCMD("warrelroll rotate") ), + KEY( 0, -1, XKB_KEY_XF86ScreenSaver, spawn, SHCMD("lock") ), + KEY( 0, -1, XKB_KEY_XF86Sleep, spawn, SHCMD("systemctl sleep") ), /* Media */ - { MODKEY|SHIFT, -1, XKB_KEY_p, spawn, SHCMD("playerctl play-pause") }, - { 0, -1, XKB_KEY_XF86AudioMedia, spawn, SHCMD("playerctl play-pause") }, - { 0, -1, XKB_KEY_XF86AudioPlay, spawn, SHCMD("playerctl play-pause") }, - { 0, -1, XKB_KEY_XF86AudioPause, spawn, SHCMD("playerctl play-pause") }, - { 0, -1, XKB_KEY_XF86AudioStop, spawn, SHCMD("playerctl pause") }, - { 0, -1, XKB_KEY_XF86AudioPrev, spawn, SHCMD("playerctl previous") }, - { 0, -1, XKB_KEY_XF86AudioNext, spawn, SHCMD("playerctl next") }, - - { MODKEY, -1, XKB_KEY_0, view, {.ui = ~0} }, - { MODKEY|SHIFT, -1, XKB_KEY_equal, tag, {.ui = ~0} }, - { MODKEY, -1, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY, -1, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} }, + KEY( MODKEY|SHIFT, -1, XKB_KEY_p, spawn, SHCMD("playerctl play-pause") ), + KEY( 0, -1, XKB_KEY_XF86AudioMedia, spawn, SHCMD("playerctl play-pause") ), + KEY( 0, -1, XKB_KEY_XF86AudioPlay, spawn, SHCMD("playerctl play-pause") ), + KEY( 0, -1, XKB_KEY_XF86AudioPause, spawn, SHCMD("playerctl play-pause") ), + KEY( 0, -1, XKB_KEY_XF86AudioStop, spawn, SHCMD("playerctl pause") ), + KEY( 0, -1, XKB_KEY_XF86AudioPrev, spawn, SHCMD("playerctl previous") ), + KEY( 0, -1, XKB_KEY_XF86AudioNext, spawn, SHCMD("playerctl next") ), + + KEY( MODKEY, -1, XKB_KEY_0, view, {.ui = ~0} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_equal, tag, {.ui = ~0} ), + KEY( MODKEY, -1, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} ), + KEY( MODKEY, -1, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} ), + KEY( MODKEY|SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} ), TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), TAGKEYS( XKB_KEY_2, XKB_KEY_quotedbl, 1), TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), @@ -258,14 +267,15 @@ static const Key keys[] = { TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), */ - { MODKEY|SHIFT, -1, XKB_KEY_m, quit, {0} }, + KEY( MODKEY|SHIFT, -1, XKB_KEY_m, quit, {0} ), /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ - { CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_Terminate_Server, quit, {0} }, + KEY( CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_Terminate_Server, quit, {0} ), + /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is * do not remove them. */ -#define CHVT(n) { CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } +#define CHVT(n) { CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)}, 0, 0, 0 } CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6), CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12), }; -- cgit v1.2.3