X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=c595a5154dc2654aeed771ce738d1789db8fde82;hb=a98b5e59359173111322171187ccfd951df85a38;hp=8933e8e2df6982cb460d9b567c1ab36e9b55730c;hpb=34e7872c89613356293d554970d9d56adc4b0a4e;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 8933e8e..c595a51 100644
--- a/dwm.c
+++ b/dwm.c
@@ -340,7 +340,7 @@ buttonpress(XEvent *e) {
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != layout->arrange) && !c->isfixed && c->isfloating)
+			if((floating != layout->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
@@ -1280,15 +1280,15 @@ restack(void) {
 
 void
 run(void) {
-	char *p;
-	int r, xfd;
 	fd_set rd;
+	int xfd;
 	XEvent ev;
 
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
 	xfd = ConnectionNumber(dpy);
 	readin = True;
+	stext[sizeof stext - 1] = '\0'; /* 0-terminator is never touched */
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)
@@ -1300,21 +1300,14 @@ run(void) {
 			eprint("select failed\n");
 		}
 		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-			case -1:
-				strncpy(stext, strerror(errno), sizeof stext - 1);
-				stext[sizeof stext - 1] = '\0';
+			if(stext == fgets(stext, sizeof stext - 1, stdin))
+				stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */
+			else {
 				readin = False;
-				break;
-			case 0:
-				strncpy(stext, "EOF", 4);
-				readin = False;
-				break;
-			default:
-				for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-				for(; p >= stext && *p != '\n'; --p);
-				if(p > stext)
-					strncpy(stext, p + 1, sizeof stext);
+				if(feof(stdin))
+					strncpy(stext, "EOF", 4);
+				else /* error occured */
+					strncpy(stext, strerror(errno), sizeof stext - 1);
 			}
 			drawbar();
 		}
@@ -1584,8 +1577,8 @@ tile(void) {
 			else
 				nh = th - 2 * c->border;
 		}
-		resize(c, nx, ny, nw, nh, True);
-		if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))
+		resize(c, nx, ny, nw, nh, RESIZEHINTS);
+		if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
 			/* client doesn't accept size constraints */
 			resize(c, nx, ny, nw, nh, False);
 		if(n > 1 && th != wah)