* [PATCH v3 1/6] virtio-input: generalize virtio_input_key_config()
2023-04-13 15:21 [PATCH v3 0/6] Implement virtio-multitouch and enable GTK3 to use it Sergio Lopez
@ 2023-04-13 15:21 ` Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 2/6] ui: add the infrastructure to support MT events Sergio Lopez
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Sergio Lopez @ 2023-04-13 15:21 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Markus Armbruster, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake, Sergio Lopez
As there are other bitmap-based config properties that need to be dealt in a
similar fashion as VIRTIO_INPUT_CFG_EV_BITS, generalize the function to
receive select and subsel as arguments, and rename it to
virtio_input_extend_config()
Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/input/virtio-input-hid.c | 38 ++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index a7a244a95d..d28dab69ba 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -44,30 +44,31 @@ static const unsigned short axismap_abs[INPUT_AXIS__MAX] = {
/* ----------------------------------------------------------------- */
-static void virtio_input_key_config(VirtIOInput *vinput,
- const unsigned short *keymap,
- size_t mapsize)
+static void virtio_input_extend_config(VirtIOInput *vinput,
+ const unsigned short *map,
+ size_t mapsize,
+ uint8_t select, uint8_t subsel)
{
- virtio_input_config keys;
+ virtio_input_config ext;
int i, bit, byte, bmax = 0;
- memset(&keys, 0, sizeof(keys));
+ memset(&ext, 0, sizeof(ext));
for (i = 0; i < mapsize; i++) {
- bit = keymap[i];
+ bit = map[i];
if (!bit) {
continue;
}
byte = bit / 8;
bit = bit % 8;
- keys.u.bitmap[byte] |= (1 << bit);
+ ext.u.bitmap[byte] |= (1 << bit);
if (bmax < byte+1) {
bmax = byte+1;
}
}
- keys.select = VIRTIO_INPUT_CFG_EV_BITS;
- keys.subsel = EV_KEY;
- keys.size = bmax;
- virtio_input_add_config(vinput, &keys);
+ ext.select = select;
+ ext.subsel = subsel;
+ ext.size = bmax;
+ virtio_input_add_config(vinput, &ext);
}
static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
@@ -281,8 +282,9 @@ static void virtio_keyboard_init(Object *obj)
vhid->handler = &virtio_keyboard_handler;
virtio_input_init_config(vinput, virtio_keyboard_config);
- virtio_input_key_config(vinput, qemu_input_map_qcode_to_linux,
- qemu_input_map_qcode_to_linux_len);
+ virtio_input_extend_config(vinput, qemu_input_map_qcode_to_linux,
+ qemu_input_map_qcode_to_linux_len,
+ VIRTIO_INPUT_CFG_EV_BITS, EV_KEY);
}
static const TypeInfo virtio_keyboard_info = {
@@ -373,8 +375,9 @@ static void virtio_mouse_init(Object *obj)
virtio_input_init_config(vinput, vhid->wheel_axis
? virtio_mouse_config_v2
: virtio_mouse_config_v1);
- virtio_input_key_config(vinput, keymap_button,
- ARRAY_SIZE(keymap_button));
+ virtio_input_extend_config(vinput, keymap_button,
+ ARRAY_SIZE(keymap_button),
+ VIRTIO_INPUT_CFG_EV_BITS, EV_KEY);
}
static const TypeInfo virtio_mouse_info = {
@@ -497,8 +500,9 @@ static void virtio_tablet_init(Object *obj)
virtio_input_init_config(vinput, vhid->wheel_axis
? virtio_tablet_config_v2
: virtio_tablet_config_v1);
- virtio_input_key_config(vinput, keymap_button,
- ARRAY_SIZE(keymap_button));
+ virtio_input_extend_config(vinput, keymap_button,
+ ARRAY_SIZE(keymap_button),
+ VIRTIO_INPUT_CFG_EV_BITS, EV_KEY);
}
static const TypeInfo virtio_tablet_info = {
--
2.38.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 2/6] ui: add the infrastructure to support MT events
2023-04-13 15:21 [PATCH v3 0/6] Implement virtio-multitouch and enable GTK3 to use it Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 1/6] virtio-input: generalize virtio_input_key_config() Sergio Lopez
@ 2023-04-13 15:21 ` Sergio Lopez
2023-04-17 10:57 ` Markus Armbruster
2023-04-13 15:21 ` [PATCH v3 3/6] virtio-input: add a virtio-mulitouch device Sergio Lopez
` (3 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Sergio Lopez @ 2023-04-13 15:21 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Markus Armbruster, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake, Sergio Lopez
Add the required infrastructure to support generating multitouch events.
Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/ui/input.h | 3 +++
qapi/ui.json | 46 ++++++++++++++++++++++++++++++++++++++++---
replay/replay-input.c | 18 +++++++++++++++++
ui/input.c | 6 ++++++
ui/trace-events | 1 +
5 files changed, 71 insertions(+), 3 deletions(-)
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 98322342f7..83369bdae8 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1014,7 +1014,7 @@
##
{ 'enum' : 'InputButton',
'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side',
- 'extra', 'wheel-left', 'wheel-right' ] }
+ 'extra', 'wheel-left', 'wheel-right', 'touch' ] }
##
# @InputAxis:
@@ -1026,6 +1026,17 @@
{ 'enum' : 'InputAxis',
'data' : [ 'x', 'y' ] }
+##
+# @InputMultitouchType:
+#
+# Type of a multitouch event.
+#
+# Since: 8.1
+##
+{ 'enum' : 'InputMultitouchType',
+ 'data' : [ 'begin', 'update', 'end', 'cancel', 'data' ] }
+
+
##
# @InputKeyEvent:
#
@@ -1069,13 +1080,32 @@
'data' : { 'axis' : 'InputAxis',
'value' : 'int' } }
+##
+# @InputMultitouchEvent:
+#
+# Multitouch input event.
+#
+# @slot: Which slot has generated the event.
+# @tracking-id: ID to correlate this event with previously generated events.
+# @axis: Which axis is referenced by @value.
+# @value: Contact position.
+#
+# Since: 8.1
+##
+{ '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:
@@ -1101,6 +1131,14 @@
{ 'struct': 'InputMoveEventWrapper',
'data': { 'data': 'InputMoveEvent' } }
+##
+# @InputMultitouchEventWrapper:
+#
+# Since: 8.1
+##
+{ 'struct': 'InputMultitouchEventWrapper',
+ 'data': { 'data': 'InputMultitouchEvent' } }
+
##
# @InputEvent:
#
@@ -1112,6 +1150,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
##
@@ -1121,7 +1160,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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v3 2/6] ui: add the infrastructure to support MT events
2023-04-13 15:21 ` [PATCH v3 2/6] ui: add the infrastructure to support MT events Sergio Lopez
@ 2023-04-17 10:57 ` Markus Armbruster
2023-05-09 9:43 ` Sergio Lopez
0 siblings, 1 reply; 9+ messages in thread
From: Markus Armbruster @ 2023-04-17 10:57 UTC (permalink / raw)
To: Sergio Lopez
Cc: qemu-devel, Gerd Hoffmann, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake
Sergio Lopez <slp@redhat.com> writes:
> Add the required infrastructure to support generating multitouch events.
>
> Signed-off-by: Sergio Lopez <slp@redhat.com>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/ui/input.h | 3 +++
> qapi/ui.json | 46 ++++++++++++++++++++++++++++++++++++++++---
> replay/replay-input.c | 18 +++++++++++++++++
> ui/input.c | 6 ++++++
> ui/trace-events | 1 +
> 5 files changed, 71 insertions(+), 3 deletions(-)
>
> 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 98322342f7..83369bdae8 100644
> --- a/qapi/ui.json
> +++ b/qapi/ui.json
> @@ -1014,7 +1014,7 @@
> ##
> { 'enum' : 'InputButton',
> 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side',
> - 'extra', 'wheel-left', 'wheel-right' ] }
> + 'extra', 'wheel-left', 'wheel-right', 'touch' ] }
>
> ##
> # @InputAxis:
> @@ -1026,6 +1026,17 @@
> { 'enum' : 'InputAxis',
> 'data' : [ 'x', 'y' ] }
>
> +##
> +# @InputMultitouchType:
Suggest InputMultiTouchType, because...
> +#
> +# Type of a multitouch event.
... the common spelling is multi-touch.
More of the same below.
> +#
> +# Since: 8.1
> +##
> +{ 'enum' : 'InputMultitouchType',
> + 'data' : [ 'begin', 'update', 'end', 'cancel', 'data' ] }
> +
> +
> ##
> # @InputKeyEvent:
> #
> @@ -1069,13 +1080,32 @@
> 'data' : { 'axis' : 'InputAxis',
> 'value' : 'int' } }
>
> +##
> +# @InputMultitouchEvent:
> +#
> +# Multitouch input event.
> +#
> +# @slot: Which slot has generated the event.
Ignorant question: what's a "slot"?
> +# @tracking-id: ID to correlate this event with previously generated events.
> +# @axis: Which axis is referenced by @value.
> +# @value: Contact position.
> +#
> +# Since: 8.1
> +##
> +{ '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' ] }
While we generally avoid abbreviations in QAPI, local consistency is a
strong argument for this one. Okay.
>
> ##
> # @InputKeyEventWrapper:
> @@ -1101,6 +1131,14 @@
> { 'struct': 'InputMoveEventWrapper',
> 'data': { 'data': 'InputMoveEvent' } }
>
> +##
> +# @InputMultitouchEventWrapper:
> +#
> +# Since: 8.1
> +##
> +{ 'struct': 'InputMultitouchEventWrapper',
> + 'data': { 'data': 'InputMultitouchEvent' } }
The only reason for wrapping is consistency with the other branches.
Okay.
> +
> ##
> # @InputEvent:
> #
> @@ -1112,6 +1150,7 @@
# @type: the input type, one of:
#
# - 'key': Input event of Keyboard
> # - '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
You're imitating the existing "Input event of" pattern, which is fair.
But the pattern is bad. The phrasing awkward, and so is the place. By
documenting the values of InputEventKind only here, and not in
InputEventKind's doc comment, the generated documentation for
InputEventKind looks like this:
"InputEventKind" (Enum)
-----------------------
Values
~~~~~~
"key"
Not documented
"btn"
Not documented
"rel"
Not documented
"abs"
Not documented
"mtt"
Not documented
Since
~~~~~
2.0
We should document them right in InputEventKind's doc comment, roughly
like this:
##
# @InputEventKind:
#
# @key: a keyboard input event
# @btn: a pointer button input event
# @rel: a relative pointer motion input event
# @abs: an absolute pointer motion input event
# @mtt: a multi-touch input event
#
# Since: 2.0
##
We can then dumb down the documentation of InputEvent member @type to
just
# @type: the type of input event
What do you think?
Many more doc comments neglect to document members in this file, and in
others. I'm not asking you to fix them all.
> #
> # Since: 2.0
> ##
> @@ -1121,7 +1160,8 @@
> 'data' : { 'key' : 'InputKeyEventWrapper',
> 'btn' : 'InputBtnEventWrapper',
> 'rel' : 'InputMoveEventWrapper',
> - 'abs' : 'InputMoveEventWrapper' } }
> + 'abs' : 'InputMoveEventWrapper',
> + 'mtt' : 'InputMultitouchEventWrapper' } }
>
> ##
> # @input-send-event:
[...]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 2/6] ui: add the infrastructure to support MT events
2023-04-17 10:57 ` Markus Armbruster
@ 2023-05-09 9:43 ` Sergio Lopez
0 siblings, 0 replies; 9+ messages in thread
From: Sergio Lopez @ 2023-05-09 9:43 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Gerd Hoffmann, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake
[-- Attachment #1: Type: text/plain, Size: 6513 bytes --]
On Mon, Apr 17, 2023 at 12:57:08PM +0200, Markus Armbruster wrote:
> Sergio Lopez <slp@redhat.com> writes:
>
> > Add the required infrastructure to support generating multitouch events.
> >
> > Signed-off-by: Sergio Lopez <slp@redhat.com>
> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > include/ui/input.h | 3 +++
> > qapi/ui.json | 46 ++++++++++++++++++++++++++++++++++++++++---
> > replay/replay-input.c | 18 +++++++++++++++++
> > ui/input.c | 6 ++++++
> > ui/trace-events | 1 +
> > 5 files changed, 71 insertions(+), 3 deletions(-)
> >
> > 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 98322342f7..83369bdae8 100644
> > --- a/qapi/ui.json
> > +++ b/qapi/ui.json
> > @@ -1014,7 +1014,7 @@
> > ##
> > { 'enum' : 'InputButton',
> > 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side',
> > - 'extra', 'wheel-left', 'wheel-right' ] }
> > + 'extra', 'wheel-left', 'wheel-right', 'touch' ] }
> >
> > ##
> > # @InputAxis:
> > @@ -1026,6 +1026,17 @@
> > { 'enum' : 'InputAxis',
> > 'data' : [ 'x', 'y' ] }
> >
> > +##
> > +# @InputMultitouchType:
>
> Suggest InputMultiTouchType, because...
>
> > +#
> > +# Type of a multitouch event.
>
> ... the common spelling is multi-touch.
>
> More of the same below.
Ack, let's use this in v4.
> > +#
> > +# Since: 8.1
> > +##
> > +{ 'enum' : 'InputMultitouchType',
> > + 'data' : [ 'begin', 'update', 'end', 'cancel', 'data' ] }
> > +
> > +
> > ##
> > # @InputKeyEvent:
> > #
> > @@ -1069,13 +1080,32 @@
> > 'data' : { 'axis' : 'InputAxis',
> > 'value' : 'int' } }
> >
> > +##
> > +# @InputMultitouchEvent:
> > +#
> > +# Multitouch input event.
> > +#
> > +# @slot: Which slot has generated the event.
>
> Ignorant question: what's a "slot"?
The Multi-touch protocol [1] talks about them without describing them in much
detail. In my understanding, the HW has as many slots as simultaneous contact
points is able to track. When a new contact is detected is assigned a
particular slot, and keeps using that one until the contact is released.
> > +# @tracking-id: ID to correlate this event with previously generated events.
> > +# @axis: Which axis is referenced by @value.
> > +# @value: Contact position.
> > +#
> > +# Since: 8.1
> > +##
> > +{ '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' ] }
>
> While we generally avoid abbreviations in QAPI, local consistency is a
> strong argument for this one. Okay.
>
> >
> > ##
> > # @InputKeyEventWrapper:
> > @@ -1101,6 +1131,14 @@
> > { 'struct': 'InputMoveEventWrapper',
> > 'data': { 'data': 'InputMoveEvent' } }
> >
> > +##
> > +# @InputMultitouchEventWrapper:
> > +#
> > +# Since: 8.1
> > +##
> > +{ 'struct': 'InputMultitouchEventWrapper',
> > + 'data': { 'data': 'InputMultitouchEvent' } }
>
> The only reason for wrapping is consistency with the other branches.
> Okay.
>
> > +
> > ##
> > # @InputEvent:
> > #
> > @@ -1112,6 +1150,7 @@
> # @type: the input type, one of:
> #
> # - 'key': Input event of Keyboard
> > # - '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
>
> You're imitating the existing "Input event of" pattern, which is fair.
> But the pattern is bad. The phrasing awkward, and so is the place. By
> documenting the values of InputEventKind only here, and not in
> InputEventKind's doc comment, the generated documentation for
> InputEventKind looks like this:
>
> "InputEventKind" (Enum)
> -----------------------
>
> Values
> ~~~~~~
>
> "key"
> Not documented
>
> "btn"
> Not documented
>
> "rel"
> Not documented
>
> "abs"
> Not documented
>
> "mtt"
> Not documented
>
>
> Since
> ~~~~~
>
> 2.0
>
> We should document them right in InputEventKind's doc comment, roughly
> like this:
>
> ##
> # @InputEventKind:
> #
> # @key: a keyboard input event
> # @btn: a pointer button input event
> # @rel: a relative pointer motion input event
> # @abs: an absolute pointer motion input event
> # @mtt: a multi-touch input event
> #
> # Since: 2.0
> ##
>
> We can then dumb down the documentation of InputEvent member @type to
> just
>
> # @type: the type of input event
>
> What do you think?
Yeah, this definitely looks better. Fixed in v4.
Thanks,
Sergio.
> Many more doc comments neglect to document members in this file, and in
> others. I'm not asking you to fix them all.
>
> > #
> > # Since: 2.0
> > ##
> > @@ -1121,7 +1160,8 @@
> > 'data' : { 'key' : 'InputKeyEventWrapper',
> > 'btn' : 'InputBtnEventWrapper',
> > 'rel' : 'InputMoveEventWrapper',
> > - 'abs' : 'InputMoveEventWrapper' } }
> > + 'abs' : 'InputMoveEventWrapper',
> > + 'mtt' : 'InputMultitouchEventWrapper' } }
> >
> > ##
> > # @input-send-event:
>
> [...]
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 3/6] virtio-input: add a virtio-mulitouch device
2023-04-13 15:21 [PATCH v3 0/6] Implement virtio-multitouch and enable GTK3 to use it Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 1/6] virtio-input: generalize virtio_input_key_config() Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 2/6] ui: add the infrastructure to support MT events Sergio Lopez
@ 2023-04-13 15:21 ` Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 4/6] virtio-input-pci: add virtio-multitouch-pci Sergio Lopez
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Sergio Lopez @ 2023-04-13 15:21 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Markus Armbruster, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake, Sergio Lopez
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 a PCI-based multitouch device,
some helpers in "ui" and will enable the GTK3 backend to transpose
multi-touch events from the host to the guest.
Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/input/virtio-input-hid.c | 118 ++++++++++++++++++++++++++++++-
include/hw/virtio/virtio-input.h | 9 +--
2 files changed, 120 insertions(+), 7 deletions(-)
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index d28dab69ba..742235d3fa 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -16,9 +16,10 @@
#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"
/* ----------------------------------------------------------------- */
@@ -30,6 +31,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 +44,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 +88,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 +145,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 +541,98 @@ 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_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/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) \
--
2.38.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 4/6] virtio-input-pci: add virtio-multitouch-pci
2023-04-13 15:21 [PATCH v3 0/6] Implement virtio-multitouch and enable GTK3 to use it Sergio Lopez
` (2 preceding siblings ...)
2023-04-13 15:21 ` [PATCH v3 3/6] virtio-input: add a virtio-mulitouch device Sergio Lopez
@ 2023-04-13 15:21 ` Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 5/6] ui: add helpers for virtio-multitouch events Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 6/6] ui/gtk: enable backend to send multi-touch events Sergio Lopez
5 siblings, 0 replies; 9+ messages in thread
From: Sergio Lopez @ 2023-04-13 15:21 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Markus Armbruster, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake, Sergio Lopez
Add virtio-multitouch-pci, a Multitouch-capable input device, to the
list of devices that can be provided by virtio-input-pci.
Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/virtio/virtio-input-pci.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
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)
--
2.38.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 5/6] ui: add helpers for virtio-multitouch events
2023-04-13 15:21 [PATCH v3 0/6] Implement virtio-multitouch and enable GTK3 to use it Sergio Lopez
` (3 preceding siblings ...)
2023-04-13 15:21 ` [PATCH v3 4/6] virtio-input-pci: add virtio-multitouch-pci Sergio Lopez
@ 2023-04-13 15:21 ` Sergio Lopez
2023-04-13 15:21 ` [PATCH v3 6/6] ui/gtk: enable backend to send multi-touch events Sergio Lopez
5 siblings, 0 replies; 9+ messages in thread
From: Sergio Lopez @ 2023-04-13 15:21 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Markus Armbruster, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake, Sergio Lopez
Add helpers for generating Multi-touch events from the UI backends that
can be sent to the guest through a virtio-multitouch device.
Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/ui/input.h | 5 +++++
ui/input.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/include/ui/input.h b/include/ui/input.h
index 2a3dffd417..c37251e1e9 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -64,6 +64,11 @@ int qemu_input_scale_axis(int value,
void qemu_input_queue_rel(QemuConsole *src, InputAxis axis, int value);
void qemu_input_queue_abs(QemuConsole *src, InputAxis axis, int value,
int min_in, int max_in);
+void qemu_input_queue_mtt(QemuConsole *src, InputMultitouchType type, int slot,
+ int tracking_id);
+void qemu_input_queue_mtt_abs(QemuConsole *src, InputAxis axis, int value,
+ int min_in, int max_in,
+ int slot, int tracking_id);
void qemu_input_check_mode_change(void);
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
diff --git a/ui/input.c b/ui/input.c
index f788db20f7..34331b7b0b 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -547,6 +547,42 @@ void qemu_input_queue_abs(QemuConsole *src, InputAxis axis, int value,
qemu_input_event_send(src, &evt);
}
+void qemu_input_queue_mtt(QemuConsole *src, InputMultitouchType type,
+ int slot, int tracking_id)
+{
+ InputMultitouchEvent mtt = {
+ .type = type,
+ .slot = slot,
+ .tracking_id = tracking_id,
+ };
+ InputEvent evt = {
+ .type = INPUT_EVENT_KIND_MTT,
+ .u.mtt.data = &mtt,
+ };
+
+ qemu_input_event_send(src, &evt);
+}
+
+void qemu_input_queue_mtt_abs(QemuConsole *src, InputAxis axis, int value,
+ int min_in, int max_in, int slot, int tracking_id)
+{
+ InputMultitouchEvent mtt = {
+ .type = INPUT_MULTITOUCH_TYPE_DATA,
+ .slot = slot,
+ .tracking_id = tracking_id,
+ .axis = axis,
+ .value = qemu_input_scale_axis(value, min_in, max_in,
+ INPUT_EVENT_ABS_MIN,
+ INPUT_EVENT_ABS_MAX),
+ };
+ InputEvent evt = {
+ .type = INPUT_EVENT_KIND_MTT,
+ .u.mtt.data = &mtt,
+ };
+
+ qemu_input_event_send(src, &evt);
+}
+
void qemu_input_check_mode_change(void)
{
static int current_is_absolute;
--
2.38.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 6/6] ui/gtk: enable backend to send multi-touch events
2023-04-13 15:21 [PATCH v3 0/6] Implement virtio-multitouch and enable GTK3 to use it Sergio Lopez
` (4 preceding siblings ...)
2023-04-13 15:21 ` [PATCH v3 5/6] ui: add helpers for virtio-multitouch events Sergio Lopez
@ 2023-04-13 15:21 ` Sergio Lopez
5 siblings, 0 replies; 9+ messages in thread
From: Sergio Lopez @ 2023-04-13 15:21 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Markus Armbruster, Pavel Dovgalyuk,
Marc-André Lureau, Paolo Bonzini, Michael S. Tsirkin,
Eric Blake, Sergio Lopez
GTK3 provides the infrastructure to receive and process multi-touch
events through the "touch-event" signal and the GdkEventTouch type.
Make use of it to transpose events from the host to the guest.
This allows users of machines with hardware capable of receiving
multi-touch events to run guests that can also receive those events
and interpret them as gestures, when appropriate.
An example of this in action can be seen here:
https://fosstodon.org/@slp/109545849296546767
Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
ui/gtk.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/ui/gtk.c b/ui/gtk.c
index f16e0f8dee..b3e6443943 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -130,6 +130,13 @@ typedef struct VCChardev VCChardev;
DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV,
TYPE_CHARDEV_VC)
+struct touch_slot {
+ int x;
+ int y;
+ int tracking_id;
+};
+static struct touch_slot touch_slots[INPUT_EVENT_SLOTS_MAX];
+
bool gtk_use_gl_area;
static void gd_grab_pointer(VirtualConsole *vc, const char *reason);
@@ -1059,6 +1066,82 @@ static gboolean gd_scroll_event(GtkWidget *widget, GdkEventScroll *scroll,
}
+static gboolean gd_touch_event(GtkWidget *widget, GdkEventTouch *touch,
+ void *opaque)
+{
+ VirtualConsole *vc = opaque;
+ struct touch_slot *slot;
+ uint64_t num_slot = GPOINTER_TO_UINT(touch->sequence);
+ bool needs_sync = false;
+ int update;
+ int type = -1;
+ int i;
+
+ if (num_slot >= INPUT_EVENT_SLOTS_MAX) {
+ warn_report("gtk: unexpected touch slot number: %ld >= %d\n",
+ num_slot, INPUT_EVENT_SLOTS_MAX);
+ return FALSE;
+ }
+
+ slot = &touch_slots[num_slot];
+ slot->x = touch->x;
+ slot->y = touch->y;
+
+ switch (touch->type) {
+ case GDK_TOUCH_BEGIN:
+ type = INPUT_MULTITOUCH_TYPE_BEGIN;
+ slot->tracking_id = num_slot;
+ break;
+ case GDK_TOUCH_UPDATE:
+ type = INPUT_MULTITOUCH_TYPE_UPDATE;
+ break;
+ case GDK_TOUCH_END:
+ case GDK_TOUCH_CANCEL:
+ type = INPUT_MULTITOUCH_TYPE_END;
+ break;
+ default:
+ warn_report("gtk: unexpected touch event type\n");
+ }
+
+ for (i = 0; i < INPUT_EVENT_SLOTS_MAX; ++i) {
+ if (i == num_slot) {
+ update = type;
+ } else {
+ update = INPUT_MULTITOUCH_TYPE_UPDATE;
+ }
+
+ slot = &touch_slots[i];
+
+ if (slot->tracking_id == -1) {
+ continue;
+ }
+
+ if (update == INPUT_MULTITOUCH_TYPE_END) {
+ slot->tracking_id = -1;
+ qemu_input_queue_mtt(vc->gfx.dcl.con, update, i, slot->tracking_id);
+ needs_sync = true;
+ } else {
+ qemu_input_queue_mtt(vc->gfx.dcl.con, update, i, slot->tracking_id);
+ qemu_input_queue_btn(vc->gfx.dcl.con, INPUT_BUTTON_TOUCH, true);
+ qemu_input_queue_mtt_abs(vc->gfx.dcl.con,
+ INPUT_AXIS_X, (int) slot->x,
+ 0, surface_width(vc->gfx.ds),
+ i, slot->tracking_id);
+ qemu_input_queue_mtt_abs(vc->gfx.dcl.con,
+ INPUT_AXIS_Y, (int) slot->y,
+ 0, surface_height(vc->gfx.ds),
+ i, slot->tracking_id);
+ needs_sync = true;
+ }
+ }
+
+ if (needs_sync) {
+ qemu_input_event_sync();
+ }
+
+ return TRUE;
+}
+
static const guint16 *gd_get_keymap(size_t *maplen)
{
GdkDisplay *dpy = gdk_display_get_default();
@@ -1980,6 +2063,8 @@ static void gd_connect_vc_gfx_signals(VirtualConsole *vc)
G_CALLBACK(gd_key_event), vc);
g_signal_connect(vc->gfx.drawing_area, "key-release-event",
G_CALLBACK(gd_key_event), vc);
+ g_signal_connect(vc->gfx.drawing_area, "touch-event",
+ G_CALLBACK(gd_touch_event), vc);
g_signal_connect(vc->gfx.drawing_area, "enter-notify-event",
G_CALLBACK(gd_enter_event), vc);
@@ -2089,6 +2174,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
GSList *group, GtkWidget *view_menu)
{
bool zoom_to_fit = false;
+ int i;
vc->label = qemu_console_get_label(con);
vc->s = s;
@@ -2136,6 +2222,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_MOTION_MASK |
+ GDK_TOUCH_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
GDK_SCROLL_MASK |
@@ -2171,6 +2258,11 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
s->free_scale = true;
}
+ for (i = 0; i < INPUT_EVENT_SLOTS_MAX; i++) {
+ struct touch_slot *slot = &touch_slots[i];
+ slot->tracking_id = -1;
+ }
+
return group;
}
--
2.38.1
^ permalink raw reply related [flat|nested] 9+ messages in thread