From a10fc33cd8f3b12c7acd862ab0504b5465fb36ca Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 1 Jul 2013 15:30:49 +1000 Subject: [PATCH] If the caller doesn't sync when it should, process all events regardless libevdev needs to maintain the correct state of the device, even if the caller decides to drop all delta events after a SYN_DROPPED. Signed-off-by: Peter Hutterer --- libevdev/libevdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index d326c8d..590e2d6 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -548,10 +548,12 @@ int libevdev_next_event(struct libevdev *dev, unsigned int flags, struct input_e return rc; } } else if (dev->need_sync) { - /* FIXME: still need to call update_state for all events - * here, otherwise the library has the wrong view of the - * device too */ - queue_shift_multiple(dev, dev->queue_nsync, NULL); + struct input_event e; + + /* call update_state for all events here, otherwise the library has the wrong view + of the device too */ + while (queue_shift(dev, &e) == 0) + update_state(dev, &e); } /* FIXME: check for O_NONBLOCK and if not set, skip if we have an