From nobody Mon Feb 9 20:12:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621602209; cv=none; d=zohomail.com; s=zohoarc; b=Y0DLtuG9NdNNQtkquRdNy9KAfVKRQ/xwJDY43ey9rsVLguUSYgI1g1xPid+34d4UlmBkI9ZwrQX46+pivNHmbGDXcwKgh38NLmPLtLkfVy2cbtrIMVcYSph0E7xEUK+Gxx9+TGS3OTvu71JexanJUKaZJk1/0w70eUMwQsCLtcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621602209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BeDMvSwr47sUdHUuw5UsUFTELxGdO4wzJwtdhMN83Z4=; b=GhMSM+13s378VG0dG+kvLqyPHNAMbcYB0Ims+cUj4+dtJnfuG9DxuVVmOmAsev4a8X4ivQDydQcpognsioXoqEHfNRASQnKPSxG+GfEAACe45fxWl1g4v0i+jPZO+0JXbd9zFEiXsSDWB0wu7ESL4dJb4j4l6xxtpUHplTE/xoA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621602209065811.378493724292; Fri, 21 May 2021 06:03:29 -0700 (PDT) Received: from localhost ([::1]:35964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lk4oH-000773-Oc for importer@patchew.org; Fri, 21 May 2021 09:03:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk4ey-0007Ii-MP for qemu-devel@nongnu.org; Fri, 21 May 2021 08:53:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk4ew-0007z9-Kf for qemu-devel@nongnu.org; Fri, 21 May 2021 08:53:48 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-FPfnipXzNReUMUoXSS09fw-1; Fri, 21 May 2021 08:53:44 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFC131926DA2 for ; Fri, 21 May 2021 12:53:43 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-84.ams2.redhat.com [10.36.112.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 892966267F; Fri, 21 May 2021 12:53:32 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A128D180087E; Fri, 21 May 2021 14:51:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BeDMvSwr47sUdHUuw5UsUFTELxGdO4wzJwtdhMN83Z4=; b=PQHeXfA1mT0jSvFuVF6K06xdwfYj23NhSt0HxT/dbdfx/33sT2M5FPVVpfpeMgmGl57OUE A9XMO+c293yM/LXxnR0ll3p7Mx78kQHird9yRTJJMSWurR+yOJV4iJRogMlDkzvx9YrvoR E+lF+zAicQlTiqNQ9r2Y7VVd8oTrYOA= X-MC-Unique: FPfnipXzNReUMUoXSS09fw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 07/11] ui/vdagent: add mouse support Date: Fri, 21 May 2021 14:51:15 +0200 Message-Id: <20210521125119.3173309-8-kraxel@redhat.com> In-Reply-To: <20210521125119.3173309-1-kraxel@redhat.com> References: <20210521125119.3173309-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This patch adds support for mouse messages to the vdagent implementation. This can be enabled/disabled using the new 'mouse' parameter for the vdagent chardev. Default is on. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Acked-by: Markus Armbruster Message-id: 20210519053940.1888907-1-kraxel@redhat.com Message-Id: <20210519053940.1888907-6-kraxel@redhat.com> --- chardev/char.c | 3 + ui/vdagent.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 4 +- 3 files changed, 155 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index a4ebfcc5ac20..52c567e8ff00 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -931,6 +931,9 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "logappend", .type =3D QEMU_OPT_BOOL, + },{ + .name =3D "mouse", + .type =3D QEMU_OPT_BOOL, #ifdef CONFIG_LINUX },{ .name =3D "tight", diff --git a/ui/vdagent.c b/ui/vdagent.c index 21e55a41eaba..cf81ab6beb68 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -3,18 +3,27 @@ #include "include/qemu-common.h" #include "chardev/char.h" #include "qemu/buffer.h" +#include "qemu/option.h" #include "qemu/units.h" +#include "hw/qdev-core.h" +#include "ui/console.h" +#include "ui/input.h" #include "trace.h" =20 #include "qapi/qapi-types-char.h" +#include "qapi/qapi-types-ui.h" =20 #include "spice/vd_agent.h" =20 #define VDAGENT_BUFFER_LIMIT (1 * MiB) +#define VDAGENT_MOUSE_DEFAULT true =20 struct VDAgentChardev { Chardev parent; =20 + /* config */ + bool mouse; + /* guest vdagent */ uint32_t caps; VDIChunkHeader chunk; @@ -24,6 +33,14 @@ struct VDAgentChardev { uint8_t *xbuf; uint32_t xoff, xsize; Buffer outbuf; + + /* mouse */ + DeviceState mouse_dev; + uint32_t mouse_x; + uint32_t mouse_y; + uint32_t mouse_btn; + uint32_t mouse_display; + QemuInputHandlerState *mouse_hs; }; typedef struct VDAgentChardev VDAgentChardev; =20 @@ -137,13 +154,113 @@ static void vdagent_send_caps(VDAgentChardev *vd) g_autofree VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + sizeof(VDAgentAnnounceCapab= ilities) + sizeof(uint32_t)); + VDAgentAnnounceCapabilities *caps =3D (void *)msg->data; =20 msg->type =3D VD_AGENT_ANNOUNCE_CAPABILITIES; msg->size =3D sizeof(VDAgentAnnounceCapabilities) + sizeof(uint32_t); + if (vd->mouse) { + caps->caps[0] |=3D (1 << VD_AGENT_CAP_MOUSE_STATE); + } =20 vdagent_send_msg(vd, msg); } =20 +/* ------------------------------------------------------------------ */ +/* mouse events */ + +static bool have_mouse(VDAgentChardev *vd) +{ + return vd->mouse && + (vd->caps & (1 << VD_AGENT_CAP_MOUSE_STATE)); +} + +static void vdagent_send_mouse(VDAgentChardev *vd) +{ + g_autofree VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(VDAgentMouseState)); + VDAgentMouseState *mouse =3D (void *)msg->data; + + msg->type =3D VD_AGENT_MOUSE_STATE; + msg->size =3D sizeof(VDAgentMouseState); + + mouse->x =3D vd->mouse_x; + mouse->y =3D vd->mouse_y; + mouse->buttons =3D vd->mouse_btn; + mouse->display_id =3D vd->mouse_display; + + vdagent_send_msg(vd, msg); +} + +static void vdagent_pointer_event(DeviceState *dev, QemuConsole *src, + InputEvent *evt) +{ + static const int bmap[INPUT_BUTTON__MAX] =3D { + [INPUT_BUTTON_LEFT] =3D VD_AGENT_LBUTTON_MASK, + [INPUT_BUTTON_RIGHT] =3D VD_AGENT_RBUTTON_MASK, + [INPUT_BUTTON_MIDDLE] =3D VD_AGENT_MBUTTON_MASK, + [INPUT_BUTTON_WHEEL_UP] =3D VD_AGENT_UBUTTON_MASK, + [INPUT_BUTTON_WHEEL_DOWN] =3D VD_AGENT_DBUTTON_MASK, +#ifdef VD_AGENT_EBUTTON_MASK + [INPUT_BUTTON_SIDE] =3D VD_AGENT_SBUTTON_MASK, + [INPUT_BUTTON_EXTRA] =3D VD_AGENT_EBUTTON_MASK, +#endif + }; + + VDAgentChardev *vd =3D container_of(dev, struct VDAgentChardev, mouse_= dev); + InputMoveEvent *move; + InputBtnEvent *btn; + uint32_t xres, yres; + + switch (evt->type) { + case INPUT_EVENT_KIND_ABS: + move =3D evt->u.abs.data; + xres =3D qemu_console_get_width(src, 1024); + yres =3D qemu_console_get_height(src, 768); + if (move->axis =3D=3D INPUT_AXIS_X) { + vd->mouse_x =3D qemu_input_scale_axis(move->value, + INPUT_EVENT_ABS_MIN, + INPUT_EVENT_ABS_MAX, + 0, xres); + } else if (move->axis =3D=3D INPUT_AXIS_Y) { + vd->mouse_y =3D qemu_input_scale_axis(move->value, + INPUT_EVENT_ABS_MIN, + INPUT_EVENT_ABS_MAX, + 0, yres); + } + vd->mouse_display =3D qemu_console_get_index(src); + break; + + case INPUT_EVENT_KIND_BTN: + btn =3D evt->u.btn.data; + if (btn->down) { + vd->mouse_btn |=3D bmap[btn->button]; + } else { + vd->mouse_btn &=3D ~bmap[btn->button]; + } + break; + + default: + /* keep gcc happy */ + break; + } +} + +static void vdagent_pointer_sync(DeviceState *dev) +{ + VDAgentChardev *vd =3D container_of(dev, struct VDAgentChardev, mouse_= dev); + + if (vd->caps & (1 << VD_AGENT_CAP_MOUSE_STATE)) { + vdagent_send_mouse(vd); + } +} + +static QemuInputHandler vdagent_mouse_handler =3D { + .name =3D "vdagent mouse", + .mask =3D INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_ABS, + .event =3D vdagent_pointer_event, + .sync =3D vdagent_pointer_sync, +}; + /* ------------------------------------------------------------------ */ /* chardev backend */ =20 @@ -152,6 +269,9 @@ static void vdagent_chr_open(Chardev *chr, bool *be_opened, Error **errp) { + VDAgentChardev *vd =3D QEMU_VDAGENT_CHARDEV(chr); + ChardevQemuVDAgent *cfg =3D backend->u.qemu_vdagent.data; + #if defined(HOST_WORDS_BIGENDIAN) /* * TODO: vdagent protocol is defined to be LE, @@ -161,6 +281,16 @@ static void vdagent_chr_open(Chardev *chr, return; #endif =20 + vd->mouse =3D VDAGENT_MOUSE_DEFAULT; + if (cfg->has_mouse) { + vd->mouse =3D cfg->mouse; + } + + if (vd->mouse) { + vd->mouse_hs =3D qemu_input_handler_register(&vd->mouse_dev, + &vdagent_mouse_handler); + } + *be_opened =3D true; } =20 @@ -184,6 +314,9 @@ static void vdagent_chr_recv_caps(VDAgentChardev *vd, V= DAgentMessage *msg) if (caps->request) { vdagent_send_caps(vd); } + if (have_mouse(vd) && vd->mouse_hs) { + qemu_input_handler_activate(vd->mouse_hs); + } } =20 static void vdagent_chr_recv_msg(VDAgentChardev *vd, VDAgentMessage *msg) @@ -312,18 +445,34 @@ static void vdagent_chr_set_fe_open(struct Chardev *c= hr, int fe_open) /* reset state */ vdagent_reset_bufs(vd); vd->caps =3D 0; + if (vd->mouse_hs) { + qemu_input_handler_deactivate(vd->mouse_hs); + } return; } =20 trace_vdagent_open(); } =20 +static void vdagent_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + ChardevQemuVDAgent *cfg; + + backend->type =3D CHARDEV_BACKEND_KIND_QEMU_VDAGENT; + cfg =3D backend->u.qemu_vdagent.data =3D g_new0(ChardevQemuVDAgent, 1); + qemu_chr_parse_common(opts, qapi_ChardevQemuVDAgent_base(cfg)); + cfg->has_mouse =3D true; + cfg->mouse =3D qemu_opt_get_bool(opts, "mouse", VDAGENT_MOUSE_DEFAULT); +} + /* ------------------------------------------------------------------ */ =20 static void vdagent_chr_class_init(ObjectClass *oc, void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 + cc->parse =3D vdagent_chr_parse; cc->open =3D vdagent_chr_open; cc->chr_write =3D vdagent_chr_write; cc->chr_set_fe_open =3D vdagent_chr_set_fe_open; diff --git a/qapi/char.json b/qapi/char.json index 990801e642bb..5711e8c60aeb 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -395,11 +395,13 @@ # # Configuration info for qemu vdagent implementation. # +# @mouse: enable/disable mouse, default is enabled. +# # Since: 6.1 # ## { 'struct': 'ChardevQemuVDAgent', - 'data': { }, + 'data': { '*mouse': 'bool' }, 'base': 'ChardevCommon', 'if': 'defined(CONFIG_SPICE_PROTOCOL)' } =20 --=20 2.31.1