aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/MaskEvent.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-07-26 00:34:34 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-10 22:52:21 +0200
commit5930731421ae76931301302c515d75001b9f72a0 (patch)
tree15dd959289aade4477c17bb9bc21a8731d06c62b /nx-X11/lib/X11/MaskEvent.c
parenta053df0a77455879dc7a23601ba21b579a0b13e7 (diff)
downloadnx-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/MaskEvent.c')
-rw-r--r--nx-X11/lib/X11/MaskEvent.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/MaskEvent.c b/nx-X11/lib/X11/MaskEvent.c
index 1c877cef9..1fadc487e 100644
--- a/nx-X11/lib/X11/MaskEvent.c
+++ b/nx-X11/lib/X11/MaskEvent.c
@@ -34,28 +34,32 @@ extern long const _Xevent_to_mask[];
#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
Button4MotionMask|Button5MotionMask)
-/*
+/*
* return the next event in the queue matching one of the events in the mask.
* If no event, flush output, and wait until match succeeds.
* Events earlier in the queue are not discarded.
*/
int
-XMaskEvent (dpy, mask, event)
- register Display *dpy;
- long mask; /* Selected event mask. */
- register XEvent *event; /* XEvent to be filled in. */
+XMaskEvent (
+ register Display *dpy,
+ 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.type < LASTEvent) &&
+ if ((qelt->event.type < GenericEvent) &&
(_Xevent_to_mask[qelt->event.type] & mask) &&
((qelt->event.type != MotionNotify) ||
(mask & AllPointers) ||