From 1d760829491292c069d0a8bb95914b6d2a0e2904 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Wed, 23 Apr 2025 13:31:18 +0930 Subject: [PATCH] merged and updated config --- Makefile | 2 +- config.def.h | 220 +++++++++++++++++++-------------------------------- movestack.c | 3 +- 3 files changed, 85 insertions(+), 140 deletions(-) diff --git a/Makefile b/Makefile index ffa69b4..3f26804 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ dwm: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} clean: - rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz + rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz config.h dist: clean mkdir -p dwm-${VERSION} diff --git a/config.def.h b/config.def.h index 899f698..621f10b 100644 --- a/config.def.h +++ b/config.def.h @@ -31,12 +31,6 @@ static const char *colors[][3] = { static const unsigned int baralpha = 0xd0; static const unsigned int borderalpha = 0xd0; -static const unsigned int alphas[][3] = { - /* fg bg border */ - [SchemeNorm] = {OPAQUE, baralpha, borderalpha}, - [SchemeSel] = {OPAQUE, baralpha, borderalpha}, -}; - /* tagging */ static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"}; @@ -60,19 +54,17 @@ static const int refreshrate = 120; /* refresh rate (per second) f static const Layout layouts[] = { /* symbol arrange function */ {"[]=", tile}, /* first entry is default */ - {"><>", NULL}, /* no layout function means floating behavior */ {"[M]", monocle}, - {"TTT", bstack}, - {"===", bstackhoriz}, + {"><>", NULL}, /* no layout function means floating behavior */ }; /* key definitions */ #define MODKEY Mod1Mask -#define TAGKEYS(CHAIN, KEY, TAG) \ - {MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG}}, \ - {MODKEY | ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG}}, \ - {MODKEY | ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG}}, \ - {MODKEY | ControlMask | ShiftMask, CHAIN, KEY, toggletag, {.ui = 1 << TAG}}, +#define TAGKEYS(KEY,TAG) \ + &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }), \ + &((Keychord){1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }), \ + &((Keychord){1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }), \ + &((Keychord){1, {{MODKEY|ControlMask|ShiftMask, KEY}}, 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 } } @@ -91,104 +83,100 @@ static const char *termcmd[] = {TERMINAL, "-e", "tmux-worker", NULL #include "shift-tools.c" #include -static Key keys[] = { - /* modifier chain key key function argument */ - {MODKEY | ControlMask | ShiftMask, -1, XK_apostrophe, quit, {0}}, - {MODKEY | ShiftMask, -1, XK_apostrophe, quit, {1}}, +static const Keychord *keychords[] = { + /* modifier key chord function argument */ + // &((Keychord){1, {{MODKEY, XK_}}, spawn, {} }), + &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_apostrophe}}, quit, {0} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_apostrophe}}, quit, {1} }), - {MODKEY, -1, XK_apostrophe, killclient, {0}}, + &((Keychord){1, {{MODKEY, XK_apostrophe}}, killclient, {0} }), - {MODKEY, -1, XK_a, spawn, {.v = dmenucmd}}, - {MODKEY | ShiftMask, -1, XK_Return, spawn, {.v = termcmd}}, - {MODKEY, -1, XK_Escape, spawn, {.v = slockcmd}}, + &((Keychord){1, {{MODKEY, XK_a}}, spawn, {.v = dmenucmd} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_Return}}, spawn, {.v = termcmd} }), + &((Keychord){1, {{MODKEY, XK_Escape}}, spawn, {.v = slockcmd} }), - {MODKEY, -1, XK_l, shiftviewclients, {.i = +1}}, - {MODKEY, -1, XK_h, shiftviewclients, {.i = -1}}, - {MODKEY | ShiftMask, -1, XK_l, shiftview, {.i = +1}}, - {MODKEY | ShiftMask, -1, XK_h, shiftview, {.i = -1}}, - {MODKEY | ControlMask, -1, XK_l, shiftboth, {.i = +1}}, - {MODKEY | ControlMask, -1, XK_h, shiftboth, {.i = -1}}, - {MODKEY | ControlMask | ShiftMask, -1, XK_l, shiftswaptags, {.i = +1}}, - {MODKEY | ControlMask | ShiftMask, -1, XK_h, shiftswaptags, {.i = -1}}, + &((Keychord){1, {{MODKEY, XK_l}}, shiftviewclients, {.i = +1} }), + &((Keychord){1, {{MODKEY, XK_h}}, shiftviewclients, {.i = -1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_l}}, shiftview, {.i = +1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_h}}, shiftview, {.i = -1} }), + &((Keychord){1, {{MODKEY | ControlMask, XK_l}}, shiftboth, {.i = +1} }), + &((Keychord){1, {{MODKEY | ControlMask, XK_h}}, shiftboth, {.i = -1} }), + &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_l}}, shiftswaptags, {.i = +1} }), + &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_h}}, shiftswaptags, {.i = -1} }), - {MODKEY, -1, XK_j, focusstack, {.i = +1}}, - {MODKEY, -1, XK_k, focusstack, {.i = -1}}, - {MODKEY | ShiftMask, -1, XK_v, incnmaster, {.i = +1}}, - {MODKEY | ShiftMask, -1, XK_w, incnmaster, {.i = -1}}, - {MODKEY, -1, XK_minus, setmfact, {.f = -0.05}}, - {MODKEY, -1, XK_equal, setmfact, {.f = +0.05}}, - {MODKEY | ShiftMask, -1, XK_j, movestack, {.i = +1}}, - {MODKEY | ShiftMask, -1, XK_k, movestack, {.i = -1}}, - {MODKEY, -1, XK_Return, zoom, {0}}, - {MODKEY, -1, XK_Tab, view, {0}}, + &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1} }), + &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_v}}, incnmaster, {.i = +1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_w}}, incnmaster, {.i = -1} }), + &((Keychord){1, {{MODKEY, XK_equal}}, setmfact, {.f = +0.05} }), + &((Keychord){1, {{MODKEY, XK_minus}}, setmfact, {.f = -0.05} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_j}}, movestack, {.i = +1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_k}}, movestack, {.i = -1} }), + &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0} }), + &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0} }), - {MODKEY, XK_w, XK_t, setlayout, {.v = &layouts[0]}}, - {MODKEY, XK_w, XK_m, setlayout, {.v = &layouts[2]}}, - {MODKEY, XK_w, XK_b, setlayout, {.v = &layouts[3]}}, - {MODKEY, XK_w, XK_h, setlayout, {.v = &layouts[4]}}, - {MODKEY, XK_w, XK_f, setlayout, {.v = &layouts[1]}}, - {MODKEY, -1, XK_F11, fullscreen, {0}}, - {MODKEY, -1, XK_space, setlayout, {0}}, - {MODKEY | ShiftMask, -1, XK_space, togglefloating, {0}}, - {MODKEY, -1, XK_b, togglebar, {0}}, + &((Keychord){1, {{MODKEY, XK_w}, {MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }), + &((Keychord){1, {{MODKEY, XK_w}, {MODKEY, XK_m}}, setlayout, {.v = &layouts[1]} }), + &((Keychord){1, {{MODKEY, XK_w}, {MODKEY, XK_f}}, setlayout, {.v = &layouts[2]} }), + &((Keychord){1, {{MODKEY, XK_F11}}, fullscreen, {0} }), + &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_space}}, togglefloating, {0} }), + &((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0} }), - {MODKEY, -1, XK_0, view, {.ui = ~0}}, - {MODKEY | ShiftMask, -1, XK_0, tag, {.ui = ~0}}, - {MODKEY, -1, XK_comma, focusmon, {.i = -1}}, - {MODKEY, -1, XK_period, focusmon, {.i = +1}}, - {MODKEY | ShiftMask, -1, XK_comma, tagmon, {.i = -1}}, - {MODKEY | ShiftMask, -1, XK_period, tagmon, {.i = +1}}, + &((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_0}}, tag, {.ui = ~0} }), + &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1} }), + &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_comma}}, tagmon, {.i = -1} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_period}}, tagmon, {.i = +1} }), - {MODKEY | ShiftMask, -1, XK_s, spawn, {.v = (const char *[]){"dmenuprompt","Are you sure you want to shutdown?","shutdown -h now", NULL}}}, - {MODKEY | ShiftMask, -1, XK_r, spawn, {.v = (const char *[]){"dmenuprompt", "Are you sure you want to restart?", "shutdown -r now", NULL}}}, + &((Keychord){1, {{MODKEY | ShiftMask, XK_s}}, spawn, {.v = (const char *[]){"dmenuprompt","Are you sure you want to shutdown?","shutdown -h now", NULL}} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_r}}, spawn, {.v = (const char *[]){"dmenuprompt", "Are you sure you want to restart?", "shutdown -r now", NULL}} }), - {MODKEY | ShiftMask, -1, XK_o, spawn, {.v = (const char *[]){"set-default-sink", NULL}}}, - {MODKEY | ShiftMask, -1, XK_i, spawn, {.v = (const char *[]){"set-default-source", NULL}}}, + &((Keychord){1, {{MODKEY | ShiftMask, XK_o}}, spawn, {.v = (const char *[]){"set-default-sink", NULL}} }), + &((Keychord){1, {{MODKEY | ShiftMask, XK_i}}, spawn, {.v = (const char *[]){"set-default-source", NULL}} }), - {MODKEY, XK_m, XK_p, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}}}, - {MODKEY, XK_m, XK_l, spawn, {.v = (const char *[]){"mpc", "next", NULL}}}, - {MODKEY, XK_m, XK_h, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}}, + &((Keychord){1, {{MODKEY, XK_m}, {MODKEY, XK_p}}, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}} }), + &((Keychord){1, {{MODKEY, XK_m}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){"mpc", "next", NULL}} }), + &((Keychord){1, {{MODKEY, XK_m}, {MODKEY, XK_h}}, spawn, {.v = (const char *[]){"mpc", "prev", NULL}} }), - {MODKEY, XK_o, XK_l, spawn, {.v = (const char *[]){TERMINAL, "-e", "lf", NULL}}}, - {MODKEY, XK_o, XK_f, spawn, {.v = (const char *[]){"firefox-bin", NULL}}}, - {MODKEY, XK_o, XK_e, spawn, {.v = (const char *[]){"element-desktop", NULL}}}, - {MODKEY, XK_o, XK_n, spawn, {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}}, - {MODKEY, XK_o, XK_m, spawn, {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}}}, - {MODKEY, XK_o, XK_t, spawn, {.v = (const char *[]){"thunar", NULL}}}, + &((Keychord){1, {{MODKEY, XK_o}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "lf", NULL}} }), + &((Keychord){1, {{MODKEY, XK_o}, {MODKEY, XK_f}}, spawn, {.v = (const char *[]){"firefox-bin", NULL}} }), + &((Keychord){1, {{MODKEY, XK_o}, {MODKEY, XK_n}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}} }), + &((Keychord){1, {{MODKEY, XK_o}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}} }), + &((Keychord){1, {{MODKEY, XK_o}, {MODKEY, XK_t}}, spawn, {.v = (const char *[]){"thunar", NULL}} }), - {MODKEY, XK_d, XK_m, spawn, {.v = (const char *[]){"mounter", NULL}}}, - {MODKEY, XK_d, XK_c, spawn, {.v = (const char *[]){"dmenumountcifs", NULL}}}, - {MODKEY, XK_d, XK_u, spawn, {.v = (const char *[]){"unmounter", NULL}}}, - {MODKEY, XK_d, XK_s, spawn, {.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}}}, + &((Keychord){1, {{MODKEY, XK_d}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){"mounter", NULL}} }), + &((Keychord){1, {{MODKEY, XK_d}, {MODKEY, XK_c}}, spawn, {.v = (const char *[]){"dmenumountcifs", NULL}} }), + &((Keychord){1, {{MODKEY, XK_d}, {MODKEY, XK_u}}, spawn, {.v = (const char *[]){"unmounter", NULL}} }), + &((Keychord){1, {{MODKEY, XK_d}, {MODKEY, XK_s}}, spawn, {.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}} }), - // I can't get dmenu-bluetooth working without SHCMD :( - {MODKEY, XK_d, XK_b, spawn, SHCMD("dmenu-bluetooth -i -l 25")}, + &((Keychord){1, {{MODKEY, XK_d}, {MODKEY, XK_b}}, spawn, SHCMD("dmenu-bluetooth -i -l 25") }), - // I can't get trayer working without SHCMD :( - {MODKEY | ShiftMask, -1, XK_t, spawn, SHCMD("trayer-toggle trayer --edge top --align center --widthtype request " "--padding 6 --SetDockType true --SetPartialStrut true --expand " "true --transparent true --alpha 0 --tint 0x262626 --height 18 &")}, + &((Keychord){1, {{MODKEY, XK_t}}, spawn, SHCMD("trayer-toggle trayer --edge top --align center --widthtype request " "--padding 6 --SetDockType true --SetPartialStrut true --expand " "true --transparent true --alpha 0 --tint 0x262626 --height 18 &") }), - {MODKEY | ShiftMask, -1, XK_f, spawn, {.v = (const char *[]){"screenlayout", NULL}}}, + &((Keychord){1, {{MODKEY, XK_f}}, spawn, {.v = (const char *[]){"screenlayout", NULL}} }), - {MODKEY, -1, XK_F1, spawn, {.v = (const char *[]){"kbswitcher", NULL}}}, + &((Keychord){1, {{MODKEY, XK_F1}}, spawn, {.v = (const char *[]){"kbswitcher", NULL}} }), - {0, -1, XF86XK_AudioMute, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof " "dwmblocks)")}, - {0, -1, XF86XK_AudioRaiseVolume, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof " "dwmblocks)")}, - {0, -1, XF86XK_AudioLowerVolume, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof " "dwmblocks)")}, - {0, -1, XF86XK_AudioMicMute, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof " "dwmblocks)")}, - {MODKEY, -1, XK_v, spawn, {.v = (const char *[]){"setvol", NULL}}}, + &((Keychord){1, {{0, XF86XK_AudioMute}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof " "dwmblocks)") }), + &((Keychord){1, {{0, XF86XK_AudioRaiseVolume}}, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof " "dwmblocks)") }), + &((Keychord){1, {{0, XF86XK_AudioLowerVolume}}, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof " "dwmblocks)") }), + &((Keychord){1, {{0, XF86XK_AudioMicMute}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof " "dwmblocks)") }), + &((Keychord){1, {{MODKEY, XK_v}}, spawn, {.v = (const char *[]){"setvol", NULL}} }), - {0, -1, XF86XK_MonBrightnessUp, spawn, {.v = (const char *[]){"mod_backlight", "up", NULL}}}, - {0, -1, XF86XK_MonBrightnessDown, spawn, {.v = (const char *[]){"mod_backlight", "down", NULL}}}, + &((Keychord){1, {{0, XF86XK_MonBrightnessUp}}, spawn, {.v = (const char *[]){"mod_backlight", "up", NULL}} }), + &((Keychord){1, {{0, XF86XK_MonBrightnessDown}}, spawn, {.v = (const char *[]){"mod_backlight", "down", NULL}} }), - TAGKEYS(-1, XK_1, 0) - TAGKEYS(-1, XK_2, 1) - TAGKEYS(-1, XK_3, 2) - TAGKEYS(-1, XK_4, 3) - TAGKEYS(-1, XK_5, 4) - TAGKEYS(-1, XK_6, 5) - TAGKEYS(-1, XK_7, 6) - TAGKEYS(-1, XK_8, 7) - TAGKEYS(-1, XK_9, 8) + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) }; /* button definitions */ @@ -214,47 +202,3 @@ static Button buttons[] = { {ClkTagBar, MODKEY, Button3, toggletag, {0}}, }; -// Need to change to following format -// #define TAGKEYS(KEY,TAG) \ -// &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }), \ -// &((Keychord){1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }), \ -// &((Keychord){1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }), \ -// &((Keychord){1, {{MODKEY|ControlMask|ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG} }), -// -// static Keychord *keychords[] = { -// /* Keys function argument */ -// &((Keychord){1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }), -// &((Keychord){2, {{MODKEY, XK_e}, {MODKEY, XK_e}}, spawn, {.v = termcmd } }), -// &((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0} }), -// &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }), -// &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }), -// &((Keychord){1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }), -// &((Keychord){1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }), -// &((Keychord){1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }), -// &((Keychord){1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }), -// &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0} }), -// &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0} }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }), -// &((Keychord){1, {{MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }), -// &((Keychord){1, {{MODKEY, XK_f}}, setlayout, {.v = &layouts[1]} }), -// &((Keychord){1, {{MODKEY, XK_m}}, setlayout, {.v = &layouts[2]} }), -// &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0} }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }), -// &((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }), -// &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }), -// &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }), -// &((Keychord){1, {{MODKEY|ShiftMask, XK_q}}, quit, {0} }), -// TAGKEYS( XK_1, 0) -// TAGKEYS( XK_2, 1) -// TAGKEYS( XK_3, 2) -// TAGKEYS( XK_4, 3) -// TAGKEYS( XK_5, 4) -// TAGKEYS( XK_6, 5) -// TAGKEYS( XK_7, 6) -// TAGKEYS( XK_8, 7) -// TAGKEYS( XK_9, 8) - diff --git a/movestack.c b/movestack.c index 520f4ae..c040462 100644 --- a/movestack.c +++ b/movestack.c @@ -45,4 +45,5 @@ movestack(const Arg *arg) { arrange(selmon); } -} \ No newline at end of file +} +