From bde838fd1d04deccdf46be6c5b79043b4ffeb85f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 8 Feb 2023 13:07:44 +1000 Subject: [PATCH] protocol: rename the touch capability to touchscreen This matches the interface name now, even though the public API right now still uses TOUCH --- proto/protocol.xml | 4 ++-- src/libeis-device.c | 2 +- src/libeis-seat.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proto/protocol.xml b/proto/protocol.xml index 0858b6c..f37af85 100644 --- a/proto/protocol.xml +++ b/proto/protocol.xml @@ -320,7 +320,7 @@ - + @@ -421,7 +421,7 @@ - + diff --git a/src/libeis-device.c b/src/libeis-device.c index f0a746f..bf6036b 100644 --- a/src/libeis-device.c +++ b/src/libeis-device.c @@ -37,7 +37,7 @@ static_assert((1 << EIS_DEVICE_CAP_POINTER) == EIS_DEVICE_CAPABILITIES_POINTER, "ABI mismatch"); static_assert((1 << EIS_DEVICE_CAP_POINTER_ABSOLUTE) == EIS_DEVICE_CAPABILITIES_POINTER_ABSOLUTE, "ABI mismatch"); static_assert((1 << EIS_DEVICE_CAP_KEYBOARD) == EIS_DEVICE_CAPABILITIES_KEYBOARD, "ABI mismatch"); -static_assert((1 << EIS_DEVICE_CAP_TOUCH) == EIS_DEVICE_CAPABILITIES_TOUCH, "ABI mismatch"); +static_assert((1 << EIS_DEVICE_CAP_TOUCH) == EIS_DEVICE_CAPABILITIES_TOUCHSCREEN, "ABI mismatch"); static_assert((int)EIS_DEVICE_TYPE_VIRTUAL == EIS_DEVICE_DEVICE_TYPE_VIRTUAL, "ABI mismatch"); static_assert((int)EIS_DEVICE_TYPE_PHYSICAL == EIS_DEVICE_DEVICE_TYPE_PHYSICAL, "ABI mismatch"); diff --git a/src/libeis-seat.c b/src/libeis-seat.c index f41c0be..2340084 100644 --- a/src/libeis-seat.c +++ b/src/libeis-seat.c @@ -33,7 +33,7 @@ static_assert((1 << EIS_DEVICE_CAP_POINTER) == EIS_SEAT_CAPABILITIES_POINTER, "ABI mismatch"); static_assert((1 << EIS_DEVICE_CAP_POINTER_ABSOLUTE) == EIS_SEAT_CAPABILITIES_POINTER_ABSOLUTE, "ABI mismatch"); static_assert((1 << EIS_DEVICE_CAP_KEYBOARD) == EIS_SEAT_CAPABILITIES_KEYBOARD, "ABI mismatch"); -static_assert((1 << EIS_DEVICE_CAP_TOUCH) == EIS_SEAT_CAPABILITIES_TOUCH, "ABI mismatch"); +static_assert((1 << EIS_DEVICE_CAP_TOUCH) == EIS_SEAT_CAPABILITIES_TOUCHSCREEN, "ABI mismatch"); static void eis_seat_destroy(struct eis_seat *seat)