Xinqi Bao's Git

projects / dwm.git / diff
summary | log | commit | diff | tree
raw | patch | inline | side by side (parent: a1d0f81)
removed a bottleneck
authorAnselm R. Garbe <[email protected]>
Fri, 14 Jul 2006 11:27:01 +0000 (13:27 +0200)
committerAnselm R. Garbe <[email protected]>
Fri, 14 Jul 2006 11:27:01 +0000 (13:27 +0200)
main.c diff | blob | history

diff --git a/main.c b/main.c
index d9ca9f7..42c9d8a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -283,7 +283,7 @@ main(int argc, char *argv[])
 Mainloop:
        while(running) {
                FD_ZERO(&rd);
 Mainloop:
        while(running) {
                FD_ZERO(&rd);
-               FD_SET(0, &rd);
+               FD_SET(STDIN_FILENO, &rd);
                FD_SET(ConnectionNumber(dpy), &rd);
 
                i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
                FD_SET(ConnectionNumber(dpy), &rd);
 
                i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
@@ -292,12 +292,14 @@ Mainloop:
                if(i < 0)
                        error("select failed\n");
                else if(i > 0) {
                if(i < 0)
                        error("select failed\n");
                else if(i > 0) {
-                       if(FD_ISSET(ConnectionNumber(dpy), &rd) && XPending(dpy) > 0) {
-                               XNextEvent(dpy, &ev);
-                               if(handler[ev.type])
-                                       (handler[ev.type])(&ev); /* call handler */
+                       if(FD_ISSET(ConnectionNumber(dpy), &rd)) {
+                               while(XPending(dpy)) {
+                                       XNextEvent(dpy, &ev);
+                                       if(handler[ev.type])
+                                               (handler[ev.type])(&ev); /* call handler */
+                               }
                        }
                        }
-                       if(FD_ISSET(0, &rd)) {
+                       if(FD_ISSET(STDIN_FILENO, &rd)) {
                                i = n = 0;
                                for(;;) {
                                        if((i = getchar()) == EOF) {
                                i = n = 0;
                                for(;;) {
                                        if((i = getchar()) == EOF) {