diff options
| -rw-r--r-- | config.def.h | 10 | ||||
| -rw-r--r-- | patch/include.c | 3 | ||||
| -rw-r--r-- | patch/include.h | 3 | ||||
| -rw-r--r-- | patch/shifttagclients.c | 49 | ||||
| -rw-r--r-- | patch/shifttagclients.h | 1 | ||||
| -rw-r--r-- | patch/shiftviewclients.c | 3 | ||||
| -rw-r--r-- | patches.def.h | 6 |
7 files changed, 74 insertions, 1 deletions
diff --git a/config.def.h b/config.def.h index e4c9f7b..c7ea6c3 100644 --- a/config.def.h +++ b/config.def.h @@ -983,6 +983,10 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_Left, shifttag, { .i = -1 } }, // note keybinding conflict with focusadjacenttag tagtoleft { MODKEY|ShiftMask, XK_Right, shifttag, { .i = +1 } }, // note keybinding conflict with focusadjacenttag tagtoright #endif // SHIFTTAG_PATCH + #if SHIFTTAGCLIENTS_PATCH + { MODKEY|ShiftMask|ControlMask, XK_Left, shifttagclients, { .i = -1 } }, + { MODKEY|ShiftMask|ControlMask, XK_Right, shifttagclients, { .i = +1 } }, + #endif // SHIFTTAGCLIENTS_PATCH #if SHIFTVIEW_PATCH { MODKEY|ShiftMask, XK_Tab, shiftview, { .i = -1 } }, { MODKEY|ShiftMask, XK_backslash, shiftview, { .i = +1 } }, @@ -1428,6 +1432,9 @@ static Signal signals[] = { #if SHIFTTAG_PATCH { "shifttag", shifttag }, #endif // SHIFTTAG_PATCH + #if SHIFTTAGCLIENTS_PATCH + { "shifttagclients", shifttagclients }, + #endif // SHIFTTAGCLIENTS_PATCH #if SHIFTVIEW_PATCH { "shiftview", shiftview }, #endif // SHIFTVIEW_PATCH @@ -1619,6 +1626,9 @@ static IPCCommand ipccommands[] = { #if SHIFTTAG_PATCH IPCCOMMAND( shifttag, 1, {ARG_TYPE_SINT} ), #endif // SHIFTVIEW_PATCH + #if SHIFTTAGCLIENTS_PATCH + IPCCOMMAND( shifttagclients, 1, {ARG_TYPE_SINT} ), + #endif // SHIFTVIEWCLIENTS_PATCH #if SHIFTVIEW_PATCH IPCCOMMAND( shiftview, 1, {ARG_TYPE_SINT} ), #endif // SHIFTVIEW_PATCH diff --git a/patch/include.c b/patch/include.c index 20ac9df..2af5433 100644 --- a/patch/include.c +++ b/patch/include.c @@ -235,6 +235,9 @@ #if SHIFTTAG_PATCH #include "shifttag.c" #endif +#if SHIFTTAGCLIENTS_PATCH +#include "shifttagclients.c" +#endif #if SHIFTVIEW_PATCH #include "shiftview.c" #endif diff --git a/patch/include.h b/patch/include.h index 6806b59..eb6b58f 100644 --- a/patch/include.h +++ b/patch/include.h @@ -237,6 +237,9 @@ #if SHIFTTAG_PATCH #include "shifttag.h" #endif +#if SHIFTTAGCLIENTS_PATCH +#include "shifttagclients.h" +#endif #if SHIFTVIEW_PATCH #include "shiftview.h" #endif diff --git a/patch/shifttagclients.c b/patch/shifttagclients.c new file mode 100644 index 0000000..e8da31d --- /dev/null +++ b/patch/shifttagclients.c @@ -0,0 +1,49 @@ +/* Sends a window to the next/prev tag that has a client, else it moves it to the next/prev one. */ +void +shifttagclients(const Arg *arg) +{ + Arg shifted; + Client *c; + unsigned int tagmask = 0; + + #if TAGSYNC_PATCH + Monitor *origselmon = selmon; + for (selmon = mons; selmon; selmon = selmon->next) + #endif // TAGSYNC_PATCH + for (c = selmon->clients; c; c = c->next) { + if (c == selmon->sel) + continue; + #if SCRATCHPADS_PATCH && !RENAMED_SCRATCHPADS_PATCH + if (!(c->tags & SPTAGMASK)) + tagmask = tagmask | c->tags; + #elif SCRATCHPAD_ALT_1_PATCH + if (!(c->tags & SCRATCHPAD_MASK)) + tagmask = tagmask | c->tags; + #else + tagmask = tagmask | c->tags; + #endif // SCRATCHPADS_PATCH + } + #if TAGSYNC_PATCH + selmon = origselmon; + #endif // TAGSYNC_PATCH + + #if SCRATCHPADS_PATCH && !RENAMED_SCRATCHPADS_PATCH + shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK; + #else + shifted.ui = selmon->tagset[selmon->seltags]; + #endif // SCRATCHPADS_PATCH + + do { + if (arg->i > 0) // left circular shift + shifted.ui = (shifted.ui << arg->i) + | (shifted.ui >> (NUMTAGS - arg->i)); + else // right circular shift + shifted.ui = (shifted.ui >> -arg->i) + | (shifted.ui << (NUMTAGS + arg->i)); + #if SCRATCHPADS_PATCH && !RENAMED_SCRATCHPADS_PATCH + shifted.ui &= ~SPTAGMASK; + #endif // SCRATCHPADS_PATCH + } while (tagmask && !(shifted.ui & tagmask)); + + tag(&shifted); +} diff --git a/patch/shifttagclients.h b/patch/shifttagclients.h new file mode 100644 index 0000000..43049a0 --- /dev/null +++ b/patch/shifttagclients.h @@ -0,0 +1 @@ +static void shifttagclients(const Arg *arg); diff --git a/patch/shiftviewclients.c b/patch/shiftviewclients.c index 5755e7c..f64f42b 100644 --- a/patch/shiftviewclients.c +++ b/patch/shiftviewclients.c @@ -10,6 +10,8 @@ shiftviewclients(const Arg *arg) for (selmon = mons; selmon; selmon = selmon->next) #endif // TAGSYNC_PATCH for (c = selmon->clients; c; c = c->next) { + if (c == selmon->sel) + continue; #if SCRATCHPADS_PATCH && !RENAMED_SCRATCHPADS_PATCH if (!(c->tags & SPTAGMASK)) tagmask = tagmask | c->tags; @@ -44,4 +46,3 @@ shiftviewclients(const Arg *arg) view(&shifted); } - diff --git a/patches.def.h b/patches.def.h index ec6eab9..83ae574 100644 --- a/patches.def.h +++ b/patches.def.h @@ -974,6 +974,12 @@ */ #define SHIFTTAG_PATCH 0 +/* Moves the current selected client to the adjacent tag that has at least one client, if none + * then it acts as shifttag. + * https://dwm.suckless.org/patches/shift-tools/ + */ +#define SHIFTTAGCLIENTS_PATCH 0 + /* This patch adds keybindings for left and right circular shift through tags. * https://github.com/chau-bao-long/dotfiles/blob/master/suckless/dwm/shiftview.diff */ |