Mercurial > dwm-meillo

changeset 578:8cb54d02a5b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied Manuels patch (thanks to Manuel!)
author arg@mig29
date Sat, 25 Nov 2006 19:26:16 +0100
parents f01c0466cf00
children 010118c94013
files dwm.1 main.c
diffstat 2 files changed, 22 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dwm.1	Fri Nov 24 17:02:41 2006 +0100
+++ b/dwm.1	Sat Nov 25 19:26:16 2006 +0100
@@ -22,7 +22,7 @@
 the title of the focused window, and the text read from standard input. The
 selected tags are indicated with a different color. The tags of the focused
 window are indicated with a small point in the top left corner.  The tags which
-are applied to any client are indicated with a small point in the bottom
+are applied to one or more clients are indicated with a small point in the bottom
 right corner.
 .P
 dwm draws a 1-pixel border around windows to indicate the focus state.
--- a/main.c	Fri Nov 24 17:02:41 2006 +0100
+++ b/main.c	Sat Nov 25 19:26:16 2006 +0100
@@ -267,22 +267,29 @@
 		if(readin)
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
-		r = select(xfd + 1, &rd, NULL, NULL, NULL);
-		if((r == -1) && (errno == EINTR))
-			continue;
-		if(r > 0) {
-			if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
-				readin = NULL != fgets(stext, sizeof(stext), stdin);
-				if(readin)
-					stext[strlen(stext) - 1] = 0;
-				else 
-					strcpy(stext, "broken pipe");
-				drawstatus();
+		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+			if(errno == EINTR)
+				continue;
+			else
+				eprint("select failed\n");
+		}
+		if(FD_ISSET(STDIN_FILENO, &rd)) {
+			switch(r = read(STDIN_FILENO, stext, sizeof(stext))) {
+			case -1:
+				strncpy(stext, strerror(errno), sizeof(stext));
+				readin = False;
+				break;
+			case 0:
+				strncpy(stext, "EOF", sizeof(stext));
+				readin = False;
+				break;
+			default:
+				stext[r-1] = 0;
 			}
+			drawstatus();
 		}
-		else if(r < 0)
-			eprint("select failed\n");
-		procevent();
+		if(FD_ISSET(xfd, &rd))
+			procevent();
 	}
 	cleanup();
 	XCloseDisplay(dpy);