From f06095e0c8c538fcabfa833a7a93ff17d9a08807 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Aug 2020 09:55:21 +1000 Subject: [PATCH] libeis: fix the client-side keymap assignment Signed-off-by: Peter Hutterer --- src/libeis-client.c | 2 +- src/libeis-device.c | 3 ++- src/libeis-private.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libeis-client.c b/src/libeis-client.c index cc8c0bf..558bf32 100644 --- a/src/libeis-client.c +++ b/src/libeis-client.c @@ -184,7 +184,7 @@ client_new_device(struct eis_client *client, eis_device_set_touch_range(device, dim_touch->width, dim_touch->height); - eis_device_set_keymap(device, keymap_type, keymap_fd, keymap_sz); + eis_device_set_client_keymap(device, keymap_type, keymap_fd, keymap_sz); log_debug(eis_client_parent(client), "New device %d caps: %#x\n", id, capabilities); diff --git a/src/libeis-device.c b/src/libeis-device.c index 90fcdc2..0df7bfa 100644 --- a/src/libeis-device.c +++ b/src/libeis-device.c @@ -89,13 +89,14 @@ eis_device_set_touch_range(struct eis_device *device, void eis_device_set_client_keymap(struct eis_device *device, enum eis_keymap_type type, - int keymap_fd) + int keymap_fd, size_t size) { if (device->state != EIS_DEVICE_STATE_NEW) return; device->keymap.fd = dup(keymap_fd); device->keymap.type = type; + device->keymap.size = size; } _public_ void diff --git a/src/libeis-private.h b/src/libeis-private.h index cda5705..aa44ca8 100644 --- a/src/libeis-private.h +++ b/src/libeis-private.h @@ -172,7 +172,7 @@ eis_device_set_touch_range(struct eis_device *device, void eis_device_set_client_keymap(struct eis_device *device, enum eis_keymap_type type, - int keymap_fd); + int keymap_fd, size_t size); void eis_device_set_keymap(struct eis_device *device,