commit 27ec8780b62f7e35ffcc0aaaa807bd96dd1bd435
parent 4017425b709c00737b07fc4cb9fdcb97fb2b95b6
Author: MLquest8 <miskuzius@gmail.com>
Date: Fri, 12 Jun 2020 16:09:08 +0400
[dwm][PATCH] updated stacker for version 6.2
Diffstat:
2 files changed, 199 insertions(+), 0 deletions(-)
diff --git a/dwm.suckless.org/patches/stacker/dwm-stacker-6.2.diff b/dwm.suckless.org/patches/stacker/dwm-stacker-6.2.diff
@@ -0,0 +1,197 @@
+From d04f2d00688c8b0969d4f10f460c980dd91dac37 Mon Sep 17 00:00:00 2001
+From: MLquest8 <miskuzius@gmail.com>
+Date: Fri, 12 Jun 2020 16:04:18 +0400
+Subject: [PATCH] stacker updated for version 6.2
+
+---
+ config.def.h | 14 +++++++--
+ dwm.c | 88 ++++++++++++++++++++++++++++++++++++++++------------
+ 2 files changed, 80 insertions(+), 22 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..d28f8fc 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -50,6 +50,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 } }
+@@ -64,8 +72,8 @@ static Key keys[] = {
+ { 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 } },
++ STACKKEYS(MODKEY, focus)
++ STACKKEYS(MODKEY|ShiftMask, push)
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, XK_d, incnmaster, {.i = -1 } },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+@@ -93,7 +101,7 @@ static Key keys[] = {
+ TAGKEYS( XK_7, 6)
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+- { MODKEY|ShiftMask, XK_q, quit, {0} },
++ { MODKEY|ShiftMask, XK_BackSpace, quit, {0} },
+ };
+
+ /* button definitions */
+diff --git a/dwm.c b/dwm.c
+index 9fd0286..6c302c3 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -47,15 +47,21 @@
+ /* macros */
+ #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
+ #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
++#define GETINC(X) ((X) - 2000)
++#define INC(X) ((X) + 2000)
+ #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
+ * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
++#define ISINC(X) ((X) > 1000 && (X) < 3000)
+ #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
++#define PREVSEL 3000
+ #define LENGTH(X) (sizeof X / sizeof X[0])
++#define MOD(N,M) ((N)%(M) < 0 ? (N)%(M) + (M) : (N)%(M))
+ #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+ #define WIDTH(X) ((X)->w + 2 * (X)->bw)
+ #define HEIGHT(X) ((X)->h + 2 * (X)->bw)
+ #define TAGMASK ((1 << LENGTH(tags)) - 1)
+ #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
++#define TRUNC(X,A,B) (MAX((A), MIN((X), (B))))
+
+ /* enums */
+ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+@@ -187,6 +193,7 @@ static void movemouse(const Arg *arg);
+ static Client *nexttiled(Client *c);
+ static void pop(Client *);
+ static void propertynotify(XEvent *e);
++static void pushstack(const Arg *arg);
+ static void quit(const Arg *arg);
+ static Monitor *recttomon(int x, int y, int w, int h);
+ static void resize(Client *c, int x, int y, int w, int h, int interact);
+@@ -207,6 +214,7 @@ static void seturgent(Client *c, int urg);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
++static int stackpos(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+ static void tile(Monitor *);
+@@ -833,27 +841,16 @@ focusmon(const Arg *arg)
+ void
+ focusstack(const Arg *arg)
+ {
+- Client *c = NULL, *i;
++ int i = stackpos(arg);
++ Client *c, *p;
+
+- if (!selmon->sel)
++ if(i < 0)
+ return;
+- if (arg->i > 0) {
+- for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
+- if (!c)
+- for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
+- } else {
+- for (i = selmon->clients; i != selmon->sel; i = i->next)
+- if (ISVISIBLE(i))
+- c = i;
+- if (!c)
+- for (; i; i = i->next)
+- if (ISVISIBLE(i))
+- c = i;
+- }
+- if (c) {
+- focus(c);
+- restack(selmon);
+- }
++
++ for(p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c));
++ i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next);
++ focus(c ? c : p);
++ restack(selmon);
+ }
+
+ Atom
+@@ -1246,6 +1243,29 @@ propertynotify(XEvent *e)
+ }
+ }
+
++void
++pushstack(const Arg *arg) {
++ int i = stackpos(arg);
++ Client *sel = selmon->sel, *c, *p;
++
++ if(i < 0)
++ return;
++ else if(i == 0) {
++ detach(sel);
++ attach(sel);
++ }
++ else {
++ for(p = NULL, c = selmon->clients; c; p = c, c = c->next)
++ if(!(i -= (ISVISIBLE(c) && c != sel)))
++ break;
++ c = c ? c : p;
++ detach(sel);
++ sel->next = c->next;
++ c->next = sel;
++ }
++ arrange(selmon);
++}
++
+ void
+ quit(const Arg *arg)
+ {
+@@ -1653,6 +1673,36 @@ spawn(const Arg *arg)
+ }
+ }
+
++int
++stackpos(const Arg *arg) {
++ int n, i;
++ Client *c, *l;
++
++ if(!selmon->clients)
++ return -1;
++
++ if(arg->i == PREVSEL) {
++ for(l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel); l = l->snext);
++ if(!l)
++ return -1;
++ for(i = 0, c = selmon->clients; c != l; i += ISVISIBLE(c) ? 1 : 0, c = c->next);
++ return i;
++ }
++ else if(ISINC(arg->i)) {
++ if(!selmon->sel)
++ return -1;
++ for(i = 0, c = selmon->clients; c != selmon->sel; i += ISVISIBLE(c) ? 1 : 0, c = c->next);
++ for(n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next);
++ return MOD(i + GETINC(arg->i), n);
++ }
++ else if(arg->i < 0) {
++ for(i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next);
++ return MAX(i + arg->i, 0);
++ }
++ else
++ return arg->i;
++}
++
+ void
+ tag(const Arg *arg)
+ {
+--
+2.26.2
+
diff --git a/dwm.suckless.org/patches/stacker/index.md b/dwm.suckless.org/patches/stacker/index.md
@@ -52,8 +52,10 @@ dwm, which stacker changes to `MODKEY|ShiftMask+BackSpace`.
Download
--------
+* [dwm-stacker-6.2.diff](dwm-stacker-6.2.diff) (12/06/2020)
* [dwm-stacker-6.0.diff](dwm-stacker-6.0.diff)
Author
------
+* MLquest8 (updated for 6.2) (miskuzius at gmail.com)
* Carlos Pita (memeplex) <carlosjosepita@gmail.com>
