X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=0866c06754a4abd7fafae096f69a2c3ee71634c5;hb=1c80c05587e0f9fc23fb774aa2ef3b297fc8f6d8;hp=f610e3315e8a8894d9f189058e6003608017514d;hpb=b16d8282be7dd23de868c998c0a0c2bbec3feece;p=dwm.git

diff --git a/dwm.c b/dwm.c
index f610e33..0866c06 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,7 +41,6 @@
 #endif
 
 /* macros */
-#define ADJUSTBORDER(C, BW)     if((C)->bw != (BW)) XSetWindowBorder(dpy, (C)->win, (BW));
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
@@ -179,7 +178,7 @@ static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
-static void showhide(Client *c);
+static void showhide(Client *c, unsigned int ntiled);
 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
@@ -273,7 +272,11 @@ applyrules(Client *c) {
 
 void
 arrange(void) {
-	showhide(stack);
+	unsigned int nt;
+	Client *c;
+
+	for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++);
+	showhide(stack, nt);
 	focus(NULL);
 	if(lt[sellt]->arrange)
 		lt[sellt]->arrange();
@@ -925,12 +928,9 @@ maprequest(XEvent *e) {
 
 void
 monocle(void) {
-	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
 	for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-		ADJUSTBORDER(c, (n == 1 ? 0 : borderpx))
 		resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
 	}
 }
@@ -1001,7 +1001,7 @@ propertynotify(XEvent *e) {
 	Window trans;
 	XPropertyEvent *ev = &e->xproperty;
 
-	if((ev->window == root) && (ev->atom = XA_WM_NAME))
+	if((ev->window == root) && (ev->atom == XA_WM_NAME))
 		updatestatus();
 	else if(ev->state == PropertyDelete)
 		return; /* ignore */
@@ -1139,6 +1139,7 @@ resizemouse(const Arg *arg) {
 		case MotionNotify:
 			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) {
 				if(!c->isfloating && lt[sellt]->arrange
@@ -1304,7 +1305,7 @@ setup(void) {
 		blw = MAX(blw, w);
 	}
 
-	wa.override_redirect = 1;
+	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask|ExposureMask;
 
@@ -1330,18 +1331,17 @@ setup(void) {
 }
 
 void
-showhide(Client *c) {
+showhide(Client *c, unsigned int ntiled) {
 	if(!c)
 		return;
 	if(ISVISIBLE(c)) { /* show clients top down */
-		ADJUSTBORDER(c, borderpx)
 		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);
+		showhide(c->snext, ntiled);
 	}
 	else { /* hide clients bottom up */
-		showhide(c->snext);
+		showhide(c->snext, ntiled);
 		XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	}
 }
@@ -1398,7 +1398,6 @@ tile(void) {
 	/* master */
 	c = nexttiled(clients);
 	mw = mfact * ww;
-	ADJUSTBORDER(c, (n == 1 ? 0 : borderpx))
 	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
 	if(--n == 0)
@@ -1413,7 +1412,6 @@ tile(void) {
 		h = wh;
 
 	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-		ADJUSTBORDER(c, borderpx)
 		resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
 		       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
 		if(h != wh)
@@ -1447,7 +1445,7 @@ toggletag(const Arg *arg) {
 		return;
 	
 	mask = sel->tags ^ (arg->ui & TAGMASK);
-	if(sel && mask) {
+	if(mask) {
 		sel->tags = mask;
 		arrange();
 	}
@@ -1692,12 +1690,12 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+		die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)
 		die("usage: dwm [-v]\n");
 
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fprintf(stderr, "warning: no locale support\n");
+		fputs("warning: no locale support\n", stderr);
 
 	if(!(dpy = XOpenDisplay(0)))
 		die("dwm: cannot open display\n");