X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/0464e42231199d7a6ea45e46cf7798f2b6cf972c..0cf3ba0eab1e3b05515907b29fbb739321a7cbed:/main.c?ds=sidebyside

diff --git a/main.c b/main.c
index dffa4ba..86d72fa 100644
--- a/main.c
+++ b/main.c
@@ -85,9 +85,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
-/* CUSTOMIZE */
-int tsel = Tdev; /* default tag */
-/* END CUSTOMIZE */
+int tsel = DEFTAG;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
@@ -113,7 +111,7 @@ getproto(Window w)
 	}
 	for(i = 0; i < res; i++) {
 		if(protocols[i] == wmatom[WMDelete])
-			protos |= WM_PROTOCOL_DELWIN;
+			protos |= PROTODELWIN;
 	}
 	free((char *) protocols);
 	return protos;
@@ -167,7 +165,6 @@ main(int argc, char *argv[])
 	int i;
 	unsigned int mask;
 	fd_set rd;
-	Bool readin = True;
 	Window w;
 	XEvent ev;
 	XSetWindowAttributes wa;
@@ -254,8 +251,7 @@ main(int argc, char *argv[])
 	/* main event loop, reads status text from stdin as well */
 	while(running) {
 		FD_ZERO(&rd);
-		if(readin)
-			FD_SET(STDIN_FILENO, &rd);
+		FD_SET(STDIN_FILENO, &rd);
 		FD_SET(ConnectionNumber(dpy), &rd);
 
 		i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
@@ -271,12 +267,11 @@ main(int argc, char *argv[])
 						(handler[ev.type])(&ev); /* call handler */
 				}
 			}
-			if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
-				readin = NULL != fgets(stext, sizeof(stext), stdin);
-				if(readin)
-					stext[strlen(stext) - 1] = 0;
+			if(FD_ISSET(STDIN_FILENO, &rd)) {
+				if(!fgets(stext, sizeof(stext), stdin))
+					break;
 				else 
-					strcpy(stext, "broken pipe");
+					stext[strlen(stext) - 1] = 0;
 				drawstatus();
 			}
 		}