Browse Source

changed main event loop

main
Anselm R.Garbe 18 years ago
parent
commit
b6ad663f87
3 changed files with 21 additions and 10 deletions
  1. +1
    -0
      dwm.h
  2. +13
    -0
      event.c
  3. +7
    -10
      main.c

+ 1
- 0
dwm.h View File

@ -108,6 +108,7 @@ extern unsigned int textw(const char *text);
/* event.c */
extern void grabkeys();
extern void procevent();
/* main.c */
extern int getproto(Window w);


+ 13
- 0
event.c View File

@ -384,3 +384,16 @@ grabkeys()
GrabModeAsync, GrabModeAsync);
}
}
void
procevent()
{
XEvent ev;
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
if(handler[ev.type])
(handler[ev.type])(&ev); /* call handler */
}
}

+ 7
- 10
main.c View File

@ -27,7 +27,9 @@ cleanup()
resize(sel, True, TopLeft);
unmanage(sel);
}
XUngrabKey(dpy, AnyKey, AnyModifier, root);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(dpy, False);
}
static void
@ -37,6 +39,7 @@ scan()
Window *wins, d1, d2;
XWindowAttributes wa;
wins = NULL;
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa))
@ -168,7 +171,6 @@ main(int argc, char *argv[])
fd_set rd;
Bool readin = True;
Window w;
XEvent ev;
XModifierKeymap *modmap;
XSetWindowAttributes wa;
@ -196,6 +198,7 @@ main(int argc, char *argv[])
if(otherwm)
eprint("dwm: another window manager is already running\n");
XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
@ -268,7 +271,7 @@ main(int argc, char *argv[])
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
goto XLoop;
procevent();
while(running) {
FD_ZERO(&rd);
if(readin)
@ -288,14 +291,8 @@ main(int argc, char *argv[])
strcpy(stext, "broken pipe");
drawstatus();
}
if(FD_ISSET(xfd, &rd)) {
XLoop:
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
if(handler[ev.type])
(handler[ev.type])(&ev); /* call handler */
}
}
if(FD_ISSET(xfd, &rd))
procevent();
}
}
cleanup();


Loading…
Cancel
Save