removed procevent, more refactoring
e9c49ddd
3 file(s) · +6 −14
| 115 | 115 | ||
| 116 | 116 | /* event.c */ |
|
| 117 | 117 | extern void grabkeys(void); /* grab all keys defined in config.h */ |
|
| 118 | - | extern void procevent(void); /* process pending X events */ |
|
| 119 | 118 | ||
| 120 | 119 | /* main.c */ |
|
| 121 | 120 | extern void drawstatus(void); /* draw the bar */ |
| 368 | 368 | GrabModeAsync, GrabModeAsync); |
|
| 369 | 369 | } |
|
| 370 | 370 | } |
|
| 371 | - | ||
| 372 | - | void |
|
| 373 | - | procevent(void) { |
|
| 374 | - | XEvent ev; |
|
| 375 | - | ||
| 376 | - | while(XPending(dpy)) { |
|
| 377 | - | XNextEvent(dpy, &ev); |
|
| 378 | - | if(handler[ev.type]) |
|
| 379 | - | (handler[ev.type])(&ev); /* call handler */ |
|
| 380 | - | } |
|
| 381 | - | } |
| 379 | 379 | char *p; |
|
| 380 | 380 | int r, xfd; |
|
| 381 | 381 | fd_set rd; |
|
| 382 | + | XEvent ev; |
|
| 382 | 383 | ||
| 383 | 384 | if(argc == 2 && !strncmp("-v", argv[1], 3)) { |
|
| 384 | 385 | fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout); |
|
| 411 | 412 | ||
| 412 | 413 | /* main event loop, also reads status text from stdin */ |
|
| 413 | 414 | XSync(dpy, False); |
|
| 414 | - | procevent(); |
|
| 415 | 415 | readin = True; |
|
| 416 | 416 | while(running) { |
|
| 417 | 417 | FD_ZERO(&rd); |
|
| 443 | 443 | drawstatus(); |
|
| 444 | 444 | } |
|
| 445 | 445 | if(FD_ISSET(xfd, &rd)) |
|
| 446 | - | procevent(); |
|
| 446 | + | while(XPending(dpy)) { |
|
| 447 | + | XNextEvent(dpy, &ev); |
|
| 448 | + | if(handler[ev.type]) |
|
| 449 | + | (handler[ev.type])(&ev); /* call handler */ |
|
| 450 | + | } |
|
| 447 | 451 | } |
|
| 448 | 452 | cleanup(); |
|
| 449 | 453 | XCloseDisplay(dpy); |
|