fixed

[dwm.git] / main.c

diff --git a/main.c b/main.c
index db36536..2df9683 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,10 +83,9 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
-/* CUSTOMIZE */
-int tsel = Tdev; /* default tag */
-/* END CUSTOMIZE */
+Bool *seltag;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+unsigned int ntags;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -104,15 +102,16 @@ getproto(Window w)
        int protos = 0;
        int i;
        long res;
-       unsigned char *protocols;
+       Atom *protocols;
 
-       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
+       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+                       ((unsigned char **)&protocols));
        if(res <= 0) {
                return protos;
        }
        for(i = 0; i < res; i++) {
                if(protocols[i] == wmatom[WMDelete])
-                       protos |= WM_PROTOCOL_DELWIN;
+                       protos |= PROTODELWIN;
        }
        free((char *) protocols);
        return protos;
@@ -163,7 +162,7 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
-       int i, n;
+       int i, xfd;
        unsigned int mask;
        fd_set rd;
        Bool readin = True;
@@ -180,15 +179,15 @@ main(int argc, char *argv[])
 
        dpy = XOpenDisplay(0);
        if(!dpy)
-               eprint("dwm: cannot connect X server\n");
+               eprint("dwm: cannot open display\n");
 
+       xfd = ConnectionNumber(dpy);
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
-       /* check if another WM is already running */
        otherwm = False;
        XSetErrorHandler(xerrorstart);
-       /* this causes an error if some other WM is running */
+       /* this causes an error if some other window manager is running */
        XSelectInput(dpy, root, SubstructureRedirectMask);
        XSync(dpy, False);
 
@@ -197,6 +196,7 @@ main(int argc, char *argv[])
 
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
+       XSync(dpy, False);
 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -211,7 +211,16 @@ main(int argc, char *argv[])
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
+       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+       wa.cursor = cursor[CurNormal];
+       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+
        grabkeys();
+       initrregs();
+
+       for(ntags = 0; tags[ntags]; ntags++);
+       seltag = emallocz(sizeof(Bool) * ntags);
+       seltag[DEFTAG] = True;
 
        /* style */
        dc.bg = getcolor(BGCOLOR);
@@ -239,37 +248,27 @@ main(int argc, char *argv[])
 
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
+
+       strcpy(stext, "dwm-"VERSION);
        drawstatus();
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
-       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 */
+       /* 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);
-
-               i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
+               FD_SET(xfd, &rd);
+               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)
@@ -278,9 +277,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);