commit 68363d322786418db7e878d00be0c4b1d800b35b
parent fb8caa45dd3f9a6c1a6451123d2ab1b81a0c4b17
Author: Frostbyte <frostbyte@duck.com>
Date: Tue, 5 Sep 2023 17:34:39 -0400
[dwm][patch][attachasideandbelow] Add updated patch
Diffstat:
2 files changed, 105 insertions(+), 0 deletions(-)
diff --git a/dwm.suckless.org/patches/attachasideandbelow/dwm-attachasideandbelow-6.4.diff b/dwm.suckless.org/patches/attachasideandbelow/dwm-attachasideandbelow-6.4.diff
@@ -0,0 +1,104 @@
+diff --git a/dwm.c b/dwm.c
+index e5efb6a..7b8d4a0 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -49,7 +49,8 @@
+ #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
+ #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 ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
++#define ISVISIBLEONTAG(C, T) ((C->tags & T))
++#define ISVISIBLE(C) ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags])
+ #define LENGTH(X) (sizeof X / sizeof X[0])
+ #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+ #define WIDTH(X) ((X)->w + 2 * (X)->bw)
+@@ -147,6 +148,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac
+ static void arrange(Monitor *m);
+ static void arrangemon(Monitor *m);
+ static void attach(Client *c);
++static void attachBelow(Client *c);
+ static void attachstack(Client *c);
+ static void buttonpress(XEvent *e);
+ static void checkotherwm(void);
+@@ -184,6 +186,7 @@ static void maprequest(XEvent *e);
+ static void monocle(Monitor *m);
+ static void motionnotify(XEvent *e);
+ static void movemouse(const Arg *arg);
++static Client *nexttagged(Client *c);
+ static Client *nexttiled(Client *c);
+ static void pop(Client *c);
+ static void propertynotify(XEvent *e);
+@@ -408,6 +411,27 @@ attach(Client *c)
+ c->next = c->mon->clients;
+ c->mon->clients = c;
+ }
++void
++attachBelow(Client *c)
++{
++ //If there is nothing on the monitor or the selected client is floating, attach as normal
++ if(c->mon->sel == NULL || c->mon->sel->isfloating) {
++ Client *at = nexttagged(c);
++ if(!at) {
++ attach(c);
++ return;
++ }
++ c->next = at->next;
++ at->next = c;
++ return;
++ }
++
++ //Set the new client's next property to the same as the currently selected clients next
++ c->next = c->mon->sel->next;
++ //Set the currently selected clients next property to the new client
++ c->mon->sel->next = c;
++
++}
+
+ void
+ attachstack(Client *c)
+@@ -1065,7 +1089,7 @@ manage(Window w, XWindowAttributes *wa)
+ c->isfloating = c->oldstate = trans != None || c->isfixed;
+ if (c->isfloating)
+ XRaiseWindow(dpy, c->win);
+- attach(c);
++ attachBelow(c);
+ attachstack(c);
+ XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
+ (unsigned char *) &(c->win), 1);
+@@ -1193,6 +1217,16 @@ movemouse(const Arg *arg)
+ }
+ }
+
++ Client *
++nexttagged(Client *c) {
++ Client *walked = c->mon->clients;
++ for(;
++ walked && (walked->isfloating || !ISVISIBLEONTAG(walked, c->tags));
++ walked = walked->next
++ );
++ return walked;
++}
++
+ Client *
+ nexttiled(Client *c)
+ {
+@@ -1418,7 +1452,7 @@ sendmon(Client *c, Monitor *m)
+ detachstack(c);
+ c->mon = m;
+ c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+- attach(c);
++ attachBelow(c);
+ attachstack(c);
+ focus(NULL);
+ arrange(NULL);
+@@ -1898,6 +1932,7 @@ updategeom(void)
+ detachstack(c);
+ c->mon = mons;
+ attach(c);
++ attachBelow(c);
+ attachstack(c);
+ }
+ if (m == selmon)
+--
+2.41.0
+
diff --git a/dwm.suckless.org/patches/attachasideandbelow/index.md b/dwm.suckless.org/patches/attachasideandbelow/index.md
@@ -9,6 +9,7 @@ client.
Download
--------
+* [dwm-attachasideandbelow-6.4.diff](dwm-attachasideandbelow-6.4.diff)
* [dwm-attachasideandbelow-20200702-f04cac6.diff](dwm-attachasideandbelow-20200702-f04cac6.diff)
