added Acroread.* and MPlayer.* to config.arg.h rules

[dwm.git] / main.c

diff --git a/main.c b/main.c
index dc8a6e7..33a2a9a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,17 +4,16 @@
  */
 
 #include "dwm.h"
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
-
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
@@ -84,9 +83,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;
@@ -112,7 +109,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;
@@ -163,25 +160,20 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
-       int i, n;
+       int i;
        unsigned int mask;
        fd_set rd;
-       Bool readstdin = True;
+       Bool readin = True;
        Window w;
        XEvent ev;
        XSetWindowAttributes wa;
 
-       for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-               switch (argv[i][1]) {
-               default:
-                       eprint("usage: dwm [-v]\n");
-                       break;
-               case 'v':
-                       fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-                       exit(EXIT_SUCCESS);
-                       break;
-               }
+       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+               fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               exit(EXIT_SUCCESS);
        }
+       else if(argc != 1)
+               eprint("usage: dwm [-v]\n");
 
        dpy = XOpenDisplay(0);
        if(!dpy)
@@ -256,10 +248,9 @@ main(int argc, char *argv[])
        scan();
 
        /* main event loop, reads status text from stdin as well */
-Mainloop:
        while(running) {
                FD_ZERO(&rd);
-               if(readstdin)
+               if(readin)
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(ConnectionNumber(dpy), &rd);
 
@@ -276,20 +267,12 @@ Mainloop:
                                                (handler[ev.type])(&ev); /* call handler */
                                }
                        }
-                       if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) {
-                               i = n = 0;
-                               for(;;) {
-                                       if((i = getchar()) == EOF) {
-                                               /* broken pipe/end of producer */
-                                               readstdin = False;
-                                               strcpy(stext, "broken pipe");
-                                               goto Mainloop;
-                                       }
-                                       if(i == '\n' || n >= sizeof(stext) - 1)
-                                               break;
-                                       stext[n++] = i;
-                               }
-                               stext[n] = 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();
                        }
                }