X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=6bbb28ec6f7ff084a66860657365e593c5a1d609;hb=aff4c787f484974fc01070842357548d7be395ce;hp=228228bfb37d522259f7e79822e1ace4a1bc8058;hpb=375a251d16de567b6c62cce208f388cd16e0ce0f;p=dwm.git

diff --git a/main.c b/main.c
index 228228b..6bbb28e 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,6 @@ static Bool otherwm;
 static void
 cleanup()
 {
-	ungrabkeys();
 	while(sel) {
 		resize(sel, True, TopLeft);
 		unmanage(sel);
@@ -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);
@@ -270,13 +270,6 @@ main(int argc, char *argv[])
 		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)
@@ -285,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);