diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-26 00:34:34 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:21 +0200 |
| commit | 5930731421ae76931301302c515d75001b9f72a0 (patch) | |
| tree | 15dd959289aade4477c17bb9bc21a8731d06c62b /nx-X11/lib/X11/WinEvent.c | |
| parent | a053df0a77455879dc7a23601ba21b579a0b13e7 (diff) | |
| download | nx-libs-5930731421ae76931301302c515d75001b9f72a0.tar.gz nx-libs-5930731421ae76931301302c515d75001b9f72a0.tar.bz2 nx-libs-5930731421ae76931301302c515d75001b9f72a0.zip | |
update all files with NX relevant changes to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/WinEvent.c')
| -rw-r--r-- | nx-X11/lib/X11/WinEvent.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/WinEvent.c b/nx-X11/lib/X11/WinEvent.c index 6adf76bb1..48801b739 100644 --- a/nx-X11/lib/X11/WinEvent.c +++ b/nx-X11/lib/X11/WinEvent.c @@ -34,7 +34,7 @@ extern long const _Xevent_to_mask[]; #define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\ Button4MotionMask|Button5MotionMask) -/* +/* * Return the next event in the queue * for the given window matching one of the events in the mask. * Events earlier in the queue are not discarded. @@ -43,23 +43,27 @@ extern long const _Xevent_to_mask[]; */ int -XWindowEvent (dpy, w, mask, event) - register Display *dpy; - Window w; /* Selected window. */ - long mask; /* Selected event mask. */ - register XEvent *event; /* XEvent to be filled in. */ +XWindowEvent ( + register Display *dpy, + Window w, /* Selected window. */ + long mask, /* Selected event mask. */ + register XEvent *event) /* XEvent to be filled in. */ { register _XQEvent *prev, *qelt; unsigned long qe_serial = 0; LockDisplay(dpy); + + /* Delete unclaimed cookies */ + _XFreeEventCookies(dpy); + prev = NULL; while (1) { for (qelt = prev ? prev->next : dpy->head; qelt; prev = qelt, qelt = qelt->next) { if ((qelt->event.xany.window == w) && - (qelt->event.type < LASTEvent) && + (qelt->event.type < GenericEvent) && (_Xevent_to_mask[qelt->event.type] & mask) && ((qelt->event.type != MotionNotify) || (mask & AllPointers) || |