centralized/externalized configuration to config.h

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 6035fb6..0e94e2c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -10,6 +10,7 @@
 #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>
@@ -17,14 +18,14 @@
 
 /* static */
 
-static Bool otherwm;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
+static Bool otherwm;
 
 static void
 cleanup()
 {
        while(sel) {
-               resize(sel, True);
+               resize(sel, True, TopLeft);
                unmanage(sel);
        }
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
@@ -34,9 +35,8 @@ static void
 scan()
 {
        unsigned int i, num;
-       Window *wins;
+       Window *wins, d1, d2;
        XWindowAttributes wa;
-       Window d1, d2;
 
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
@@ -55,10 +55,9 @@ scan()
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
-       Atom real;
-       int format;
+       int status, format;
        unsigned long res, extra;
-       int status;
+       Atom real;
 
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);
@@ -86,7 +85,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
-int tsel = Tdev; /* default tag */
+int tsel = DEFTAG;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
@@ -101,10 +100,10 @@ Window root, barwin;
 int
 getproto(Window w)
 {
-       unsigned char *protocols;
-       long res;
        int protos = 0;
        int i;
+       long res;
+       unsigned char *protocols;
 
        res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
        if(res <= 0) {
@@ -148,46 +147,35 @@ int
 xerror(Display *dpy, XErrorEvent *ee)
 {
        if(ee->error_code == BadWindow
-                       || (ee->request_code == X_SetInputFocus
-                               && ee->error_code == BadMatch)
-                       || (ee->request_code == X_PolyText8
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_PolyFillRectangle
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_PolySegment
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_ConfigureWindow
-                               && ee->error_code == BadMatch)
-                       || (ee->request_code == X_GrabKey
-                               && ee->error_code == BadAccess))
+       || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
+       || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
+       || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
+       || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
+       || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+       || (ee->request_code == X_GrabKey && ee->error_code == BadAccess))
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-                       ee->request_code, ee->error_code);
+               ee->request_code, ee->error_code);
        return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
 int
 main(int argc, char *argv[])
 {
-       int i, n;
-       fd_set rd;
-       XSetWindowAttributes wa;
+       int i;
        unsigned int mask;
-       Bool readstdin = True;
+       fd_set rd;
+       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)
@@ -254,20 +242,17 @@ main(int argc, char *argv[])
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
-                                       | LeaveWindowMask;
+       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
        wa.cursor = cursor[CurNormal];
-
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        strcpy(stext, "dwm-"VERSION);
        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);
 
@@ -284,20 +269,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();
                        }
                }