summaryrefslogtreecommitdiff
path: root/qubes-dwm-6.2/dwm.c
diff options
context:
space:
mode:
Diffstat (limited to 'qubes-dwm-6.2/dwm.c')
-rw-r--r--qubes-dwm-6.2/dwm.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/qubes-dwm-6.2/dwm.c b/qubes-dwm-6.2/dwm.c
index 4cf1de6..cf1a0d3 100644
--- a/qubes-dwm-6.2/dwm.c
+++ b/qubes-dwm-6.2/dwm.c
@@ -52,8 +52,8 @@
#define ISVISIBLE(C) ((C->tags & 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)
-#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
+#define WIDTH(X) ((X)->w + 2 * (X)->bw + gappx)
+#define HEIGHT(X) ((X)->h + 2 * (X)->bw + gappx)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
@@ -1504,12 +1504,21 @@ resizebarwin(Monitor *m) {
void
resizeclient(Client *c, int x, int y, int w, int h)
{
+ unsigned int gapoffset;
+ unsigned int gapincr;
XWindowChanges wc;
- c->oldx = c->x; c->x = wc.x = x;
- c->oldy = c->y; c->y = wc.y = y;
- c->oldw = c->w; c->w = wc.width = w;
- c->oldh = c->h; c->h = wc.height = h;
+ if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
+ gapincr = gapoffset = 0;
+ } else {
+ gapoffset = gappx;
+ gapincr = 2 * gappx;
+ }
+
+ c->oldx = c->x; c->x = wc.x = x + gapoffset;
+ c->oldy = c->y; c->y = wc.y = y + gapoffset;
+ c->oldw = c->w; c->w = wc.width = w - gapincr;
+ c->oldh = c->h; c->h = wc.height = h - gapincr;
wc.border_width = c->bw;
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);