some other small fixes

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 228228b..6bbb28e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -22,7 +22,6 @@ static Bool otherwm;
 static void
 cleanup()
 {
 static void
 cleanup()
 {

-       ungrabkeys();

        while(sel) {
                resize(sel, True, TopLeft);
                unmanage(sel);
        while(sel) {
                resize(sel, True, TopLeft);
                unmanage(sel);


@@ -197,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);


@@ -270,13 +270,6 @@ main(int argc, char *argv[])
                if(i < 0)
                        eprint("select failed\n");
                else if(i > 0) {
                if(i < 0)
                        eprint("select failed\n");
                else if(i > 0) {

-                       if(FD_ISSET(xfd, &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)


@@ -285,9 +278,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);