nah grouped keybindings by context

diff --git a/config.arg.h b/config.arg.h
index afbc4d1..3cb4158 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -41,8 +41,23 @@ static Layout layout[] = { \
 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \
-       { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
+       { MODKEY,                       XK_p,           spawn, \
+               { .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
+                       " | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
+                       "-sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"')\" && exec $exe" } }, \
+       { MODKEY|ShiftMask,             XK_Return,      spawn, \
+               { .cmd = "exec urxvtcd -tr -bg '#292929' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" } }, \
        { MODKEY,                       XK_space,       setlayout,      { .i = -1 } }, \
+       { MODKEY,                       XK_d,           incnmaster,     { .i = -1 } }, \
+       { MODKEY,                       XK_i,           incnmaster,     { .i = 1 } }, \
+       { MODKEY,                       XK_h,           incmasterw,     { .i = -15 } }, \
+       { MODKEY,                       XK_l,           incmasterw,     { .i = 15 } }, \
+       { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
+       { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
+       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
+       { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
+       { MODKEY|ShiftMask,             XK_space,       toggleversatile,{ 0 } }, \
+       { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
        { MODKEY,                       XK_0,           view,           { .i = -1 } }, \
        { MODKEY,                       XK_1,           view,           { .i = 0 } }, \
        { MODKEY,                       XK_2,           view,           { .i = 1 } }, \
@@ -53,20 +68,15 @@ static Key key[] = { \
        { MODKEY,                       XK_7,           view,           { .i = 6 } }, \
        { MODKEY,                       XK_8,           view,           { .i = 7 } }, \
        { MODKEY,                       XK_9,           view,           { .i = 8 } }, \
-       { MODKEY,                       XK_d,           incnmaster,     { .i = -1 } }, \
-       { MODKEY,                       XK_h,           incmasterw,     { .i = -15 } }, \
-       { MODKEY,                       XK_i,           incnmaster,     { .i = 1 } }, \
-       { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
-       { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
-       { MODKEY,                       XK_l,           incmasterw,     { .i = 15 } }, \
-       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
-       { MODKEY,                       XK_p,           spawn, \
-               { .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
-                       " | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
-                       "-sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"')\" && exec $exe" } }, \
-       { MODKEY|ShiftMask,             XK_Return,      spawn, \
-               { .cmd = "exec urxvtcd -tr -bg '#292929' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" } }, \
-       { MODKEY|ShiftMask,             XK_space,       toggleversatile,{ 0 } }, \
+       { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
+       { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
+       { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
+       { MODKEY|ControlMask,           XK_4,           toggleview,     { .i = 3 } }, \
+       { MODKEY|ControlMask,           XK_5,           toggleview,     { .i = 4 } }, \
+       { MODKEY|ControlMask,           XK_6,           toggleview,     { .i = 5 } }, \
+       { MODKEY|ControlMask,           XK_7,           toggleview,     { .i = 6 } }, \
+       { MODKEY|ControlMask,           XK_8,           toggleview,     { .i = 7 } }, \
+       { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_0,           tag,            { .i = -1 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \
        { MODKEY|ShiftMask,             XK_2,           tag,            { .i = 1 } }, \
@@ -77,17 +87,6 @@ static Key key[] = { \
        { MODKEY|ShiftMask,             XK_7,           tag,            { .i = 6 } }, \
        { MODKEY|ShiftMask,             XK_8,           tag,            { .i = 7 } }, \
        { MODKEY|ShiftMask,             XK_9,           tag,            { .i = 8 } }, \
-       { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
-       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
-       { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
-       { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
-       { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
-       { MODKEY|ControlMask,           XK_4,           toggleview,     { .i = 3 } }, \
-       { MODKEY|ControlMask,           XK_5,           toggleview,     { .i = 4 } }, \
-       { MODKEY|ControlMask,           XK_6,           toggleview,     { .i = 5 } }, \
-       { MODKEY|ControlMask,           XK_7,           toggleview,     { .i = 6 } }, \
-       { MODKEY|ControlMask,           XK_8,           toggleview,     { .i = 7 } }, \
-       { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_1,           toggletag,      { .i = 0 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_2,           toggletag,      { .i = 1 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_3,           toggletag,      { .i = 2 } }, \
@@ -97,4 +96,5 @@ static Key key[] = { \
        { MODKEY|ControlMask|ShiftMask, XK_7,           toggletag,      { .i = 6 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_8,           toggletag,      { .i = 7 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_9,           toggletag,      { .i = 8 } }, \
+       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };

diff --git a/config.default.h b/config.default.h
index ebe91e9..9070b4a 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -42,8 +42,17 @@ static Layout layout[] = { \
 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \
-       { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
        { MODKEY,                       XK_space,       setlayout,      { .i = -1 } }, \
+       { MODKEY,                       XK_d,           incnmaster,     { .i = -1 } }, \
+       { MODKEY,                       XK_i,           incnmaster,     { .i = 1 } }, \
+       { MODKEY,                       XK_h,           incmasterw,     { .i = -15 } }, \
+       { MODKEY,                       XK_l,           incmasterw,     { .i = 15 } }, \
+       { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
+       { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
+       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
+       { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
+       { MODKEY|ShiftMask,             XK_space,       toggleversatile,{ 0 } }, \
+       { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
        { MODKEY,                       XK_0,           view,           { .i = -1 } }, \
        { MODKEY,                       XK_1,           view,           { .i = 0 } }, \
        { MODKEY,                       XK_2,           view,           { .i = 1 } }, \
@@ -54,15 +63,15 @@ static Key key[] = { \
        { MODKEY,                       XK_7,           view,           { .i = 6 } }, \
        { MODKEY,                       XK_8,           view,           { .i = 7 } }, \
        { MODKEY,                       XK_9,           view,           { .i = 8 } }, \
-       { MODKEY,                       XK_d,           incnmaster,     { .i = -1 } }, \
-       { MODKEY,                       XK_h,           incmasterw,     { .i = -15 } }, \
-       { MODKEY,                       XK_i,           incnmaster,     { .i = 1 } }, \
-       { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
-       { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
-       { MODKEY,                       XK_l,           incmasterw,     { .i = 15 } }, \
-       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
-       { MODKEY|ShiftMask,             XK_Return,      spawn,          { .cmd = "exec xterm" } }, \
-       { MODKEY|ShiftMask,             XK_space,       toggleversatile,{ 0 } }, \
+       { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
+       { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
+       { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
+       { MODKEY|ControlMask,           XK_4,           toggleview,     { .i = 3 } }, \
+       { MODKEY|ControlMask,           XK_5,           toggleview,     { .i = 4 } }, \
+       { MODKEY|ControlMask,           XK_6,           toggleview,     { .i = 5 } }, \
+       { MODKEY|ControlMask,           XK_7,           toggleview,     { .i = 6 } }, \
+       { MODKEY|ControlMask,           XK_8,           toggleview,     { .i = 7 } }, \
+       { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_0,           tag,            { .i = -1 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \
        { MODKEY|ShiftMask,             XK_2,           tag,            { .i = 1 } }, \
@@ -73,17 +82,6 @@ static Key key[] = { \
        { MODKEY|ShiftMask,             XK_7,           tag,            { .i = 6 } }, \
        { MODKEY|ShiftMask,             XK_8,           tag,            { .i = 7 } }, \
        { MODKEY|ShiftMask,             XK_9,           tag,            { .i = 8 } }, \
-       { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
-       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
-       { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
-       { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
-       { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
-       { MODKEY|ControlMask,           XK_4,           toggleview,     { .i = 3 } }, \
-       { MODKEY|ControlMask,           XK_5,           toggleview,     { .i = 4 } }, \
-       { MODKEY|ControlMask,           XK_6,           toggleview,     { .i = 5 } }, \
-       { MODKEY|ControlMask,           XK_7,           toggleview,     { .i = 6 } }, \
-       { MODKEY|ControlMask,           XK_8,           toggleview,     { .i = 7 } }, \
-       { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_1,           toggletag,      { .i = 0 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_2,           toggletag,      { .i = 1 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_3,           toggletag,      { .i = 2 } }, \
@@ -93,4 +91,5 @@ static Key key[] = { \
        { MODKEY|ControlMask|ShiftMask, XK_7,           toggletag,      { .i = 6 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_8,           toggletag,      { .i = 7 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_9,           toggletag,      { .i = 8 } }, \
+       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };