ismartborders - dwm - dynamic window manager	Err	parazyd.org	70
hgit clone https://git.parazyd.org/dwm	URL:https://git.parazyd.org/dwm	parazyd.org	70
1Log	/git/dwm/log.gph	parazyd.org	70
1Files	/git/dwm/files.gph	parazyd.org	70
1Refs	/git/dwm/refs.gph	parazyd.org	70
1README	/git/dwm/file/README.gph	parazyd.org	70
1LICENSE	/git/dwm/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit ab128d39306091645ffa318cd8baab08d1128bd8	/git/dwm/commit/ab128d39306091645ffa318cd8baab08d1128bd8.gph	parazyd.org	70
1parent 5581ad51344486680d377831ab21dd1d0190b2d5	/git/dwm/commit/5581ad51344486680d377831ab21dd1d0190b2d5.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Sun, 24 Apr 2022 11:50:18 +0200	Err	parazyd.org	70
i	Err	parazyd.org	70
ismartborders	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M dwm.c                               |      80 +++++++++++++++++++------------	Err	parazyd.org	70
i	Err	parazyd.org	70
i1 file changed, 49 insertions(+), 31 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/dwm.c b/dwm.c	/git/dwm/file/dwm.c.gph	parazyd.org	70
i@@ -166,7 +166,7 @@ struct Systray {	Err	parazyd.org	70
i 	Err	parazyd.org	70
i /* function declarations */	Err	parazyd.org	70
i static void applyrules(Client *c);	Err	parazyd.org	70
i-static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);	Err	parazyd.org	70
i+static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int *bw, int interact);	Err	parazyd.org	70
i static void arrange(Monitor *m);	Err	parazyd.org	70
i static void arrangemon(Monitor *m);	Err	parazyd.org	70
i static void attach(Client *c);	Err	parazyd.org	70
i@@ -215,9 +215,9 @@ static void propertynotify(XEvent *e);	Err	parazyd.org	70
i static void quit(const Arg *arg);	Err	parazyd.org	70
i static Monitor *recttomon(int x, int y, int w, int h);	Err	parazyd.org	70
i static void removesystrayicon(Client *i);	Err	parazyd.org	70
i-static void resize(Client *c, int x, int y, int w, int h, int interact);	Err	parazyd.org	70
i+static void resize(Client *c, int x, int y, int w, int h, int bw, int interact);	Err	parazyd.org	70
i static void resizebarwin(Monitor *m);	Err	parazyd.org	70
i-static void resizeclient(Client *c, int x, int y, int w, int h);	Err	parazyd.org	70
i+static void resizeclient(Client *c, int x, int y, int w, int h, int bw);	Err	parazyd.org	70
i static void resizemouse(const Arg *arg);	Err	parazyd.org	70
i static void resizerequest(XEvent *e);	Err	parazyd.org	70
i static void restack(Monitor *m);	Err	parazyd.org	70
i@@ -359,7 +359,7 @@ applyrules(Client *c)	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i int	Err	parazyd.org	70
i-applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)	Err	parazyd.org	70
i+applysizehints(Client *c, int *x, int *y, int *w, int *h, int *bw, int interact)	Err	parazyd.org	70
i {	Err	parazyd.org	70
i         int baseismin;	Err	parazyd.org	70
i         Monitor *m = c->mon;	Err	parazyd.org	70
i@@ -372,18 +372,18 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)	Err	parazyd.org	70
i                         *x = sw - WIDTH(c);	Err	parazyd.org	70
i                 if (*y > sh)	Err	parazyd.org	70
i                         *y = sh - HEIGHT(c);	Err	parazyd.org	70
i-                if (*x + *w + 2 * c->bw < 0)	Err	parazyd.org	70
i+                if (*x + *w + 2 * *bw < 0)	Err	parazyd.org	70
i                         *x = 0;	Err	parazyd.org	70
i-                if (*y + *h + 2 * c->bw < 0)	Err	parazyd.org	70
i+                if (*y + *h + 2 * *bw < 0)	Err	parazyd.org	70
i                         *y = 0;	Err	parazyd.org	70
i         } else {	Err	parazyd.org	70
i                 if (*x >= m->wx + m->ww)	Err	parazyd.org	70
i                         *x = m->wx + m->ww - WIDTH(c);	Err	parazyd.org	70
i                 if (*y >= m->wy + m->wh)	Err	parazyd.org	70
i                         *y = m->wy + m->wh - HEIGHT(c);	Err	parazyd.org	70
i-                if (*x + *w + 2 * c->bw <= m->wx)	Err	parazyd.org	70
i+                if (*x + *w + 2 * *bw <= m->wx)	Err	parazyd.org	70
i                         *x = m->wx;	Err	parazyd.org	70
i-                if (*y + *h + 2 * c->bw <= m->wy)	Err	parazyd.org	70
i+                if (*y + *h + 2 * *bw <= m->wy)	Err	parazyd.org	70
i                         *y = m->wy;	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i         if (*h < bh)	Err	parazyd.org	70
i@@ -423,7 +423,7 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)	Err	parazyd.org	70
i                 if (c->maxh)	Err	parazyd.org	70
i                         *h = MIN(*h, c->maxh);	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i-        return *x != c->x || *y != c->y || *w != c->w || *h != c->h;	Err	parazyd.org	70
i+        return *x != c->x || *y != c->y || *w != c->w || *h != c->h || *bw != c->bw;	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i void	Err	parazyd.org	70
i@@ -443,9 +443,17 @@ arrange(Monitor *m)	Err	parazyd.org	70
i void	Err	parazyd.org	70
i arrangemon(Monitor *m)	Err	parazyd.org	70
i {	Err	parazyd.org	70
i+        Client *c;	Err	parazyd.org	70
i+	Err	parazyd.org	70
i         strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);	Err	parazyd.org	70
i         if (m->lt[m->sellt]->arrange)	Err	parazyd.org	70
i                 m->lt[m->sellt]->arrange(m);	Err	parazyd.org	70
i+        else	Err	parazyd.org	70
i+                /* <>< case; rather than providing an arrange function and upsetting	Err	parazyd.org	70
i+                 * other logic that tests for its presence, simply add borders here */	Err	parazyd.org	70
i+                for (c = selmon->clients; c; c = c->next)	Err	parazyd.org	70
i+                        if (ISVISIBLE(c) && c->bw == 0)	Err	parazyd.org	70
i+                                resize(c, c->x, c->y, c->w - 2*borderpx, c->h - 2*borderpx, borderpx, 0);	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i void	Err	parazyd.org	70
i@@ -686,7 +694,7 @@ configurenotify(XEvent *e)	Err	parazyd.org	70
i                         for (m = mons; m; m = m->next) {	Err	parazyd.org	70
i                                 for (c = m->clients; c; c = c->next)	Err	parazyd.org	70
i                                         if (c->isfullscreen)	Err	parazyd.org	70
i-                                                resizeclient(c, m->mx, m->my, m->mw, m->mh);	Err	parazyd.org	70
i+                                                resizeclient(c, m->mx, m->my, m->mw, m->mh, 0);	Err	parazyd.org	70
i                                 resizebarwin(m);	Err	parazyd.org	70
i                         }	Err	parazyd.org	70
i                         focus(NULL);	Err	parazyd.org	70
i@@ -1301,7 +1309,7 @@ monocle(Monitor *m)	Err	parazyd.org	70
i         if (n > 0) /* override layout symbol */	Err	parazyd.org	70
i                 snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);	Err	parazyd.org	70
i         for (c = nexttiled(m->clients); c; c = nexttiled(c->next))	Err	parazyd.org	70
i-                resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);	Err	parazyd.org	70
i+                resize(c, m->wx, m->wy, m->ww, m->wh, 0, 0);	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i void	Err	parazyd.org	70
i@@ -1369,7 +1377,7 @@ movemouse(const Arg *arg)	Err	parazyd.org	70
i                         && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))	Err	parazyd.org	70
i                                 togglefloating(NULL);	Err	parazyd.org	70
i                         if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)	Err	parazyd.org	70
i-                                resize(c, nx, ny, c->w, c->h, 1);	Err	parazyd.org	70
i+                                resize(c, nx, ny, c->w, c->h, c->bw, 1);	Err	parazyd.org	70
i                         break;	Err	parazyd.org	70
i                 }	Err	parazyd.org	70
i         } while (ev.type != ButtonRelease);	Err	parazyd.org	70
i@@ -1479,10 +1487,10 @@ removesystrayicon(Client *i)	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i void	Err	parazyd.org	70
i-resize(Client *c, int x, int y, int w, int h, int interact)	Err	parazyd.org	70
i+resize(Client *c, int x, int y, int w, int h, int bw, int interact)	Err	parazyd.org	70
i {	Err	parazyd.org	70
i-        if (applysizehints(c, &x, &y, &w, &h, interact))	Err	parazyd.org	70
i-                resizeclient(c, x, y, w, h);	Err	parazyd.org	70
i+        if (applysizehints(c, &x, &y, &w, &h, &bw, interact))	Err	parazyd.org	70
i+                resizeclient(c, x, y, w, h, bw);	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i void	Err	parazyd.org	70
i@@ -1494,7 +1502,7 @@ resizebarwin(Monitor *m) {	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i void	Err	parazyd.org	70
i-resizeclient(Client *c, int x, int y, int w, int h)	Err	parazyd.org	70
i+resizeclient(Client *c, int x, int y, int w, int h, int bw)	Err	parazyd.org	70
i {	Err	parazyd.org	70
i         XWindowChanges wc;	Err	parazyd.org	70
i 	Err	parazyd.org	70
i@@ -1502,7 +1510,7 @@ resizeclient(Client *c, int x, int y, int w, int h)	Err	parazyd.org	70
i         c->oldy = c->y; c->y = wc.y = y;	Err	parazyd.org	70
i         c->oldw = c->w; c->w = wc.width = w;	Err	parazyd.org	70
i         c->oldh = c->h; c->h = wc.height = h;	Err	parazyd.org	70
i-        wc.border_width = c->bw;	Err	parazyd.org	70
i+        c->oldbw = c->bw; c->bw = wc.border_width = bw;	Err	parazyd.org	70
i         XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);	Err	parazyd.org	70
i         configure(c);	Err	parazyd.org	70
i         XSync(dpy, False);	Err	parazyd.org	70
i@@ -1551,7 +1559,7 @@ resizemouse(const Arg *arg)	Err	parazyd.org	70
i                                         togglefloating(NULL);	Err	parazyd.org	70
i                         }	Err	parazyd.org	70
i                         if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)	Err	parazyd.org	70
i-                                resize(c, c->x, c->y, nw, nh, 1);	Err	parazyd.org	70
i+                                resize(c, c->x, c->y, nw, nh, c->bw, 1);	Err	parazyd.org	70
i                         break;	Err	parazyd.org	70
i                 }	Err	parazyd.org	70
i         } while (ev.type != ButtonRelease);	Err	parazyd.org	70
i@@ -1722,22 +1730,20 @@ setfullscreen(Client *c, int fullscreen)	Err	parazyd.org	70
i                         PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);	Err	parazyd.org	70
i                 c->isfullscreen = 1;	Err	parazyd.org	70
i                 c->oldstate = c->isfloating;	Err	parazyd.org	70
i-                c->oldbw = c->bw;	Err	parazyd.org	70
i-                c->bw = 0;	Err	parazyd.org	70
i                 c->isfloating = 1;	Err	parazyd.org	70
i-                resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);	Err	parazyd.org	70
i+                resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh, 0);	Err	parazyd.org	70
i                 XRaiseWindow(dpy, c->win);	Err	parazyd.org	70
i         } else if (!fullscreen && c->isfullscreen){	Err	parazyd.org	70
i                 XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,	Err	parazyd.org	70
i                         PropModeReplace, (unsigned char*)0, 0);	Err	parazyd.org	70
i                 c->isfullscreen = 0;	Err	parazyd.org	70
i                 c->isfloating = c->oldstate;	Err	parazyd.org	70
i-                c->bw = c->oldbw;	Err	parazyd.org	70
i                 c->x = c->oldx;	Err	parazyd.org	70
i                 c->y = c->oldy;	Err	parazyd.org	70
i                 c->w = c->oldw;	Err	parazyd.org	70
i                 c->h = c->oldh;	Err	parazyd.org	70
i-                resizeclient(c, c->x, c->y, c->w, c->h);	Err	parazyd.org	70
i+                c->bw = c->oldbw;	Err	parazyd.org	70
i+                resizeclient(c, c->x, c->y, c->w, c->h, c->bw);	Err	parazyd.org	70
i                 arrange(c->mon);	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i }	Err	parazyd.org	70
i@@ -1972,13 +1978,18 @@ tagmon(const Arg *arg)	Err	parazyd.org	70
i void	Err	parazyd.org	70
i col(Monitor *m)	Err	parazyd.org	70
i {	Err	parazyd.org	70
i-        unsigned int i, n, h, w, x, y, mw;	Err	parazyd.org	70
i+        unsigned int i, n, h, w, x, y, mw, bw;	Err	parazyd.org	70
i         Client *c;	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);	Err	parazyd.org	70
i         if (n == 0)	Err	parazyd.org	70
i                 return;	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+        if (n == 1)	Err	parazyd.org	70
i+                bw = 0;	Err	parazyd.org	70
i+        else	Err	parazyd.org	70
i+                bw = borderpx;	Err	parazyd.org	70
i+	Err	parazyd.org	70
i         if (n > m->nmaster)	Err	parazyd.org	70
i                 mw = m->nmaster ? m->ww * m->mfact : 0;	Err	parazyd.org	70
i         else	Err	parazyd.org	70
i@@ -1986,11 +1997,11 @@ col(Monitor *m)	Err	parazyd.org	70
i         for (i = x = y = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)	Err	parazyd.org	70
i                 if (i < m->nmaster) {	Err	parazyd.org	70
i                         w = (mw - x) / (MIN(n, m->nmaster) - i);	Err	parazyd.org	70
i-                        resize(c, x + m->wx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), 0);	Err	parazyd.org	70
i+                        resize(c, x + m->wx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), bw, 0);	Err	parazyd.org	70
i                         x += WIDTH(c);	Err	parazyd.org	70
i                 } else {	Err	parazyd.org	70
i                         h = (m->wh - y) / (n - i);	Err	parazyd.org	70
i-                        resize(c, x + m->wx, m->wy + y, m->ww - x - (2 * c->bw), h - (2 * c->bw), 0);	Err	parazyd.org	70
i+                        resize(c, x + m->wx, m->wy + y, m->ww - x - (2 * c->bw), h - (2 * c->bw), bw, 0);	Err	parazyd.org	70
i                         y += HEIGHT(c);	Err	parazyd.org	70
i                 }	Err	parazyd.org	70
i }	Err	parazyd.org	70
i@@ -1998,13 +2009,18 @@ col(Monitor *m)	Err	parazyd.org	70
i void	Err	parazyd.org	70
i tile(Monitor *m)	Err	parazyd.org	70
i {	Err	parazyd.org	70
i-        unsigned int i, n, h, mw, my, ty;	Err	parazyd.org	70
i+        unsigned int i, n, h, mw, my, ty, bw;	Err	parazyd.org	70
i         Client *c;	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);	Err	parazyd.org	70
i         if (n == 0)	Err	parazyd.org	70
i                 return;	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+        if (n == 1)	Err	parazyd.org	70
i+                bw = 0;	Err	parazyd.org	70
i+        else	Err	parazyd.org	70
i+                bw = borderpx;	Err	parazyd.org	70
i+	Err	parazyd.org	70
i         if (n > m->nmaster)	Err	parazyd.org	70
i                 mw = m->nmaster ? m->ww * m->mfact : 0;	Err	parazyd.org	70
i         else	Err	parazyd.org	70
i@@ -2012,12 +2028,12 @@ tile(Monitor *m)	Err	parazyd.org	70
i         for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)	Err	parazyd.org	70
i                 if (i < m->nmaster) {	Err	parazyd.org	70
i                         h = (m->wh - my) / (MIN(n, m->nmaster) - i);	Err	parazyd.org	70
i-                        resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);	Err	parazyd.org	70
i+                        resize(c, m->wx, m->wy + my, mw - 2*bw, h - 2*bw, bw, 0);	Err	parazyd.org	70
i                         if (my + HEIGHT(c) < m->wh)	Err	parazyd.org	70
i                                 my += HEIGHT(c);	Err	parazyd.org	70
i                 } else {	Err	parazyd.org	70
i                         h = (m->wh - ty) / (n - i);	Err	parazyd.org	70
i-                        resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);	Err	parazyd.org	70
i+                        resize(c, m->wx + mw, m->wy + ty, m->ww - mw - 2*bw, h - 2*bw, bw, 0);	Err	parazyd.org	70
i                         if (ty + HEIGHT(c) < m->wh)	Err	parazyd.org	70
i                                 ty += HEIGHT(c);	Err	parazyd.org	70
i                 }	Err	parazyd.org	70
i@@ -2053,7 +2069,9 @@ togglefloating(const Arg *arg)	Err	parazyd.org	70
i         selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;	Err	parazyd.org	70
i         if (selmon->sel->isfloating)	Err	parazyd.org	70
i                 resize(selmon->sel, selmon->sel->x, selmon->sel->y,	Err	parazyd.org	70
i-                        selmon->sel->w, selmon->sel->h, 0);	Err	parazyd.org	70
i+                        selmon->sel->w - 2 * (borderpx - selmon->sel->bw),	Err	parazyd.org	70
i+                        selmon->sel->h - 2 * (borderpx - selmon->sel->bw),	Err	parazyd.org	70
i+                        borderpx, 0);	Err	parazyd.org	70
i         arrange(selmon);	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i@@ -2403,7 +2421,7 @@ updatesystrayicongeom(Client *i, int w, int h)	Err	parazyd.org	70
i                         i->w = w;	Err	parazyd.org	70
i                 else	Err	parazyd.org	70
i                         i->w = (int) ((float)bh * ((float)w / (float)h));	Err	parazyd.org	70
i-                applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);	Err	parazyd.org	70
i+                applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), &(i->bw), False);	Err	parazyd.org	70
i                 /* force icons into the systray dimensions if they don't want to */	Err	parazyd.org	70
i                 if (i->h > bh) {	Err	parazyd.org	70
i                         if (i->w == i->h)	Err	parazyd.org	70
.