diff options
author | Luke Smith <luke@lukesmith.xyz> | 2019-12-18 21:31:32 -0500 |
---|---|---|
committer | Luke Smith <luke@lukesmith.xyz> | 2019-12-18 21:31:32 -0500 |
commit | 927200f32d4ea957f525e2185ca873eafa3c2efe (patch) | |
tree | 5a3daf6af1e479c9bf79a360726018c85f578c42 /config.h | |
parent | e5a3fdff88ddb3698f6899ad145d54793f19570d (diff) |
stacker patch replaces movestack
Diffstat (limited to 'config.h')
-rw-r--r-- | config.h | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -44,7 +44,6 @@ static const float mfact = 0.55; /* factor of master area size [0.05..0.95] static const int nmaster = 1; /* number of clients in master area */ static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ -#include "shiftview.c" #include "fibonacci.c" static const Layout layouts[] = { /* symbol arrange function */ @@ -64,6 +63,14 @@ static const Layout layouts[] = { { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#define STACKKEYS(MOD,ACTION) \ + { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ + { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ + /* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */ + /* { MOD, XK_q, ACTION##stack, {.i = 0 } }, \ */ + /* { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ */ + /* { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ */ + /* { MOD, XK_x, ACTION##stack, {.i = -1 } }, */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -76,10 +83,11 @@ static const char scratchpadname[] = "scratchpad"; static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "120x34", NULL }; #include <X11/XF86keysym.h> -#include "movestack.c" +#include "shiftview.c" static Key keys[] = { /* modifier key function argument */ - + STACKKEYS(MODKEY, focus) + STACKKEYS(MODKEY|ShiftMask, push) { MODKEY, XK_grave, spawn, SHCMD("dmenuunicode") }, /* { MODKEY|ShiftMask, XK_grave, togglescratch, SHCMD("") }, */ TAGKEYS( XK_1, 0) @@ -140,10 +148,10 @@ static Key keys[] = { { MODKEY, XK_g, shiftview, { .i = -1 } }, /* { MODKEY|ShiftMask, XK_g, spawn, SHCMD("") }, */ { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } }, + /* { MODKEY, XK_j, focusstack, {.i = +1 } }, */ + /* { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, */ + /* { MODKEY, XK_k, focusstack, {.i = -1 } }, */ + /* { MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } }, */ { MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_semicolon, shiftview, { .i = 1 } }, /* { MODKEY|ShiftMask, XK_semicolon, shiftview, SHCMD("") }, */ |