-#define MODKEY Mod1Mask
-#define KEYS \
-Key keys[] = { \
- /* modifier key function argument */ \
- { MODKEY, XK_p, spawn, \
- "exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
- " -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
- { MODKEY|ShiftMask, XK_Return, spawn, "exec uxterm" }, \
- { MODKEY, XK_space, setlayout, NULL }, \
- { MODKEY, XK_b, togglebar, NULL }, \
- { MODKEY, XK_j, focusnext, NULL }, \
- { MODKEY, XK_k, focusprev, NULL }, \
- { MODKEY, XK_h, setmwfact, "-0.05" }, \
- { MODKEY, XK_l, setmwfact, "+0.05" }, \
- { MODKEY, XK_m, togglemax, NULL }, \
- { MODKEY, XK_Return, zoom, NULL }, \
- { MODKEY, XK_Tab, viewprevtag, NULL }, \
- { MODKEY|ShiftMask, XK_space, togglefloating, NULL }, \
- { MODKEY|ShiftMask, XK_c, killclient, NULL }, \
- { MODKEY, XK_0, view, NULL }, \
- { MODKEY, XK_1, view, tags[0] }, \
- { MODKEY, XK_2, view, tags[1] }, \
- { MODKEY, XK_3, view, tags[2] }, \
- { MODKEY, XK_4, view, tags[3] }, \
- { MODKEY, XK_5, view, tags[4] }, \
- { MODKEY, XK_6, view, tags[5] }, \
- { MODKEY, XK_7, view, tags[6] }, \
- { MODKEY, XK_8, view, tags[7] }, \
- { MODKEY, XK_9, view, tags[8] }, \
- { MODKEY|ControlMask, XK_1, toggleview, tags[0] }, \
- { MODKEY|ControlMask, XK_2, toggleview, tags[1] }, \
- { MODKEY|ControlMask, XK_3, toggleview, tags[2] }, \
- { MODKEY|ControlMask, XK_4, toggleview, tags[3] }, \
- { MODKEY|ControlMask, XK_5, toggleview, tags[4] }, \
- { MODKEY|ControlMask, XK_6, toggleview, tags[5] }, \
- { MODKEY|ControlMask, XK_7, toggleview, tags[6] }, \
- { MODKEY|ControlMask, XK_8, toggleview, tags[7] }, \
- { MODKEY|ControlMask, XK_9, toggleview, tags[8] }, \
- { MODKEY|ShiftMask, XK_0, tag, NULL }, \
- { MODKEY|ShiftMask, XK_1, tag, tags[0] }, \
- { MODKEY|ShiftMask, XK_2, tag, tags[1] }, \
- { MODKEY|ShiftMask, XK_3, tag, tags[2] }, \
- { MODKEY|ShiftMask, XK_4, tag, tags[3] }, \
- { MODKEY|ShiftMask, XK_5, tag, tags[4] }, \
- { MODKEY|ShiftMask, XK_6, tag, tags[5] }, \
- { MODKEY|ShiftMask, XK_7, tag, tags[6] }, \
- { MODKEY|ShiftMask, XK_8, tag, tags[7] }, \
- { MODKEY|ShiftMask, XK_9, tag, tags[8] }, \
- { MODKEY|ControlMask|ShiftMask, XK_1, toggletag, tags[0] }, \
- { MODKEY|ControlMask|ShiftMask, XK_2, toggletag, tags[1] }, \
- { MODKEY|ControlMask|ShiftMask, XK_3, toggletag, tags[2] }, \
- { MODKEY|ControlMask|ShiftMask, XK_4, toggletag, tags[3] }, \
- { MODKEY|ControlMask|ShiftMask, XK_5, toggletag, tags[4] }, \
- { MODKEY|ControlMask|ShiftMask, XK_6, toggletag, tags[5] }, \
- { MODKEY|ControlMask|ShiftMask, XK_7, toggletag, tags[6] }, \
- { MODKEY|ControlMask|ShiftMask, XK_8, toggletag, tags[7] }, \
- { MODKEY|ControlMask|ShiftMask, XK_9, toggletag, tags[8] }, \
- { MODKEY|ShiftMask, XK_q, quit, NULL }, \
+#define MODKEY Mod1Mask
+#define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
+ { 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 } }
+
+/* commands */
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *termcmd[] = { "st", NULL };
+
+static Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY, XK_b, togglebar, {0} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, XK_d, incnmaster, {.i = -1 } },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+ { MODKEY, XK_l, setmfact, {.f = +0.05} },
+ { MODKEY, XK_Return, zoom, {0} },
+ { MODKEY, XK_Tab, view, {0} },
+ { MODKEY|ShiftMask, XK_c, killclient, {0} },
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY, XK_space, setlayout, {0} },
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_0, view, {.ui = ~0 } },
+ { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
+ { MODKEY, XK_comma, focusmon, {.i = -1 } },
+ { MODKEY, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
+ 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)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
+};
+
+/* button definitions */
+/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static Button buttons[] = {
+ /* click event mask button function argument */
+ { ClkLtSymbol, 0, Button1, setlayout, {0} },
+ { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
+ { ClkWinTitle, 0, Button2, zoom, {0} },
+ { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
+ { ClkClientWin, MODKEY, Button1, movemouse, {0} },
+ { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
+ { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
+ { ClkTagBar, 0, Button1, view, {0} },
+ { ClkTagBar, 0, Button3, toggleview, {0} },
+ { ClkTagBar, MODKEY, Button1, tag, {0} },
+ { ClkTagBar, MODKEY, Button3, toggletag, {0} },