diff options
| author | bakkeby <[email protected]> | 2020-06-21 09:07:51 +0200 |
|---|---|---|
| committer | bakkeby <[email protected]> | 2020-06-21 09:07:51 +0200 |
| commit | 62cca4897be4b68257c0679bdc1491f0052cd730 (patch) | |
| tree | 5494f7029fa251c311193d435fc7a0efb78c28b8 /config.def.h | |
| parent | f27195491c56fe53c75942236077c4152176a582 (diff) | |
| download | dwm-flexipatch-62cca4897be4b68257c0679bdc1491f0052cd730.tar.gz dwm-flexipatch-62cca4897be4b68257c0679bdc1491f0052cd730.zip | |
Tidy following tagothermonitor merge
Diffstat (limited to 'config.def.h')
| -rw-r--r-- | config.def.h | 49 |
1 files changed, 38 insertions, 11 deletions
diff --git a/config.def.h b/config.def.h index f693266..0a43c48 100644 --- a/config.def.h +++ b/config.def.h @@ -511,10 +511,10 @@ static Signal signals[] = { #if XRDB_PATCH && !VTCOLORS_PATCH { "xrdb", xrdb }, #endif // XRDB_PATCH - #if TAGOTHERMONITOR_PATCH + #if TAGOTHERMONITOR_PATCH { "tagnextmonex", tagnextmonex }, { "tagprevmonex", tagprevmonex }, - #endif // TAGOTHERMONITOR_PATCH + #endif // TAGOTHERMONITOR_PATCH { "quit", quit }, { "setlayout", setlayout }, { "setlayoutex", setlayoutex }, @@ -659,19 +659,45 @@ static const Layout layouts[] = { /* key definitions */ #define MODKEY Mod1Mask -#if COMBO_PATCH && SWAPTAGS_PATCH +#if COMBO_PATCH && SWAPTAGS_PATCH && TAGOTHERMONITOR_PATCH +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask|ShiftMask, KEY, swaptags, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask|ControlMask, KEY, tagprevmon, {.ui = 1 << TAG} }, +#elif COMBO_PATCH && SWAPTAGS_PATCH #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, \ { MODKEY|Mod4Mask|ShiftMask, KEY, swaptags, {.ui = 1 << TAG} }, +#elif COMBO_PATCH && TAGOTHERMONITOR_PATCH +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask|ControlMask, KEY, tagprevmon, {.ui = 1 << TAG} }, #elif COMBO_PATCH #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#elif SWAPTAGS_PATCH && TAGOTHERMONITOR_PATCH +#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} }, \ + { MODKEY|Mod4Mask|ShiftMask, KEY, swaptags, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask|ControlMask, KEY, tagprevmon, {.ui = 1 << TAG} }, #elif SWAPTAGS_PATCH #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ @@ -679,20 +705,21 @@ static const Layout layouts[] = { { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, \ { MODKEY|Mod4Mask|ShiftMask, KEY, swaptags, {.ui = 1 << TAG} }, +#elif TAGOTHERMONITOR_PATCH +#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} }, \ + { MODKEY|Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG} }, \ + { MODKEY|Mod4Mask|ControlMask, KEY, tagprevmon, {.ui = 1 << TAG} }, #else #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} }, -#endif // COMBO_PATCH / SWAPTAGS_PATCH - -#if TAGOTHERMONITOR_PATCH -/* TODO: Choose keybindings for TAGOTHERMONITOR_PATCH - { MODKEY|Mod4Mask, KEY, tagnextmon, {.ui = 1 << TAG} }, \ - { MODKEY|Mod4Mask|ShiftMask, KEY, tagprevmon, {.ui = 1 << TAG} }, \ -*/ -#endif // TAGOTHERMONITOR_PATCH +#endif // COMBO_PATCH / SWAPTAGS_PATCH / TAGOTHERMONITOR_PATCH #if STACKER_PATCH #define STACKKEYS(MOD,ACTION) \ |