fixed

[dwm.git] / main.c

diff --git a/main.c b/main.c
index db03958..2df9683 100644 (file)
--- a/main.c
+++ b/main.c
@@ -83,7 +83,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
 /* 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];
 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
 main(int argc, char *argv[])
 {

-       int i;
+       int i, xfd;

        unsigned int mask;
        fd_set rd;
        Bool readin = True;
        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");
 
        if(!dpy)
                eprint("dwm: cannot open display\n");
 

+       xfd = ConnectionNumber(dpy);

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 


@@ -195,6 +196,7 @@ main(int argc, char *argv[])
 
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
 
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);

+       XSync(dpy, False);

 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);


@@ -209,10 +211,16 @@ main(int argc, char *argv[])
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        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++);
        grabkeys();
        initrregs();
 
        for(ntags = 0; tags[ntags]; ntags++);

+       seltag = emallocz(sizeof(Bool) * ntags);
+       seltag[DEFTAG] = True;

 
        /* style */
        dc.bg = getcolor(BGCOLOR);
 
        /* style */
        dc.bg = getcolor(BGCOLOR);


@@ -240,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);
 
        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);
 
        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, also reads status text from stdin */
        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);
        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(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)
                        if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
                                readin = NULL != fgets(stext, sizeof(stext), stdin);
                                if(readin)


@@ -279,9 +277,15 @@ main(int argc, char *argv[])
                                        strcpy(stext, "broken pipe");
                                drawstatus();
                        }
                                        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);
 
        cleanup();
        XCloseDisplay(dpy);