X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=f610e3315e8a8894d9f189058e6003608017514d;hp=73ce7bf4e4de7a65cd8be1f255934724f432ad10;hb=b16d8282be7dd23de868c998c0a0c2bbec3feece;hpb=0be9fb8797632f2792cc8bde0221560b3fb47cd4

diff --git a/dwm.c b/dwm.c
index 73ce7bf..f610e33 100644
--- a/dwm.c
+++ b/dwm.c
@@ -23,11 +23,11 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <X11/cursorfont.h>
@@ -41,6 +41,7 @@
 #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))
@@ -258,7 +259,7 @@ applyrules(Client *c) {
 			&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
 			&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
 				c->isfloating = r->isfloating;
-				c->tags |= r->tags & TAGMASK;
+				c->tags |= r->tags & TAGMASK ? r->tags & TAGMASK : tagset[seltags]; 
 			}
 		}
 		if(ch.res_class)
@@ -343,7 +344,6 @@ cleanup(void) {
 	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
 
-	close(STDIN_FILENO);
 	view(&a);
 	lt[sellt] = &foo;
 	while(stack)
@@ -925,10 +925,14 @@ maprequest(XEvent *e) {
 
 void
 monocle(void) {
+	unsigned int n;
 	Client *c;
 
-	for(c = nexttiled(clients); c; c = nexttiled(c->next))
+	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);
+	}
 }
 
 void
@@ -1133,9 +1137,8 @@ resizemouse(const Arg *arg) {
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
-			nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 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) {
 				if(!c->isfloating && lt[sellt]->arrange
@@ -1331,6 +1334,7 @@ showhide(Client *c) {
 	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);
@@ -1394,6 +1398,7 @@ 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)
@@ -1408,6 +1413,7 @@ 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)