[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/4] virtio-input: add a virtio-mulitouch device
|
From: |
Marc-André Lureau |
|
Subject: |
Re: [PATCH 2/4] virtio-input: add a virtio-mulitouch device |
|
Date: |
Sun, 19 Feb 2023 12:06:03 +0400 |
Hi
On Sat, Feb 18, 2023 at 8:23 PM Sergio Lopez <slp@redhat.com> wrote:
>
> Add a virtio-multitouch device to the family of devices emulated by
> virtio-input implementing the Multi-touch protocol as descripted here:
>
> https://www.kernel.org/doc/html/latest/input/multi-touch-protocol.html?highlight=multi+touch
>
> This patch just add the device itself, without connecting it to any
> backends. The following patches will add helpers in "ui" and will enable
> the GTK3 backend to transpose multi-touch events from the host to the
> guest.
>
You should make the ui/ part as a different patch:
qapi/ui.json | 45 ++++++++++++++++++++++++++++++++++++++++++---
include/ui/input.h | 3 +++
replay/replay-input.c | 18 ++++++++++++++++++
ui/input.c | 6 ++++++
ui/trace-events | 1 +
Similarly, I guess you could add the PCI device after, although that's
not as important.
> Signed-off-by: Sergio Lopez <slp@redhat.com>
> ---
> hw/input/virtio-input-hid.c | 123 ++++++++++++++++++++++++++++++-
> hw/virtio/virtio-input-pci.c | 25 ++++++-
> include/hw/virtio/virtio-input.h | 9 ++-
> include/ui/input.h | 3 +
> qapi/ui.json | 45 ++++++++++-
> replay/replay-input.c | 18 +++++
> ui/input.c | 6 ++
> ui/trace-events | 1 +
> 8 files changed, 216 insertions(+), 14 deletions(-)
>
> diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
> index d28dab69ba..34109873ac 100644
> --- a/hw/input/virtio-input-hid.c
> +++ b/hw/input/virtio-input-hid.c
> @@ -16,9 +16,11 @@
>
> #include "standard-headers/linux/input.h"
>
> -#define VIRTIO_ID_NAME_KEYBOARD "QEMU Virtio Keyboard"
> -#define VIRTIO_ID_NAME_MOUSE "QEMU Virtio Mouse"
> -#define VIRTIO_ID_NAME_TABLET "QEMU Virtio Tablet"
> +#define VIRTIO_ID_NAME_KEYBOARD "QEMU Virtio Keyboard"
> +#define VIRTIO_ID_NAME_MOUSE "QEMU Virtio Mouse"
> +#define VIRTIO_ID_NAME_TABLET "QEMU Virtio Tablet"
> +#define VIRTIO_ID_NAME_MULTITOUCH "QEMU Virtio Multitouch"
> +#define VIRTIO_ID_SERIAL_MULTITOUCH "virtio-touchscreen-0"
>
> /* ----------------------------------------------------------------- */
>
> @@ -30,6 +32,7 @@ static const unsigned short
> keymap_button[INPUT_BUTTON__MAX] = {
> [INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN,
> [INPUT_BUTTON_SIDE] = BTN_SIDE,
> [INPUT_BUTTON_EXTRA] = BTN_EXTRA,
> + [INPUT_BUTTON_TOUCH] = BTN_TOUCH,
> };
>
> static const unsigned short axismap_rel[INPUT_AXIS__MAX] = {
> @@ -42,6 +45,11 @@ static const unsigned short axismap_abs[INPUT_AXIS__MAX] =
> {
> [INPUT_AXIS_Y] = ABS_Y,
> };
>
> +static const unsigned short axismap_tch[INPUT_AXIS__MAX] = {
> + [INPUT_AXIS_X] = ABS_MT_POSITION_X,
> + [INPUT_AXIS_Y] = ABS_MT_POSITION_Y,
> +};
> +
> /* ----------------------------------------------------------------- */
>
> static void virtio_input_extend_config(VirtIOInput *vinput,
> @@ -81,6 +89,7 @@ static void virtio_input_handle_event(DeviceState *dev,
> QemuConsole *src,
> InputKeyEvent *key;
> InputMoveEvent *move;
> InputBtnEvent *btn;
> + InputMultitouchEvent *mtt;
>
> switch (evt->type) {
> case INPUT_EVENT_KIND_KEY:
> @@ -137,6 +146,24 @@ static void virtio_input_handle_event(DeviceState *dev,
> QemuConsole *src,
> event.value = cpu_to_le32(move->value);
> virtio_input_send(vinput, &event);
> break;
> + case INPUT_EVENT_KIND_MTT:
> + mtt = evt->u.mtt.data;
> + if (mtt->type == INPUT_MULTITOUCH_TYPE_DATA) {
> + event.type = cpu_to_le16(EV_ABS);
> + event.code = cpu_to_le16(axismap_tch[mtt->axis]);
> + event.value = cpu_to_le32(mtt->value);
> + virtio_input_send(vinput, &event);
> + } else {
> + event.type = cpu_to_le16(EV_ABS);
> + event.code = cpu_to_le16(ABS_MT_SLOT);
> + event.value = cpu_to_le32(mtt->slot);
> + virtio_input_send(vinput, &event);
> + event.type = cpu_to_le16(EV_ABS);
> + event.code = cpu_to_le16(ABS_MT_TRACKING_ID);
> + event.value = cpu_to_le32(mtt->tracking_id);
> + virtio_input_send(vinput, &event);
> + }
> + break;
> default:
> /* keep gcc happy */
> break;
> @@ -515,12 +542,102 @@ static const TypeInfo virtio_tablet_info = {
>
> /* ----------------------------------------------------------------- */
>
> +static QemuInputHandler virtio_multitouch_handler = {
> + .name = VIRTIO_ID_NAME_MULTITOUCH,
> + .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_MTT,
> + .event = virtio_input_handle_event,
> + .sync = virtio_input_handle_sync,
> +};
> +
> +static struct virtio_input_config virtio_multitouch_config[] = {
> + {
> + .select = VIRTIO_INPUT_CFG_ID_NAME,
> + .size = sizeof(VIRTIO_ID_NAME_MULTITOUCH),
> + .u.string = VIRTIO_ID_NAME_MULTITOUCH,
> + },{
> + .select = VIRTIO_INPUT_CFG_ID_SERIAL,
> + .size = sizeof(VIRTIO_ID_SERIAL_MULTITOUCH),
> + .u.string = VIRTIO_ID_SERIAL_MULTITOUCH,
The spec says "Returns the serial number of the device," Is
""virtio-touchscreen-0" compliant?
None of the other virtio-input device use it, what do you need it for?
> + },{
> + .select = VIRTIO_INPUT_CFG_ID_DEVIDS,
> + .size = sizeof(struct virtio_input_devids),
> + .u.ids = {
> + .bustype = const_le16(BUS_VIRTUAL),
> + .vendor = const_le16(0x0627), /* same we use for usb hid
> devices */
> + .product = const_le16(0x0003),
> + .version = const_le16(0x0001),
> + },
> + },{
> + .select = VIRTIO_INPUT_CFG_ABS_INFO,
> + .subsel = ABS_MT_SLOT,
> + .size = sizeof(virtio_input_absinfo),
> + .u.abs.min = const_le32(INPUT_EVENT_SLOTS_MIN),
> + .u.abs.max = const_le32(INPUT_EVENT_SLOTS_MAX),
> + },{
> + .select = VIRTIO_INPUT_CFG_ABS_INFO,
> + .subsel = ABS_MT_TRACKING_ID,
> + .size = sizeof(virtio_input_absinfo),
> + .u.abs.min = const_le32(INPUT_EVENT_SLOTS_MIN),
> + .u.abs.max = const_le32(INPUT_EVENT_SLOTS_MAX),
> + },{
> + .select = VIRTIO_INPUT_CFG_ABS_INFO,
> + .subsel = ABS_MT_POSITION_X,
> + .size = sizeof(virtio_input_absinfo),
> + .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN),
> + .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX),
> + },{
> + .select = VIRTIO_INPUT_CFG_ABS_INFO,
> + .subsel = ABS_MT_POSITION_Y,
> + .size = sizeof(virtio_input_absinfo),
> + .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN),
> + .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX),
> + },
> + { /* end of list */ },
> +};
> +
> +static void virtio_multitouch_init(Object *obj)
> +{
> + VirtIOInputHID *vhid = VIRTIO_INPUT_HID(obj);
> + VirtIOInput *vinput = VIRTIO_INPUT(obj);
> + unsigned short abs_props[] = {
> + INPUT_PROP_DIRECT,
> + };
> + unsigned short abs_bits[] = {
> + ABS_MT_SLOT,
> + ABS_MT_TRACKING_ID,
> + ABS_MT_POSITION_X,
> + ABS_MT_POSITION_Y,
> + };
> +
> + vhid->handler = &virtio_multitouch_handler;
> + virtio_input_init_config(vinput, virtio_multitouch_config);
> + virtio_input_extend_config(vinput, keymap_button,
> + ARRAY_SIZE(keymap_button),
> + VIRTIO_INPUT_CFG_EV_BITS, EV_KEY);
> + virtio_input_extend_config(vinput, abs_props,
> + ARRAY_SIZE(abs_props),
> + VIRTIO_INPUT_CFG_PROP_BITS, 0);
> + virtio_input_extend_config(vinput, abs_bits,
> + ARRAY_SIZE(abs_bits),
> + VIRTIO_INPUT_CFG_EV_BITS, EV_ABS);
> +}
> +
> +static const TypeInfo virtio_multitouch_info = {
> + .name = TYPE_VIRTIO_MULTITOUCH,
> + .parent = TYPE_VIRTIO_INPUT_HID,
> + .instance_size = sizeof(VirtIOInputHID),
> + .instance_init = virtio_multitouch_init,
> +};
> +
> +/* ----------------------------------------------------------------- */
> +
> static void virtio_register_types(void)
> {
> type_register_static(&virtio_input_hid_info);
> type_register_static(&virtio_keyboard_info);
> type_register_static(&virtio_mouse_info);
> type_register_static(&virtio_tablet_info);
> + type_register_static(&virtio_multitouch_info);
> }
>
> type_init(virtio_register_types)
> diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c
> index a9d0992389..a53edf46c4 100644
> --- a/hw/virtio/virtio-input-pci.c
> +++ b/hw/virtio/virtio-input-pci.c
> @@ -25,10 +25,11 @@ struct VirtIOInputPCI {
> VirtIOInput vdev;
> };
>
> -#define TYPE_VIRTIO_INPUT_HID_PCI "virtio-input-hid-pci"
> -#define TYPE_VIRTIO_KEYBOARD_PCI "virtio-keyboard-pci"
> -#define TYPE_VIRTIO_MOUSE_PCI "virtio-mouse-pci"
> -#define TYPE_VIRTIO_TABLET_PCI "virtio-tablet-pci"
> +#define TYPE_VIRTIO_INPUT_HID_PCI "virtio-input-hid-pci"
> +#define TYPE_VIRTIO_KEYBOARD_PCI "virtio-keyboard-pci"
> +#define TYPE_VIRTIO_MOUSE_PCI "virtio-mouse-pci"
> +#define TYPE_VIRTIO_TABLET_PCI "virtio-tablet-pci"
> +#define TYPE_VIRTIO_MULTITOUCH_PCI "virtio-multitouch-pci"
> OBJECT_DECLARE_SIMPLE_TYPE(VirtIOInputHIDPCI, VIRTIO_INPUT_HID_PCI)
>
> struct VirtIOInputHIDPCI {
> @@ -102,6 +103,14 @@ static void virtio_tablet_initfn(Object *obj)
> TYPE_VIRTIO_TABLET);
> }
>
> +static void virtio_multitouch_initfn(Object *obj)
> +{
> + VirtIOInputHIDPCI *dev = VIRTIO_INPUT_HID_PCI(obj);
> +
> + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> + TYPE_VIRTIO_MULTITOUCH);
> +}
> +
> static const TypeInfo virtio_input_pci_info = {
> .name = TYPE_VIRTIO_INPUT_PCI,
> .parent = TYPE_VIRTIO_PCI,
> @@ -140,6 +149,13 @@ static const VirtioPCIDeviceTypeInfo
> virtio_tablet_pci_info = {
> .instance_init = virtio_tablet_initfn,
> };
>
> +static const VirtioPCIDeviceTypeInfo virtio_multitouch_pci_info = {
> + .generic_name = TYPE_VIRTIO_MULTITOUCH_PCI,
> + .parent = TYPE_VIRTIO_INPUT_HID_PCI,
> + .instance_size = sizeof(VirtIOInputHIDPCI),
> + .instance_init = virtio_multitouch_initfn,
> +};
> +
> static void virtio_pci_input_register(void)
> {
> /* Base types: */
> @@ -150,6 +166,7 @@ static void virtio_pci_input_register(void)
> virtio_pci_types_register(&virtio_keyboard_pci_info);
> virtio_pci_types_register(&virtio_mouse_pci_info);
> virtio_pci_types_register(&virtio_tablet_pci_info);
> + virtio_pci_types_register(&virtio_multitouch_pci_info);
> }
>
> type_init(virtio_pci_input_register)
> diff --git a/include/hw/virtio/virtio-input.h
> b/include/hw/virtio/virtio-input.h
> index f2da63d309..08f1591424 100644
> --- a/include/hw/virtio/virtio-input.h
> +++ b/include/hw/virtio/virtio-input.h
> @@ -24,10 +24,11 @@ OBJECT_DECLARE_TYPE(VirtIOInput, VirtIOInputClass,
> #define VIRTIO_INPUT_GET_PARENT_CLASS(obj) \
> OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT)
>
> -#define TYPE_VIRTIO_INPUT_HID "virtio-input-hid-device"
> -#define TYPE_VIRTIO_KEYBOARD "virtio-keyboard-device"
> -#define TYPE_VIRTIO_MOUSE "virtio-mouse-device"
> -#define TYPE_VIRTIO_TABLET "virtio-tablet-device"
> +#define TYPE_VIRTIO_INPUT_HID "virtio-input-hid-device"
> +#define TYPE_VIRTIO_KEYBOARD "virtio-keyboard-device"
> +#define TYPE_VIRTIO_MOUSE "virtio-mouse-device"
> +#define TYPE_VIRTIO_TABLET "virtio-tablet-device"
> +#define TYPE_VIRTIO_MULTITOUCH "virtio-multitouch-device"
>
> OBJECT_DECLARE_SIMPLE_TYPE(VirtIOInputHID, VIRTIO_INPUT_HID)
> #define VIRTIO_INPUT_HID_GET_PARENT_CLASS(obj) \
> diff --git a/include/ui/input.h b/include/ui/input.h
> index c86219a1c1..2a3dffd417 100644
> --- a/include/ui/input.h
> +++ b/include/ui/input.h
> @@ -8,9 +8,12 @@
> #define INPUT_EVENT_MASK_BTN (1<<INPUT_EVENT_KIND_BTN)
> #define INPUT_EVENT_MASK_REL (1<<INPUT_EVENT_KIND_REL)
> #define INPUT_EVENT_MASK_ABS (1<<INPUT_EVENT_KIND_ABS)
> +#define INPUT_EVENT_MASK_MTT (1<<INPUT_EVENT_KIND_MTT)
>
> #define INPUT_EVENT_ABS_MIN 0x0000
> #define INPUT_EVENT_ABS_MAX 0x7FFF
> +#define INPUT_EVENT_SLOTS_MIN 0x0
> +#define INPUT_EVENT_SLOTS_MAX 0xa
>
> typedef struct QemuInputHandler QemuInputHandler;
> typedef struct QemuInputHandlerState QemuInputHandlerState;
> diff --git a/qapi/ui.json b/qapi/ui.json
> index 0abba3e930..ae2496ca9c 100644
> --- a/qapi/ui.json
> +++ b/qapi/ui.json
> @@ -1001,7 +1001,7 @@
> ##
> { 'enum' : 'InputButton',
> 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side',
> - 'extra', 'wheel-left', 'wheel-right' ] }
> + 'extra', 'wheel-left', 'wheel-right', 'touch' ] }
>
> ##
> # @InputAxis:
> @@ -1013,6 +1013,17 @@
> { 'enum' : 'InputAxis',
> 'data' : [ 'x', 'y' ] }
>
> +##
> +# @InputMultitouchType:
> +#
> +# Type of a multitouch event.
> +#
> +# Since: 2.0
You'll have to update the version. Let's be optimistic for 8.0.
> +##
> +{ 'enum' : 'InputMultitouchType',
> + 'data' : [ 'begin', 'update', 'end', 'cancel', 'data' ] }
> +
> +
> ##
> # @InputKeyEvent:
> #
> @@ -1056,13 +1067,31 @@
> 'data' : { 'axis' : 'InputAxis',
> 'value' : 'int' } }
>
> +##
> +# @InputMultitouchEvent:
> +#
> +# Multitouch input event.
> +#
> +# @axis: Which axis is referenced by @value.
> +# @value: Pointer position. For absolute coordinates the
> +# valid range is 0 -> 0x7ffff
> +#
> +# Since: 2.0
> +##
> +{ 'struct' : 'InputMultitouchEvent',
> + 'data' : { 'type' : 'InputMultitouchType',
> + 'slot' : 'int',
> + 'tracking-id': 'int',
> + 'axis' : 'InputAxis',
> + 'value' : 'int' } }
> +
> ##
> # @InputEventKind:
> #
> # Since: 2.0
> ##
> { 'enum': 'InputEventKind',
> - 'data': [ 'key', 'btn', 'rel', 'abs' ] }
> + 'data': [ 'key', 'btn', 'rel', 'abs', 'mtt' ] }
>
> ##
> # @InputKeyEventWrapper:
> @@ -1088,6 +1117,14 @@
> { 'struct': 'InputMoveEventWrapper',
> 'data': { 'data': 'InputMoveEvent' } }
>
> +##
> +# @InputMultitouchEventWrapper:
> +#
> +# Since: 2.0
> +##
> +{ 'struct': 'InputMultitouchEventWrapper',
> + 'data': { 'data': 'InputMultitouchEvent' } }
> +
> ##
> # @InputEvent:
> #
> @@ -1099,6 +1136,7 @@
> # - 'btn': Input event of pointer buttons
> # - 'rel': Input event of relative pointer motion
> # - 'abs': Input event of absolute pointer motion
> +# - 'mtt': Input event of Multitouch
> #
> # Since: 2.0
> ##
> @@ -1108,7 +1146,8 @@
> 'data' : { 'key' : 'InputKeyEventWrapper',
> 'btn' : 'InputBtnEventWrapper',
> 'rel' : 'InputMoveEventWrapper',
> - 'abs' : 'InputMoveEventWrapper' } }
> + 'abs' : 'InputMoveEventWrapper',
> + 'mtt' : 'InputMultitouchEventWrapper' } }
>
> ##
> # @input-send-event:
> diff --git a/replay/replay-input.c b/replay/replay-input.c
> index 1147e3d34e..092f6b5ee9 100644
> --- a/replay/replay-input.c
> +++ b/replay/replay-input.c
> @@ -22,6 +22,7 @@ void replay_save_input_event(InputEvent *evt)
> InputKeyEvent *key;
> InputBtnEvent *btn;
> InputMoveEvent *move;
> + InputMultitouchEvent *mtt;
> replay_put_dword(evt->type);
>
> switch (evt->type) {
> @@ -58,6 +59,14 @@ void replay_save_input_event(InputEvent *evt)
> replay_put_dword(move->axis);
> replay_put_qword(move->value);
> break;
> + case INPUT_EVENT_KIND_MTT:
> + mtt = evt->u.mtt.data;
> + replay_put_dword(mtt->type);
> + replay_put_qword(mtt->slot);
> + replay_put_qword(mtt->tracking_id);
> + replay_put_dword(mtt->axis);
> + replay_put_qword(mtt->value);
> + break;
> case INPUT_EVENT_KIND__MAX:
> /* keep gcc happy */
> break;
> @@ -73,6 +82,7 @@ InputEvent *replay_read_input_event(void)
> InputBtnEvent btn;
> InputMoveEvent rel;
> InputMoveEvent abs;
> + InputMultitouchEvent mtt;
>
> evt.type = replay_get_dword();
> switch (evt.type) {
> @@ -109,6 +119,14 @@ InputEvent *replay_read_input_event(void)
> evt.u.abs.data->axis = (InputAxis)replay_get_dword();
> evt.u.abs.data->value = replay_get_qword();
> break;
> + case INPUT_EVENT_KIND_MTT:
> + evt.u.mtt.data = &mtt;
> + evt.u.mtt.data->type = (InputMultitouchType)replay_get_dword();
> + evt.u.mtt.data->slot = replay_get_qword();
> + evt.u.mtt.data->tracking_id = replay_get_qword();
> + evt.u.mtt.data->axis = (InputAxis)replay_get_dword();
> + evt.u.mtt.data->value = replay_get_qword();
> + break;
> case INPUT_EVENT_KIND__MAX:
> /* keep gcc happy */
> break;
> diff --git a/ui/input.c b/ui/input.c
> index f2d1e7a3a7..f788db20f7 100644
> --- a/ui/input.c
> +++ b/ui/input.c
> @@ -212,6 +212,7 @@ static void qemu_input_event_trace(QemuConsole *src,
> InputEvent *evt)
> InputKeyEvent *key;
> InputBtnEvent *btn;
> InputMoveEvent *move;
> + InputMultitouchEvent *mtt;
>
> if (src) {
> idx = qemu_console_get_index(src);
> @@ -250,6 +251,11 @@ static void qemu_input_event_trace(QemuConsole *src,
> InputEvent *evt)
> name = InputAxis_str(move->axis);
> trace_input_event_abs(idx, name, move->value);
> break;
> + case INPUT_EVENT_KIND_MTT:
> + mtt = evt->u.mtt.data;
> + name = InputAxis_str(mtt->axis);
> + trace_input_event_mtt(idx, name, mtt->value);
> + break;
> case INPUT_EVENT_KIND__MAX:
> /* keep gcc happy */
> break;
> diff --git a/ui/trace-events b/ui/trace-events
> index 977577fbba..6747361745 100644
> --- a/ui/trace-events
> +++ b/ui/trace-events
> @@ -90,6 +90,7 @@ input_event_key_qcode(int conidx, const char *qcode, bool
> down) "con %d, key qco
> input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s,
> down %d"
> input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s,
> value %d"
> input_event_abs(int conidx, const char *axis, int value) "con %d, axis %s,
> value 0x%x"
> +input_event_mtt(int conidx, const char *axis, int value) "con %d, axis %s,
> value 0x%x"
> input_event_sync(void) ""
> input_mouse_mode(int absolute) "absolute %d"
>
> --
> 2.38.1
>
>
lgtm, otherwise
--
Marc-André Lureau