applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage...

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 0f22c44..f196df7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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;
@@ -144,7 +145,7 @@ setup(void) {
        strcpy(stext, "dwm-"VERSION);
        /* windowarea */
        wax = sx;
-       way = bh;
+       way = sy + bh;
        wah = sh - bh;
        waw = sw;
        /* pixmap for everything */
@@ -226,6 +227,7 @@ xerror(Display *dpy, XErrorEvent *ee) {
 
 int
 main(int argc, char *argv[]) {
+       char *p;
        int r, xfd;
        fd_set rd;
 
@@ -266,22 +268,31 @@ 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;
+                       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);
+                               readin = False;
+                               break;
+                       case 0:
+                               strncpy(stext, "EOF", sizeof stext);
+                               readin = False;
+                               break;
+                       default:
+                               stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
+                               for(p = stext + strlen(stext) - 1; p > stext && *p != '\n'; --p);
+                               if(p > stext)
+                                       strncpy(stext, p + 1, sizeof stext);
                        }
+                       drawstatus();
                }
-               else if(r < 0)
-                       eprint("select failed\n");
-               procevent();
+               if(FD_ISSET(xfd, &rd))
+                       procevent();
        }
        cleanup();
        XCloseDisplay(dpy);