| 1 |
--- config.def.h
|
| 2 |
+++ config.def.h
|
| 3 |
@@ -46,11 +46,11 @@ static const Layout layouts[] = {
|
| 4 |
|
| 5 |
/* key definitions */
|
| 6 |
#define MODKEY Mod1Mask
|
| 7 |
-#define TAGKEYS(KEY,TAG) \
|
| 8 |
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
| 9 |
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
| 10 |
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
| 11 |
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
| 12 |
+#define TAGKEYS(KEY,TAG) \
|
| 13 |
+ &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }), \
|
| 14 |
+ &((Keychord){1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }), \
|
| 15 |
+ &((Keychord){1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }), \
|
| 16 |
+ &((Keychord){1, {{MODKEY|ControlMask|ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG} }),
|
| 17 |
|
| 18 |
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
| 19 |
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
| 20 |
@@ -60,41 +60,42 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
|
| 21 |
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
| 22 |
static const char *termcmd[] = { "st", NULL };
|
| 23 |
|
| 24 |
-static const Key keys[] = {
|
| 25 |
- /* modifier key function argument */
|
| 26 |
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
| 27 |
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
| 28 |
- { MODKEY, XK_b, togglebar, {0} },
|
| 29 |
- { MODKEY, XK_j, focusstack, {.i = +1 } },
|
| 30 |
- { MODKEY, XK_k, focusstack, {.i = -1 } },
|
| 31 |
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
|
| 32 |
- { MODKEY, XK_d, incnmaster, {.i = -1 } },
|
| 33 |
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
|
| 34 |
- { MODKEY, XK_l, setmfact, {.f = +0.05} },
|
| 35 |
- { MODKEY, XK_Return, zoom, {0} },
|
| 36 |
- { MODKEY, XK_Tab, view, {0} },
|
| 37 |
- { MODKEY|ShiftMask, XK_c, killclient, {0} },
|
| 38 |
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
| 39 |
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
| 40 |
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
| 41 |
- { MODKEY, XK_space, setlayout, {0} },
|
| 42 |
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
| 43 |
- { MODKEY, XK_0, view, {.ui = ~0 } },
|
| 44 |
- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
| 45 |
- { MODKEY, XK_comma, focusmon, {.i = -1 } },
|
| 46 |
- { MODKEY, XK_period, focusmon, {.i = +1 } },
|
| 47 |
- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
| 48 |
- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
| 49 |
- TAGKEYS( XK_1, 0)
|
| 50 |
- TAGKEYS( XK_2, 1)
|
| 51 |
- TAGKEYS( XK_3, 2)
|
| 52 |
- TAGKEYS( XK_4, 3)
|
| 53 |
- TAGKEYS( XK_5, 4)
|
| 54 |
- TAGKEYS( XK_6, 5)
|
| 55 |
- TAGKEYS( XK_7, 6)
|
| 56 |
- TAGKEYS( XK_8, 7)
|
| 57 |
- TAGKEYS( XK_9, 8)
|
| 58 |
- { MODKEY|ShiftMask, XK_q, quit, {0} },
|
| 59 |
+static Keychord *keychords[] = {
|
| 60 |
+ /* Keys function argument */
|
| 61 |
+ &((Keychord){1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }),
|
| 62 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }),
|
| 63 |
+ &((Keychord){2, {{MODKEY, XK_e}, {MODKEY, XK_e}}, spawn, {.v = termcmd } }),
|
| 64 |
+ &((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0} }),
|
| 65 |
+ &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }),
|
| 66 |
+ &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }),
|
| 67 |
+ &((Keychord){1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }),
|
| 68 |
+ &((Keychord){1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }),
|
| 69 |
+ &((Keychord){1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }),
|
| 70 |
+ &((Keychord){1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }),
|
| 71 |
+ &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0} }),
|
| 72 |
+ &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0} }),
|
| 73 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }),
|
| 74 |
+ &((Keychord){1, {{MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }),
|
| 75 |
+ &((Keychord){1, {{MODKEY, XK_f}}, setlayout, {.v = &layouts[1]} }),
|
| 76 |
+ &((Keychord){1, {{MODKEY, XK_m}}, setlayout, {.v = &layouts[2]} }),
|
| 77 |
+ &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0} }),
|
| 78 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }),
|
| 79 |
+ &((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }),
|
| 80 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }),
|
| 81 |
+ &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }),
|
| 82 |
+ &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }),
|
| 83 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }),
|
| 84 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }),
|
| 85 |
+ &((Keychord){1, {{MODKEY|ShiftMask, XK_q}}, quit, {0} }),
|
| 86 |
+ TAGKEYS( XK_1, 0)
|
| 87 |
+ TAGKEYS( XK_2, 1)
|
| 88 |
+ TAGKEYS( XK_3, 2)
|
| 89 |
+ TAGKEYS( XK_4, 3)
|
| 90 |
+ TAGKEYS( XK_5, 4)
|
| 91 |
+ TAGKEYS( XK_6, 5)
|
| 92 |
+ TAGKEYS( XK_7, 6)
|
| 93 |
+ TAGKEYS( XK_8, 7)
|
| 94 |
+ TAGKEYS( XK_9, 8)
|
| 95 |
};
|
| 96 |
|
| 97 |
/* button definitions */
|