107 lines
6.4 KiB
Plaintext
107 lines
6.4 KiB
Plaintext
--- config.def.h
|
|
+++ config.def.h
|
|
@@ -47,10 +47,10 @@ static const Layout layouts[] = {
|
|
/* key definitions */
|
|
#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} },
|
|
+ { {0,0,0,0}, {KEY,0,0,0}, view, {.ui = 1 << TAG} }, \
|
|
+ { {ControlMask,0,0,0}, {KEY,0,0,0}, toggleview, {.ui = 1 << TAG} }, \
|
|
+ { {ShiftMask,0,0,0}, {KEY,0,0,0}, tag, {.ui = 1 << TAG} }, \
|
|
+ { {ControlMask|ShiftMask,0,0,0}, {KEY,0,0,0}, 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 } }
|
|
@@ -62,39 +62,50 @@ 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} },
|
|
+ { MODKEY, XK_Escape, setkeymode, {.ui = ModeCommand} },
|
|
+};
|
|
+
|
|
+static Key cmdkeys[] = {
|
|
+ /* modifier keys function argument */
|
|
+ { 0, XK_Escape, clearcmd, {0} },
|
|
+ { ControlMask, XK_g, clearcmd, {0} },
|
|
+ { 0, XK_i, setkeymode, {.ui = ModeInsert} },
|
|
+};
|
|
+static Command commands[] = {
|
|
+ /* modifier (4 keys) keysyms (4 keys) function argument */
|
|
+ { {0, 0, 0, 0}, { XK_p, 0, 0, 0}, spawn, {.v = dmenucmd } },
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_Return, 0, 0, 0}, spawn, {.v = termcmd } },
|
|
+ { {0, 0, 0, 0}, { XK_b, 0, 0, 0}, togglebar, {0} },
|
|
+ { {0, 0, 0, 0}, { XK_j, 0, 0, 0}, focusstack, {.i = +1 } },
|
|
+ { {0, 0, 0, 0}, { XK_k, 0, 0, 0}, focusstack, {.i = -1 } },
|
|
+ { {0, 0, 0, 0}, { XK_i, 0, 0, 0}, incnmaster, {.i = +1 } },
|
|
+ { {0, 0, 0, 0}, { XK_d, 0, 0, 0}, incnmaster, {.i = -1 } },
|
|
+ { {0, 0, 0, 0}, { XK_h, 0, 0, 0}, setmfact, {.f = -0.05} },
|
|
+ { {0, 0, 0, 0}, { XK_l, 0, 0, 0}, setmfact, {.f = +0.05} },
|
|
+ { {0, 0, 0, 0}, { XK_Return, 0, 0, 0}, zoom, {0} },
|
|
+ { {ControlMask, 0, 0, 0}, { XK_i, 0, 0, 0}, view, {0} },
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_k, 0, 0, 0}, killclient, {0} },
|
|
+ { {0, 0, 0, 0}, { XK_t, 0, 0, 0}, setlayout, {.v = &layouts[0]} },
|
|
+ { {0, 0, 0, 0}, { XK_f, 0, 0, 0}, setlayout, {.v = &layouts[1]} },
|
|
+ { {0, 0, 0, 0}, { XK_m, 0, 0, 0}, setlayout, {.v = &layouts[2]} },
|
|
+ { {0, 0, 0, 0}, { XK_space, 0, 0, 0}, setlayout, {0} },
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_space, 0, 0, 0}, togglefloating, {0} },
|
|
+ { {0, 0, 0, 0}, { XK_0, 0, 0, 0}, view, {.ui = ~0 } },
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_0, 0, 0, 0}, tag, {.ui = ~0 } },
|
|
+ { {0, 0, 0, 0}, { XK_comma, 0, 0, 0}, focusmon, {.i = -1 } },
|
|
+ { {0, 0, 0, 0}, { XK_period, 0, 0, 0}, focusmon, {.i = +1 } },
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_comma, 0, 0, 0}, tagmon, {.i = -1 } },
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_period, 0, 0, 0}, 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)
|
|
+ { {ShiftMask, 0, 0, 0}, { XK_q, 0, 0, 0}, quit, {0} },
|
|
};
|
|
|
|
/* button definitions */
|
|
@@ -113,4 +124,3 @@ static Button buttons[] = {
|
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
|
};
|
|
-
|