removed procevent, more refactoring

diff --git a/dwm.h b/dwm.h
index 2ec0bf7..a96eec1 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -115,7 +115,6 @@ extern void zoom(Arg *arg);                 /* zooms the focused client to master area, arg is
 
 /* event.c */
 extern void grabkeys(void);                    /* grab all keys defined in config.h */
 
 /* event.c */
 extern void grabkeys(void);                    /* grab all keys defined in config.h */

-extern void procevent(void);                   /* process pending X events */

 
 /* main.c */
 extern void drawstatus(void);                  /* draw the bar */
 
 /* main.c */
 extern void drawstatus(void);                  /* draw the bar */

diff --git a/event.c b/event.c
index dfe2552..4b3c1e3 100644 (file)
--- a/event.c
+++ b/event.c
@@ -368,14 +368,3 @@ grabkeys(void) {
                                GrabModeAsync, GrabModeAsync);
        }
 }
                                GrabModeAsync, GrabModeAsync);
        }
 }

-
-void
-procevent(void) {
-       XEvent ev;
-
-       while(XPending(dpy)) {
-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
-       }
-}

diff --git a/main.c b/main.c
index 77ce0df..3453b59 100644 (file)
--- a/main.c
+++ b/main.c
@@ -379,6 +379,7 @@ main(int argc, char *argv[]) {
        char *p;
        int r, xfd;
        fd_set rd;
        char *p;
        int r, xfd;
        fd_set rd;

+       XEvent ev;

 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {
                fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {
                fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);


@@ -411,7 +412,6 @@ main(int argc, char *argv[]) {
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);

-       procevent();

        readin = True;
        while(running) {
                FD_ZERO(&rd);
        readin = True;
        while(running) {
                FD_ZERO(&rd);


@@ -443,7 +443,11 @@ main(int argc, char *argv[]) {
                        drawstatus();
                }
                if(FD_ISSET(xfd, &rd))
                        drawstatus();
                }
                if(FD_ISSET(xfd, &rd))

-                       procevent();
+                       while(XPending(dpy)) {
+                               XNextEvent(dpy, &ev);
+                               if(handler[ev.type])
+                                       (handler[ev.type])(&ev); /* call handler */
+                       }

        }
        cleanup();
        XCloseDisplay(dpy);
        }
        cleanup();
        XCloseDisplay(dpy);