# HG changeset patch # User Anselm R. Garbe # Date 1171895015 -3600 # Node ID 2ec66bdbb8ad2d3cc01e4cdafc0678fc354713f7 # Parent 469dc170f8331867cac0b3954ca22a4e9a05fc1b removed procevent, more refactoring diff -r 469dc170f833 -r 2ec66bdbb8ad dwm.h --- a/dwm.h Mon Feb 19 15:17:31 2007 +0100 +++ b/dwm.h Mon Feb 19 15:23:35 2007 +0100 @@ -115,7 +115,6 @@ /* 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 */ diff -r 469dc170f833 -r 2ec66bdbb8ad event.c --- a/event.c Mon Feb 19 15:17:31 2007 +0100 +++ b/event.c Mon Feb 19 15:23:35 2007 +0100 @@ -368,14 +368,3 @@ GrabModeAsync, GrabModeAsync); } } - -void -procevent(void) { - XEvent ev; - - while(XPending(dpy)) { - XNextEvent(dpy, &ev); - if(handler[ev.type]) - (handler[ev.type])(&ev); /* call handler */ - } -} diff -r 469dc170f833 -r 2ec66bdbb8ad main.c --- a/main.c Mon Feb 19 15:17:31 2007 +0100 +++ b/main.c Mon Feb 19 15:23:35 2007 +0100 @@ -379,6 +379,7 @@ 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); @@ -411,7 +412,6 @@ /* main event loop, also reads status text from stdin */ XSync(dpy, False); - procevent(); readin = True; while(running) { FD_ZERO(&rd); @@ -443,7 +443,11 @@ 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);