@@ -169,6 +169,8 @@ struct InputLinux {
bool has_abs_x;
int num_keys;
int num_btns;
+ struct input_event event;
+ int to_be_read;
QTAILQ_ENTRY(InputLinux) next;
};
@@ -327,25 +329,29 @@ static void input_linux_handle_mouse(InputLinux *il, struct input_event *event)
static void input_linux_event(void *opaque)
{
InputLinux *il = opaque;
- struct input_event event;
int rc;
+ int offset = sizeof(il->event) - il->to_be_read;
+ uint8_t *p = (uint8_t *)&il->event;
for (;;) {
- rc = read(il->fd, &event, sizeof(event));
- if (rc != sizeof(event)) {
+ rc = read(il->fd, &p[offset], il->to_be_read);
+ if (rc != il->to_be_read) {
if (rc < 0 && errno != EAGAIN) {
fprintf(stderr, "%s: read: %s\n", __func__, strerror(errno));
qemu_set_fd_handler(il->fd, NULL, NULL, NULL);
close(il->fd);
+ } else if (rc > 0){
+ il->to_be_read -= rc;
}
break;
}
+ il->to_be_read = sizeof(il->event);
if (il->num_keys) {
- input_linux_handle_keyboard(il, &event);
+ input_linux_handle_keyboard(il, &il->event);
}
if (il->has_rel_x && il->num_btns) {
- input_linux_handle_mouse(il, &event);
+ input_linux_handle_mouse(il, &il->event);
}
}
}
@@ -417,6 +423,7 @@ static void input_linux_complete(UserCreatable *uc, Error **errp)
}
}
+ il->to_be_read = sizeof(il->event);
qemu_set_fd_handler(il->fd, input_linux_event, NULL, il);
if (il->keycount) {
/* delay grab until all keys are released */
The evdev devices in input-linux.c are read in blocks of one whole event. If there are not enough bytes available, they are discarded, instead of being kept for the next read operation. This results in lost events, of even non-working devices. This patch keeps track of the number of bytes to be read to fill up a whole event, and then handle it. Signed-off-by: Javier Celaya <jcelaya@gmail.com> --- ui/input-linux.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)