#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
-#define NOBORDER(x) ((x) - 2 * c->bw)
+#define WIDTH(x) ((x)->w + 2*(x)->bw)
+#define HEIGHT(x) ((x)->h + 2*(x)->bw)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
+static void showhide(Client *c);
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
static int textnw(const char *text, unsigned int len);
void
arrange(void) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(ISVISIBLE(c)) {
- XMoveWindow(dpy, c->win, c->x, c->y);
- if(!lt[sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, c->w, c->h, True);
- }
- else {
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- }
-
+ showhide(stack);
focus(NULL);
if(lt[sellt]->arrange)
lt[sellt]->arrange();
void
checkotherwm(void) {
otherwm = False;
- XSetErrorHandler(xerrorstart);
+ xerrorxlib = XSetErrorHandler(xerrorstart);
/* this causes an error if some other window manager is running */
XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
XSync(dpy, False);
if(otherwm)
die("dwm: another window manager is already running\n");
- XSetErrorHandler(NULL);
- xerrorxlib = XSetErrorHandler(xerror);
+ XSetErrorHandler(xerror);
XSync(dpy, False);
}
XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < LENGTH(keys); i++) {
- code = XKeysymToKeycode(dpy, keys[i].keysym);
- for(j = 0; j < LENGTH(modifiers); j++)
- XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
- GrabModeAsync, GrabModeAsync);
+ if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+ True, GrabModeAsync, GrabModeAsync);
}
}
}
void
manage(Window w, XWindowAttributes *wa) {
+ static Client cz;
Client *c, *t = NULL;
Window trans = None;
XWindowChanges wc;
- if(!(c = calloc(1, sizeof(Client))))
- die("fatal: could not calloc() %u bytes\n", sizeof(Client));
+ if(!(c = malloc(sizeof(Client))))
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+ *c = cz;
c->win = w;
/* geometry */
c->bw = 0;
}
else {
- if(c->x + c->w + 2 * c->bw > sx + sw)
- c->x = sx + sw - NOBORDER(c->w);
- if(c->y + c->h + 2 * c->bw > sy + sh)
- c->y = sy + sh - NOBORDER(c->h);
+ if(c->x + WIDTH(c) > sx + sw)
+ c->x = sx + sw - WIDTH(c);
+ if(c->y + HEIGHT(c) > sy + sh)
+ c->y = sy + sh - HEIGHT(c);
c->x = MAX(c->x, sx);
/* only fix client y-offset, if the client center might cover the bar */
c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
Client *c;
for(c = nexttiled(clients); c; c = nexttiled(c->next))
- resize(c, wx, wy, NOBORDER(ww), NOBORDER(wh), resizehints);
+ resize(c, wx, wy, ww - 2*c->bw, wh - 2*c->bw, resizehints);
}
void
&& ny >= wy && ny <= wy + wh) {
if(abs(wx - nx) < snap)
nx = wx;
- else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
- nx = wx + ww - NOBORDER(c->w);
+ else if(abs((wx + ww) - (nx + WIDTH(c))) < snap)
+ nx = wx + ww - WIDTH(c);
if(abs(wy - ny) < snap)
ny = wy;
- else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
- ny = wy + wh - NOBORDER(c->h);
+ else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
+ ny = wy + wh - HEIGHT(c);
if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
}
/* adjust for aspect limits */
if(c->mina > 0 && c->maxa > 0) {
- if(c->maxa < (float)(w / h))
+ if(c->maxa < (float)w / h)
w = h * c->maxa;
- else if(c->mina < (float)(h / w))
+ else if(c->mina < (float)h / w)
h = w * c->mina;
}
if(w <= 0 || h <= 0)
return;
if(x > sx + sw)
- x = sw - NOBORDER(w);
+ x = sw - WIDTH(c);
if(y > sy + sh)
- y = sh - NOBORDER(h);
+ y = sh - HEIGHT(c);
if(x + w + 2 * c->bw < sx)
x = sx;
if(y + h + 2 * c->bw < sy)
break;
case MotionNotify:
XSync(dpy, False);
- nw = MAX(ev.xmotion.x - NOBORDER(ocx) + 1, 1);
- nh = MAX(ev.xmotion.y - NOBORDER(ocy) + 1, 1);
+ nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
+ nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1);
if(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) {
grabkeys();
}
+void
+showhide(Client *c) {
+ if(!c)
+ return;
+ if(ISVISIBLE(c)) { /* show clients top down */
+ XMoveWindow(dpy, c->win, c->x, c->y);
+ if(!lt[sellt]->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h, True);
+ showhide(c->snext);
+ }
+ else { /* hide clients bottom up */
+ showhide(c->snext);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+ }
+}
+
void
spawn(const Arg *arg) {
/* The double-fork construct avoids zombie processes and keeps the code
/* master */
c = nexttiled(clients);
mw = mfact * ww;
- resize(c, wx, wy, NOBORDER(n == 1 ? ww : mw), NOBORDER(wh), resizehints);
+ resize(c, wx, wy, (n == 1 ? ww : mw) - 2*c->bw, wh - 2*c->bw, resizehints);
if(--n == 0)
return;
h = wh;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- resize(c, x, y, NOBORDER(w), /* remainder */ ((i + 1 == n)
- ? NOBORDER(wy + wh) - y : h), resizehints);
+ resize(c, x, y, w - 2*c->bw, /* remainder */ ((i + 1 == n)
+ ? wy + wh - y : h) - 2*c->bw, resizehints);
if(h != wh)
- y = c->y + c->h + 2 * c->bw;
+ y = c->y + HEIGHT(c);
}
}
long msize;
XSizeHints size;
- XGetWMNormalHints(dpy, c->win, &size, &msize);
+ if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+ /* size is uninitialized, ensure that size.flags aren't used */
+ size.flags = PSize;
if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
else
c->maxa = c->mina = 0.0;
c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
- && c->maxw == c->minw && c->maxh == c->minh);
+ && c->maxw == c->minw && c->maxh == c->minh);
}
void