some other small fixes

[dwm.git] / main.c

diff --git a/main.c b/main.c
index ded4761..6bbb28e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -83,7 +83,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
-int tsel = DEFTAG;
+Bool *seltag;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 unsigned int ntags;
 Atom wmatom[WMLast], netatom[NetLast];
@@ -162,7 +162,7 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
-       int i;
+       int i, xfd;
        unsigned int mask;
        fd_set rd;
        Bool readin = True;
@@ -181,6 +181,7 @@ main(int argc, char *argv[])
        if(!dpy)
                eprint("dwm: cannot open display\n");
 
+       xfd = ConnectionNumber(dpy);
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
@@ -195,13 +196,13 @@ main(int argc, char *argv[])
 
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
+       XSync(dpy, False);
 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-       netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
 
@@ -214,6 +215,8 @@ main(int argc, char *argv[])
        initrregs();
 
        for(ntags = 0; tags[ntags]; ntags++);
+       seltag = emallocz(sizeof(Bool) * ntags);
+       seltag[DEFTAG] = True;
 
        /* style */
        dc.bg = getcolor(BGCOLOR);
@@ -254,25 +257,19 @@ main(int argc, char *argv[])
        scan();
 
        /* main event loop, also reads status text from stdin */
+       XSync(dpy, False);
        while(running) {
                FD_ZERO(&rd);
                if(readin)
                        FD_SET(STDIN_FILENO, &rd);
-               FD_SET(ConnectionNumber(dpy), &rd);
+               FD_SET(xfd, &rd);
 
-               i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
+               i = select(xfd + 1, &rd, NULL, NULL, NULL);
                if(i == -1 && errno == EINTR)
                        continue;
                if(i < 0)
                        eprint("select failed\n");
                else if(i > 0) {
-                       if(FD_ISSET(ConnectionNumber(dpy), &rd)) {
-                               while(XPending(dpy)) {
-                                       XNextEvent(dpy, &ev);
-                                       if(handler[ev.type])
-                                               (handler[ev.type])(&ev); /* call handler */
-                               }
-                       }
                        if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
                                readin = NULL != fgets(stext, sizeof(stext), stdin);
                                if(readin)
@@ -281,9 +278,15 @@ main(int argc, char *argv[])
                                        strcpy(stext, "broken pipe");
                                drawstatus();
                        }
+                       if(FD_ISSET(xfd, &rd)) {
+                               while(XPending(dpy)) {
+                                       XNextEvent(dpy, &ev);
+                                       if(handler[ev.type])
+                                               (handler[ev.type])(&ev); /* call handler */
+                               }
+                       }
                }
        }
-
        cleanup();
        XCloseDisplay(dpy);