removed procevent, more refactoring
This commit is contained in:
parent
f8415019d4
commit
e9c49ddd7a
1
dwm.h
1
dwm.h
|
@ -115,7 +115,6 @@ extern void zoom(Arg *arg); /* zooms the focused client to master area, arg is
|
||||||
|
|
||||||
/* event.c */
|
/* event.c */
|
||||||
extern void grabkeys(void); /* grab all keys defined in config.h */
|
extern void grabkeys(void); /* grab all keys defined in config.h */
|
||||||
extern void procevent(void); /* process pending X events */
|
|
||||||
|
|
||||||
/* main.c */
|
/* main.c */
|
||||||
extern void drawstatus(void); /* draw the bar */
|
extern void drawstatus(void); /* draw the bar */
|
||||||
|
|
11
event.c
11
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 */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
8
main.c
8
main.c
|
@ -379,6 +379,7 @@ main(int argc, char *argv[]) {
|
||||||
char *p;
|
char *p;
|
||||||
int r, xfd;
|
int r, xfd;
|
||||||
fd_set rd;
|
fd_set rd;
|
||||||
|
XEvent ev;
|
||||||
|
|
||||||
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
|
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
|
||||||
fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
|
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 */
|
/* main event loop, also reads status text from stdin */
|
||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
procevent();
|
|
||||||
readin = True;
|
readin = True;
|
||||||
while(running) {
|
while(running) {
|
||||||
FD_ZERO(&rd);
|
FD_ZERO(&rd);
|
||||||
|
@ -443,7 +443,11 @@ main(int argc, char *argv[]) {
|
||||||
drawstatus();
|
drawstatus();
|
||||||
}
|
}
|
||||||
if(FD_ISSET(xfd, &rd))
|
if(FD_ISSET(xfd, &rd))
|
||||||
procevent();
|
while(XPending(dpy)) {
|
||||||
|
XNextEvent(dpy, &ev);
|
||||||
|
if(handler[ev.type])
|
||||||
|
(handler[ev.type])(&ev); /* call handler */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cleanup();
|
cleanup();
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
|
|
Loading…
Reference in a new issue