condition was insufficient

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 8699284..50fb9d7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,16 +18,26 @@
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
-static Bool otherwm;
+static Bool otherwm, readin;
 
 static void
 cleanup()
 {
+       close(STDIN_FILENO);
        while(sel) {
                resize(sel, True, TopLeft);
                unmanage(sel);
        }
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       XDestroyWindow(dpy, barwin);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XSync(dpy, False);
 }
 
 static void
@@ -37,6 +47,7 @@ scan()
        Window *wins, d1, d2;
        XWindowAttributes wa;
 
+       wins = NULL;
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
@@ -136,7 +147,7 @@ sendevent(Window w, Atom a, long value)
 void
 quit(Arg *arg)
 {
-       running = False;
+       readin = running = False;
 }
 
 /*
@@ -166,9 +177,7 @@ main(int argc, char *argv[])
        int i, j, xfd;
        unsigned int mask;
        fd_set rd;
-       Bool readin = True;
        Window w;
-       XEvent ev;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 
@@ -196,6 +205,7 @@ main(int argc, char *argv[])
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
 
+       XSync(dpy, False);
        XSetErrorHandler(NULL);
        xerrorxlib = XSetErrorHandler(xerror);
        XSync(dpy, False);
@@ -268,7 +278,8 @@ main(int argc, char *argv[])
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
-       goto XLoop;
+       procevent();
+       readin = True;
        while(running) {
                FD_ZERO(&rd);
                if(readin)
@@ -288,15 +299,8 @@ main(int argc, char *argv[])
                                        strcpy(stext, "broken pipe");
                                drawstatus();
                        }
-                       if(FD_ISSET(xfd, &rd)) {
-XLoop:
-                               while(XPending(dpy)) {
-                                       XNextEvent(dpy, &ev);
-                                       if(handler[ev.type])
-                                               (handler[ev.type])(&ev); /* call handler */
-                               }
-                       }
                }
+               procevent();
        }
        cleanup();
        XCloseDisplay(dpy);