X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=42c9d8a99ff869ae69876938c7e3995ada94dd06;hb=6475be926bef4916ce632988a2fa408a637babc7;hp=bfc63b163cb4f82befa90a16eb26c73676f2189d;hpb=0e5c8198bc5a69e87b0114b81d6569188828edfa;p=dwm.git

diff --git a/main.c b/main.c
index bfc63b1..42c9d8a 100644
--- a/main.c
+++ b/main.c
@@ -264,6 +264,10 @@ main(int argc, char *argv[])
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
 
+	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+	dc.gc = XCreateGC(dpy, root, 0, 0);
+	draw_bar();
+
 	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
 	wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
@@ -272,17 +276,14 @@ main(int argc, char *argv[])
 
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
-	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-	dc.gc = XCreateGC(dpy, root, 0, 0);
-
 	strcpy(stext, "dwm-"VERSION);
 	scan_wins();
-	draw_bar();
 
 	/* main event loop, reads status text from stdin as well */
+Mainloop:
 	while(running) {
 		FD_ZERO(&rd);
-		FD_SET(0, &rd);
+		FD_SET(STDIN_FILENO, &rd);
 		FD_SET(ConnectionNumber(dpy), &rd);
 
 		i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
@@ -291,15 +292,24 @@ main(int argc, char *argv[])
 		if(i < 0)
 			error("select failed\n");
 		else if(i > 0) {
-			if(FD_ISSET(ConnectionNumber(dpy), &rd) && XPending(dpy) > 0) {
-				XNextEvent(dpy, &ev);
-				if(handler[ev.type])
-					(handler[ev.type])(&ev); /* call handler */
+			if(FD_ISSET(ConnectionNumber(dpy), &rd)) {
+				while(XPending(dpy)) {
+					XNextEvent(dpy, &ev);
+					if(handler[ev.type])
+						(handler[ev.type])(&ev); /* call handler */
+				}
 			}
-			if(FD_ISSET(0, &rd)) {
+			if(FD_ISSET(STDIN_FILENO, &rd)) {
 				i = n = 0;
-				while((i = getchar()) != '\n' && n < sizeof(stext) - 1)
+				for(;;) {
+					if((i = getchar()) == EOF) {
+						stext[0] = 0;
+						goto Mainloop;
+					}
+					if(i == '\n' || n >= sizeof(stext) - 1)
+						break;
 					stext[n++] = i;
+				}
 				stext[n] = 0;
 				draw_bar();
 			}