X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=main.c;h=750366e7cfb8f031ebaae4e77fb8f2c6c5223e56;hb=478f6f95f1cb349e93bfe49ae6721c222c3a1a6d;hp=1e5817698c63242e760acdca20e4ae32df43e573;hpb=6651dd7fd9e8e95cfc6c472f1adfeff41735d798;p=dwm.git

diff --git a/main.c b/main.c
index 1e58176..750366e 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,7 @@
 
 char stext[1024];
 Bool *seltag;
-int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh;
+int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
 unsigned int master, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
@@ -130,7 +130,8 @@ setup(void) {
 	sh = DisplayHeight(dpy, screen);
 	master = MASTER;
 	/* bar */
-	bx = by = 0;
+	bx = sx;
+	by = sy;
 	bw = sw;
 	dc.h = bh = dc.font.height + 2;
 	wa.override_redirect = 1;
@@ -142,6 +143,11 @@ setup(void) {
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
+	/* windowarea */
+	wax = sx;
+	way = sy + bh;
+	wah = sh - bh;
+	waw = sw;
 	/* pixmap for everything */
 	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
@@ -261,22 +267,29 @@ main(int argc, char *argv[]) {
 		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);