From nobody Thu May 9 08:22:29 2024 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=1613740932; cv=none; d=zohomail.com; s=zohoarc; b=LkL2boH4v+nO9u36hdqJ5Fsm8hpZ7I9Rjach5zkOhx5pzI0OtBfeKkb6W+ISmaVHA5kIPtAbu2tgmu4jkkTRVvXtNWV9NkpeFEhQsq4p2NVAu8h6DxgK+PcGuxi1OardZoVyPfeac0de7Vl2c7Yb04VPIA+gThAlYmmx4IN+/J0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613740932; 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=rQw1JyPioEG61sPokozmCTDZpK/dfl0sk44WZbQbTig=; b=Uxz6aGnP/mDkHWWuzKgc418t/jniopea8BQG9xXvSywAGkMTQAO4dJyPCp/lEnwGzyN1bmCwhtAKdq8nFsMEFilmmyBOijL2UPozrF/j1gIhgjD3lBJehVGipKJcyrgvv5D7rmMW84gt0C6L82eX2N8R2wI25MKhm+RyJA5CrFg= 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 1613740932242448.410426999498; Fri, 19 Feb 2021 05:22:12 -0800 (PST) Received: from localhost ([::1]:44712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5jX-0001RG-7O for importer@patchew.org; Fri, 19 Feb 2021 08:22:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5bg-0004A8-Tz for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5bd-0006OZ-S7 for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:04 -0500 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-484-5aJTmWGKMSuU66Cj_0JZLA-1; Fri, 19 Feb 2021 08:13:59 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65855801982 for ; Fri, 19 Feb 2021 13:13:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FD1910016F9; Fri, 19 Feb 2021 13:13:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F0A0E18000B6; Fri, 19 Feb 2021 14:13:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740441; 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=rQw1JyPioEG61sPokozmCTDZpK/dfl0sk44WZbQbTig=; b=ArOl0qBMnaGZn6myDCHNe2GFW2Cybm3ubxLBl4O63b5Nm5+yG3rhIAGt8n+b3ubUTdatw+ WGO/pC1CMd1mwPzfcYYDjm+C55LY1gNdTpelItNAsNeSIbH7mZD5BloAX47kq4BrIrjOJw XLUwQ6bMa+en7jojpp/PF+PVOMgGN0k= X-MC-Unique: 5aJTmWGKMSuU66Cj_0JZLA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/7] ui: add clipboard infrastructure Date: Fri, 19 Feb 2021 14:13:43 +0100 Message-Id: <20210219131349.3993192-2-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add some infrastructure to manage the clipboard in qemu. TODO: Add API docs. Signed-off-by: Gerd Hoffmann --- include/ui/clipboard.h | 68 +++++++++++++++++++++++++++++++ ui/clipboard.c | 92 ++++++++++++++++++++++++++++++++++++++++++ ui/meson.build | 1 + 3 files changed, 161 insertions(+) create mode 100644 include/ui/clipboard.h create mode 100644 ui/clipboard.c diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h new file mode 100644 index 000000000000..00ff559425ee --- /dev/null +++ b/include/ui/clipboard.h @@ -0,0 +1,68 @@ +#ifndef QEMU_CLIPBOARD_H +#define QEMU_CLIPBOARD_H + +#include "qemu/notify.h" + +typedef enum QemuClipboardType QemuClipboardType; +typedef enum QemuClipboardSelection QemuClipboardSelection; +typedef struct QemuClipboardPeer QemuClipboardPeer; +typedef struct QemuClipboardInfo QemuClipboardInfo; + +enum QemuClipboardType { + QEMU_CLIPBOARD_TYPE_TEXT, /* text/plain; charset=3Dutf-8 */ + QEMU_CLIPBOARD_TYPE__COUNT, +}; + +/* same as VD_AGENT_CLIPBOARD_SELECTION_* */ +enum QemuClipboardSelection { + QEMU_CLIPBOARD_SELECTION_CLIPBOARD, + QEMU_CLIPBOARD_SELECTION_PRIMARY, + QEMU_CLIPBOARD_SELECTION_SECONDARY, + QEMU_CLIPBOARD_SELECTION__COUNT, +}; + +struct QemuClipboardPeer { + const char *name; + Notifier update; + void (*request)(QemuClipboardInfo *info, + QemuClipboardType type); +}; + +struct QemuClipboardInfo { + uint32_t refcount; + QemuClipboardPeer *owner; + QemuClipboardSelection selection; + struct { + bool available; + bool requested; + size_t size; + void *data; + } types[QEMU_CLIPBOARD_TYPE__COUNT]; +}; + +struct QemuClipboardData { + uint32_t refcount; + QemuClipboardInfo *info; + QemuClipboardType type; +}; + +void qemu_clipboard_peer_register(QemuClipboardPeer *peer); +void qemu_clipboard_peer_unregister(QemuClipboardPeer *peer); + +QemuClipboardInfo *qemu_clipboard_info_new(QemuClipboardPeer *owner, + QemuClipboardSelection selectio= n); +QemuClipboardInfo *qemu_clipboard_info_get(QemuClipboardInfo *info); +void qemu_clipboard_info_put(QemuClipboardInfo *info); + +void qemu_clipboard_update(QemuClipboardInfo *info); +void qemu_clipboard_request(QemuClipboardInfo *info, + QemuClipboardType type); + +void qemu_clipboard_set_data(QemuClipboardPeer *peer, + QemuClipboardInfo *info, + QemuClipboardType type, + uint32_t size, + void *data, + bool update); + +#endif /* QEMU_CLIPBOARD_H */ diff --git a/ui/clipboard.c b/ui/clipboard.c new file mode 100644 index 000000000000..556531c578a1 --- /dev/null +++ b/ui/clipboard.c @@ -0,0 +1,92 @@ +#include "qemu/osdep.h" +#include "ui/clipboard.h" + +static NotifierList clipboard_notifiers =3D + NOTIFIER_LIST_INITIALIZER(clipboard_notifiers); + +void qemu_clipboard_peer_register(QemuClipboardPeer *peer) +{ + notifier_list_add(&clipboard_notifiers, &peer->update); +} + +void qemu_clipboard_peer_unregister(QemuClipboardPeer *peer) +{ + notifier_remove(&peer->update); +} + +void qemu_clipboard_update(QemuClipboardInfo *info) +{ + notifier_list_notify(&clipboard_notifiers, info); +} + +QemuClipboardInfo *qemu_clipboard_info_new(QemuClipboardPeer *owner, + QemuClipboardSelection selectio= n) +{ + QemuClipboardInfo *info =3D g_new0(QemuClipboardInfo, 1); + + info->owner =3D owner; + info->selection =3D selection; + info->refcount =3D 1; + + return info; +} + +QemuClipboardInfo *qemu_clipboard_info_get(QemuClipboardInfo *info) +{ + info->refcount++; + return info; +} + +void qemu_clipboard_info_put(QemuClipboardInfo *info) +{ + uint32_t type; + + if (!info) { + return; + } + + info->refcount--; + if (info->refcount > 0) { + return; + } + + for (type =3D 0; type < QEMU_CLIPBOARD_TYPE__COUNT; type++) { + g_free(info->types[type].data); + } + g_free(info); +} + +void qemu_clipboard_request(QemuClipboardInfo *info, + QemuClipboardType type) +{ + if (info->types[type].data || + info->types[type].requested || + !info->types[type].available || + !info->owner) + return; + + info->types[type].requested =3D true; + info->owner->request(info, type); +} + +void qemu_clipboard_set_data(QemuClipboardPeer *peer, + QemuClipboardInfo *info, + QemuClipboardType type, + uint32_t size, + void *data, + bool update) +{ + if (!info || + info->owner !=3D peer) { + return; + } + + g_free(info->types[type].data); + info->types[type].data =3D g_memdup(data, size); + info->types[type].size =3D size; + info->types[type].available =3D true; + + if (update) { + qemu_clipboard_update(info); + } +} diff --git a/ui/meson.build b/ui/meson.build index 156b600a9998..fbb9a512042a 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -2,6 +2,7 @@ softmmu_ss.add(pixman) specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: pixman) # for the inc= lude path =20 softmmu_ss.add(files( + 'clipboard.c', 'console.c', 'cursor.c', 'input-keymap.c', --=20 2.29.2 From nobody Thu May 9 08:22:29 2024 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=1613740659; cv=none; d=zohomail.com; s=zohoarc; b=nj++3vkm1s4OsqAf7wESTBttPEf8R33KNGjfg+1gvOrlskmho6x9oeQ1dkWGXfLJbNJTYLyJi5MNiOk+W9OJBk/m1WcHbQLJ4+N/5Vfeurp2wwZPZ5tV9SD4oGC/ZCWq4MCKmyFGZmk3E+YKnmyrOjY5m7piilM7kJjpF4FflPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613740659; 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=6SZCXEhw4xveBj3Dl+GriVOJ2nW/bx+vH62KneQF4F4=; b=XEoiRRjDedZjEfZ/08/R8KrcshLoU6kmkgN0XxcLYZeZNkMIQAo0ODka8L6ZR/7M/MQJ8gThRwxkH1AifR+7x6Ot060qf/73plwVBP2z+550JRppDI0GosMQEq415WYzIW8u75Vtsi1bjmBXCL1zUWJi4YX0CIMkZz/kHKD33sY= 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 161374065865891.94184363137379; Fri, 19 Feb 2021 05:17:38 -0800 (PST) Received: from localhost ([::1]:36090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5f7-00063E-Ck for importer@patchew.org; Fri, 19 Feb 2021 08:17:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5bg-00048R-1K for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5bd-0006OV-IY for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:03 -0500 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-577-2RoKyucQPgu4dMH8Wj62CA-1; Fri, 19 Feb 2021 08:13:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD4196D506 for ; Fri, 19 Feb 2021 13:13:57 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CE335C1BB; Fri, 19 Feb 2021 13:13:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0E28D1800396; Fri, 19 Feb 2021 14:13:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740440; 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=6SZCXEhw4xveBj3Dl+GriVOJ2nW/bx+vH62KneQF4F4=; b=Q8G+0IxzCrz0cjxH+MqgPFuIkhGnrexML0H4F9YuXbO2tDvBiTASu3MRzVcnQ1Hlp3bvYf 7NeGMonUwS/oKDTIVXPfpvW+G7CWCnROPCh2ilWPDuKw5/9XDVynPth9hftusK6hCxofp4 hFkMmIpUpsLdymI/XQXXYHZDM34ZhSA= X-MC-Unique: 2RoKyucQPgu4dMH8Wj62CA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/7] ui/vdagent: core infrastructure Date: Fri, 19 Feb 2021 14:13:44 +0100 Message-Id: <20210219131349.3993192-3-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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-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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The vdagent protocol allows the guest agent (spice-vdagent) and the spice client exchange messages to implement features which require guest cooperation, for example clipboard support. This is a qemu implementation of the spice client side. This allows the spice guest agent talk to qemu directly when not using the spice protocol. usage: qemu \ -chardev vdagent,id=3Dvdagent \ -device virtserialport,chardev=3Dvdagent,name=3Dcom.redhat.spice.0 This patch adds just the protocol basics: initial handshake and capability negotiation. Signed-off-by: Gerd Hoffmann --- ui/vdagent.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 13 +++ ui/meson.build | 1 + ui/trace-events | 7 ++ 4 files changed, 261 insertions(+) create mode 100644 ui/vdagent.c diff --git a/ui/vdagent.c b/ui/vdagent.c new file mode 100644 index 000000000000..9ef4ed3f4dd8 --- /dev/null +++ b/ui/vdagent.c @@ -0,0 +1,240 @@ +#include "qemu/osdep.h" +#include "include/qemu-common.h" +#include "chardev/char.h" +#include "trace.h" + +#include "qapi/qapi-types-char.h" + +#include "spice/vd_agent.h" + +#define MSGSIZE_MAX (sizeof(VDIChunkHeader) + \ + sizeof(VDAgentMessage) + \ + VD_AGENT_MAX_DATA_SIZE) + +struct VDAgentChardev { + Chardev parent; + + /* guest vdagent */ + uint32_t caps; + uint8_t msgbuf[MSGSIZE_MAX]; + uint32_t msgsize; +}; +typedef struct VDAgentChardev VDAgentChardev; + +#define TYPE_CHARDEV_VDAGENT "chardev-vdagent" + +DECLARE_INSTANCE_CHECKER(VDAgentChardev, VDAGENT_CHARDEV, + TYPE_CHARDEV_VDAGENT); + +/* ------------------------------------------------------------------ */ +/* names, for debug logging */ + +static const char *cap_name[] =3D { + [VD_AGENT_CAP_MOUSE_STATE] =3D "mouse-state", + [VD_AGENT_CAP_MONITORS_CONFIG] =3D "monitors-config", + [VD_AGENT_CAP_REPLY] =3D "reply", + [VD_AGENT_CAP_CLIPBOARD] =3D "clipboard", + [VD_AGENT_CAP_DISPLAY_CONFIG] =3D "display-config", + [VD_AGENT_CAP_CLIPBOARD_BY_DEMAND] =3D "clipboard-by-demand= ", + [VD_AGENT_CAP_CLIPBOARD_SELECTION] =3D "clipboard-selection= ", + [VD_AGENT_CAP_SPARSE_MONITORS_CONFIG] =3D "sparse-monitors-con= fig", + [VD_AGENT_CAP_GUEST_LINEEND_LF] =3D "guest-lineend-lf", + [VD_AGENT_CAP_GUEST_LINEEND_CRLF] =3D "guest-lineend-crlf", + [VD_AGENT_CAP_MAX_CLIPBOARD] =3D "max-clipboard", + [VD_AGENT_CAP_AUDIO_VOLUME_SYNC] =3D "audio-volume-sync", + [VD_AGENT_CAP_MONITORS_CONFIG_POSITION] =3D "monitors-config-pos= ition", + [VD_AGENT_CAP_FILE_XFER_DISABLED] =3D "file-xfer-disabled", + [VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS] =3D "file-xfer-detailed-= errors", +#if 0 + [VD_AGENT_CAP_GRAPHICS_DEVICE_INFO] =3D "graphics-device-inf= o", + [VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB] =3D "clipboard-no-releas= e-on-regrab", + [VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL] =3D "clipboard-grab-seri= al", +#endif +}; + +static const char *msg_name[] =3D { + [VD_AGENT_MOUSE_STATE] =3D "mouse-state", + [VD_AGENT_MONITORS_CONFIG] =3D "monitors-config", + [VD_AGENT_REPLY] =3D "reply", + [VD_AGENT_CLIPBOARD] =3D "clipboard", + [VD_AGENT_DISPLAY_CONFIG] =3D "display-config", + [VD_AGENT_ANNOUNCE_CAPABILITIES] =3D "announce-capabilities", + [VD_AGENT_CLIPBOARD_GRAB] =3D "clipboard-grab", + [VD_AGENT_CLIPBOARD_REQUEST] =3D "clipboard-request", + [VD_AGENT_CLIPBOARD_RELEASE] =3D "clipboard-release", + [VD_AGENT_FILE_XFER_START] =3D "file-xfer-start", + [VD_AGENT_FILE_XFER_STATUS] =3D "file-xfer-status", + [VD_AGENT_FILE_XFER_DATA] =3D "file-xfer-data", + [VD_AGENT_CLIENT_DISCONNECTED] =3D "client-disconnected", + [VD_AGENT_MAX_CLIPBOARD] =3D "max-clipboard", + [VD_AGENT_AUDIO_VOLUME_SYNC] =3D "audio-volume-sync", +#if 0 + [VD_AGENT_GRAPHICS_DEVICE_INFO] =3D "graphics-device-info", +#endif +}; + +#define GET_NAME(_m, _v) \ + (((_v) < ARRAY_SIZE(_m) && (_m[_v])) ? (_m[_v]) : "???") + +/* ------------------------------------------------------------------ */ +/* send messages */ + +static void vdagent_send_buf(VDAgentChardev *vd, void *ptr, uint32_t msgsi= ze) +{ + uint8_t *msgbuf =3D ptr; + uint32_t len, pos =3D 0; + + while (pos < msgsize) { + len =3D qemu_chr_be_can_write(CHARDEV(vd)); + if (len > msgsize - pos) { + len =3D msgsize - pos; + } + qemu_chr_be_write(CHARDEV(vd), msgbuf + pos, len); + pos +=3D len; + } +} + +static void vdagent_send_msg(VDAgentChardev *vd, VDAgentMessage *msg) +{ + uint8_t *msgbuf =3D (void *)msg; + uint32_t msgsize =3D sizeof(VDAgentMessage) + msg->size; + VDIChunkHeader chunk; + + trace_vdagent_send(GET_NAME(msg_name, msg->type)); + + chunk.port =3D VDP_CLIENT_PORT; + chunk.size =3D msgsize; + vdagent_send_buf(vd, &chunk, sizeof(chunk)); + + msg->protocol =3D VD_AGENT_PROTOCOL; + vdagent_send_buf(vd, msgbuf, msgsize); + g_free(msg); +} + +static void vdagent_send_caps(VDAgentChardev *vd) +{ + VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(VDAgentAnnounceCapabilities) + + sizeof(uint32_t)); + + msg->type =3D VD_AGENT_ANNOUNCE_CAPABILITIES; + msg->size =3D sizeof(VDAgentAnnounceCapabilities) + sizeof(uint32_t); + + vdagent_send_msg(vd, msg); +} + +/* ------------------------------------------------------------------ */ +/* chardev backend */ + +static void vdagent_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) +{ + *be_opened =3D true; +} + +static void vdagent_chr_recv_caps(VDAgentChardev *vd, VDAgentMessage *msg) +{ + VDAgentAnnounceCapabilities *caps =3D (void *)msg->data; + int i; + + for (i =3D 0; i < ARRAY_SIZE(cap_name); i++) { + if (caps->caps[0] & (1 << i)) { + trace_vdagent_peer_cap(GET_NAME(cap_name, i)); + } + } + + vd->caps =3D caps->caps[0]; + if (caps->request) { + vdagent_send_caps(vd); + } +} + +static uint32_t vdagent_chr_recv(VDAgentChardev *vd) +{ + VDIChunkHeader *chunk =3D (void *)vd->msgbuf; + VDAgentMessage *msg =3D (void *)vd->msgbuf + sizeof(VDIChunkHeader); + + if (sizeof(VDIChunkHeader) + chunk->size > vd->msgsize) { + return 0; + } + + trace_vdagent_recv(GET_NAME(msg_name, msg->type)); + + switch (msg->type) { + case VD_AGENT_ANNOUNCE_CAPABILITIES: + vdagent_chr_recv_caps(vd, msg); + break; + default: + break; + } + + return sizeof(VDIChunkHeader) + chunk->size; +} + +static int vdagent_chr_write(Chardev *chr, const uint8_t *buf, int len) +{ + VDAgentChardev *vd =3D VDAGENT_CHARDEV(chr); + uint32_t copy, move; + + copy =3D MSGSIZE_MAX - vd->msgsize; + if (copy > len) { + copy =3D len; + } + + memcpy(vd->msgbuf + vd->msgsize, buf, copy); + vd->msgsize +=3D copy; + + while (vd->msgsize > sizeof(VDIChunkHeader)) { + move =3D vdagent_chr_recv(vd); + if (move =3D=3D 0) { + break; + } + + memmove(vd->msgbuf, vd->msgbuf + move, vd->msgsize - move); + vd->msgsize -=3D move; + } + + return copy; +} + +static void vdagent_chr_set_fe_open(struct Chardev *chr, int fe_open) +{ + VDAgentChardev *vd =3D VDAGENT_CHARDEV(chr); + + if (!fe_open) { + trace_vdagent_close(); + /* reset state */ + vd->msgsize =3D 0; + vd->caps =3D 0; + return; + } + + trace_vdagent_open(); +} + +/* ------------------------------------------------------------------ */ + +static void vdagent_chr_class_init(ObjectClass *oc, void *data) +{ + ChardevClass *cc =3D CHARDEV_CLASS(oc); + + cc->open =3D vdagent_chr_open; + cc->chr_write =3D vdagent_chr_write; + cc->chr_set_fe_open =3D vdagent_chr_set_fe_open; +} + +static const TypeInfo vdagent_chr_type_info =3D { + .name =3D TYPE_CHARDEV_VDAGENT, + .parent =3D TYPE_CHARDEV, + .instance_size =3D sizeof(VDAgentChardev), + .class_init =3D vdagent_chr_class_init, +}; + +static void register_types(void) +{ + type_register_static(&vdagent_chr_type_info); +} + +type_init(register_types); diff --git a/qapi/char.json b/qapi/char.json index 58338ed62d43..62e161aea343 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -390,6 +390,17 @@ 'data': { '*size': 'int' }, 'base': 'ChardevCommon' } =20 +## +# @ChardevVDAgent: +# +# Configuration info for vdagent. +# +# Since: 6.0 +## +{ 'struct': 'ChardevVDAgent', + 'data': { }, + 'base': 'ChardevCommon' } + ## # @ChardevBackend: # @@ -417,6 +428,8 @@ 'if': 'defined(CONFIG_SPICE)' }, 'spiceport': { 'type': 'ChardevSpicePort', 'if': 'defined(CONFIG_SPICE)' }, + 'vdagent': { 'type': 'ChardevVDAgent', + 'if': 'defined(CONFIG_SPICE)' }, 'vc': 'ChardevVC', 'ringbuf': 'ChardevRingbuf', # next one is just for compatibility diff --git a/ui/meson.build b/ui/meson.build index fbb9a512042a..08447ac15c5e 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -14,6 +14,7 @@ softmmu_ss.add(files( 'qemu-pixman.c', )) softmmu_ss.add([spice_headers, files('spice-module.c')]) +softmmu_ss.add(when: spice_headers, if_true: files('vdagent.c')) =20 softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) softmmu_ss.add(when: cocoa, if_true: files('cocoa.m')) diff --git a/ui/trace-events b/ui/trace-events index 0ffcdb4408a6..1a5bd3861da5 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -108,3 +108,10 @@ xkeymap_extension(const char *name) "extension '%s'" xkeymap_vendor(const char *name) "vendor '%s'" xkeymap_keycodes(const char *name) "keycodes '%s'" xkeymap_keymap(const char *name) "keymap '%s'" + +# vdagent.c +vdagent_open(void) "" +vdagent_close(void) "" +vdagent_send(const char *name) "msg %s" +vdagent_recv(const char *name) "msg %s" +vdagent_peer_cap(const char *name) "cap %s" --=20 2.29.2 From nobody Thu May 9 08:22:29 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161374087235090.0408452854075; Fri, 19 Feb 2021 05:21:12 -0800 (PST) Received: from localhost ([::1]:43190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5iZ-0000gt-2e for importer@patchew.org; Fri, 19 Feb 2021 08:21:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5bj-0004GG-10 for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5bg-0006Pz-7w for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:06 -0500 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-566-NeDD_llmP26hYWOym1oReA-1; Fri, 19 Feb 2021 08:13:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53615835E26 for ; Fri, 19 Feb 2021 13:13:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7DE5019635; Fri, 19 Feb 2021 13:13:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1DDAF1800398; Fri, 19 Feb 2021 14:13:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740443; 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=3gmEgp6N/CwvR1ubOQZy71qCmmFT/7+klw+UsQlZAA4=; b=FeGEznzTaoVx+KM6/Mv+Hd994i4IAT0JtrOLzwalHpb2XLKS8hy35xyducUStSHzAJ9by8 PEAFKecREN3U9ZyUPdfPs4METa9URaW/nd1yKxgWgst1d0RiPLiEwbCftfhg8SbUGJJlO+ XgyG6bsK7XNRc2BakUZgVTgCityLGvQ= X-MC-Unique: NeDD_llmP26hYWOym1oReA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 3/7] ui/vdagent: add mouse support Date: Fri, 19 Feb 2021 14:13:45 +0100 Message-Id: <20210219131349.3993192-4-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- chardev/char.c | 3 ++ ui/vdagent.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 4 +- 3 files changed, 147 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index 288efebd1257..ea986dac1bff 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -924,6 +924,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 9ef4ed3f4dd8..b48b0129b9f2 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -1,9 +1,14 @@ #include "qemu/osdep.h" #include "include/qemu-common.h" #include "chardev/char.h" +#include "hw/qdev-core.h" +#include "qemu/option.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 @@ -11,13 +16,25 @@ sizeof(VDAgentMessage) + \ VD_AGENT_MAX_DATA_SIZE) =20 +#define VDAGENT_MOUSE_DEFAULT true + struct VDAgentChardev { Chardev parent; =20 + /* config */ + bool mouse; + /* guest vdagent */ uint32_t caps; uint8_t msgbuf[MSGSIZE_MAX]; uint32_t msgsize; + + /* mouse */ + DeviceState mouse_dev; + uint32_t mouse_x; + uint32_t mouse_y; + uint32_t mouse_btn; + QemuInputHandlerState *mouse_hs; }; typedef struct VDAgentChardev VDAgentChardev; =20 @@ -116,13 +133,105 @@ static void vdagent_send_caps(VDAgentChardev *vd) VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + sizeof(VDAgentAnnounceCapabilities) + 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 void vdagent_send_mouse(VDAgentChardev *vd) +{ + 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; + + 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, +#if 0 + [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); + } + 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 @@ -131,6 +240,19 @@ static void vdagent_chr_open(Chardev *chr, bool *be_opened, Error **errp) { + VDAgentChardev *vd =3D VDAGENT_CHARDEV(chr); + ChardevVDAgent *cfg =3D backend->u.vdagent.data; + + 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 @@ -149,6 +271,9 @@ static void vdagent_chr_recv_caps(VDAgentChardev *vd, V= DAgentMessage *msg) if (caps->request) { vdagent_send_caps(vd); } + if (vd->caps & (1 << VD_AGENT_CAP_MOUSE_STATE) && vd->mouse_hs) { + qemu_input_handler_activate(vd->mouse_hs); + } } =20 static uint32_t vdagent_chr_recv(VDAgentChardev *vd) @@ -208,18 +333,34 @@ static void vdagent_chr_set_fe_open(struct Chardev *c= hr, int fe_open) /* reset state */ vd->msgsize =3D 0; 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) +{ + ChardevVDAgent *cfg; + + backend->type =3D CHARDEV_BACKEND_KIND_VDAGENT; + cfg =3D backend->u.vdagent.data =3D g_new0(ChardevVDAgent, 1); + qemu_chr_parse_common(opts, qapi_ChardevVDAgent_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 62e161aea343..d8e96b772523 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -395,10 +395,12 @@ # # Configuration info for vdagent. # +# @mouse: enable/disable mouse, default is enabled. +# # Since: 6.0 ## { 'struct': 'ChardevVDAgent', - 'data': { }, + 'data': { '*mouse' : 'bool' }, 'base': 'ChardevCommon' } =20 ## --=20 2.29.2 From nobody Thu May 9 08:22:29 2024 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=1613740757; cv=none; d=zohomail.com; s=zohoarc; b=Qrh8jM3wVNCfU3JqQcaZLlT9jIVC/wgFSVPAPDJXmpzMpTscn1gxQ69B9TbKM12PuCVLccYLqwFR3xZ+z0u2CoAQueYxmfLE/OlcSGK/UamKGhrTVsPIbDEAKSlrDd0A+sozrZLuM6tfIoG+8Nj9qEIVrXDGgggTD4Jwlj8yQ38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613740757; 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=S5V2AzYDJJTrtO0KApGodEH+ssMsKVt/Ktra9CQWHUU=; b=bXsBC66AQnTI6eHOd1EiGlInLA2SkaoSkd/oB7UGSqxhzwu/UZ0uN6WscgaqUvM7GIq/YNmJ3oG//zWuId8VKCh6AOwR7p2KJDyLu7mzkEA6BdJRQNsVSL5f6a4jPZV9Upznks5PKXObVVt1Shkby3ETwsySfeA9xdMWGd5UxKM= 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 1613740757339693.2394133174658; Fri, 19 Feb 2021 05:19:17 -0800 (PST) Received: from localhost ([::1]:39288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5gi-0007Sx-08 for importer@patchew.org; Fri, 19 Feb 2021 08:19:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5bi-0004Ec-EG for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5be-0006Oc-5Q for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:06 -0500 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-526-YhKmKn2aOg6dDZBIMG-I9g-1; Fri, 19 Feb 2021 08:13:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CAC71005501 for ; Fri, 19 Feb 2021 13:13:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F03F19801; Fri, 19 Feb 2021 13:13:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2FFCA1800863; Fri, 19 Feb 2021 14:13:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740441; 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=S5V2AzYDJJTrtO0KApGodEH+ssMsKVt/Ktra9CQWHUU=; b=WauyY4c2EJuwyhkWXJU5TRqk/biKAcYnKgx3kkk3xbZ/0309ZSmLaQqXaaw2HJgbWth7nq OtJXqFZl38SCgHBQgV8XkVOAFkTJ3r3y4tZ6rsdwv8fweTRys1XFiIPcKfbbSe/s/KSZ74 plU7VUbk3FJvjS6NukkOS0MM43HZHag= X-MC-Unique: YhKmKn2aOg6dDZBIMG-I9g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 4/7] ui/vdagent: add clipboard support Date: Fri, 19 Feb 2021 14:13:46 +0100 Message-Id: <20210219131349.3993192-5-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch adds support for clipboard messages to the qemu vdagent implementation, which allows the guest exchange clipboard data with qemu. Clipboard support can be enabled/disabled using the new 'clipboard' parameter for the vdagent chardev. Default is off. Signed-off-by: Gerd Hoffmann --- chardev/char.c | 3 + ui/vdagent.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 4 +- ui/trace-events | 2 + 4 files changed, 251 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index ea986dac1bff..7f3ee2c11f9d 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -927,6 +927,9 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "mouse", .type =3D QEMU_OPT_BOOL, + },{ + .name =3D "clipboard", + .type =3D QEMU_OPT_BOOL, #ifdef CONFIG_LINUX },{ .name =3D "tight", diff --git a/ui/vdagent.c b/ui/vdagent.c index b48b0129b9f2..ee058688027e 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -3,6 +3,7 @@ #include "chardev/char.h" #include "hw/qdev-core.h" #include "qemu/option.h" +#include "ui/clipboard.h" #include "ui/console.h" #include "ui/input.h" #include "trace.h" @@ -17,12 +18,14 @@ VD_AGENT_MAX_DATA_SIZE) =20 #define VDAGENT_MOUSE_DEFAULT true +#define VDAGENT_CLIPBOARD_DEFAULT false =20 struct VDAgentChardev { Chardev parent; =20 /* config */ bool mouse; + bool clipboard; =20 /* guest vdagent */ uint32_t caps; @@ -35,6 +38,11 @@ struct VDAgentChardev { uint32_t mouse_y; uint32_t mouse_btn; QemuInputHandlerState *mouse_hs; + + /* clipboard */ + QemuClipboardPeer cbpeer; + QemuClipboardInfo *cbinfo[QEMU_CLIPBOARD_SELECTION__COUNT]; + uint32_t cbpending[QEMU_CLIPBOARD_SELECTION__COUNT]; }; typedef struct VDAgentChardev VDAgentChardev; =20 @@ -90,6 +98,24 @@ static const char *msg_name[] =3D { #endif }; =20 +static const char *sel_name[] =3D { + [VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD] =3D "clipboard", + [VD_AGENT_CLIPBOARD_SELECTION_PRIMARY] =3D "primary", + [VD_AGENT_CLIPBOARD_SELECTION_SECONDARY] =3D "secondary", +}; + +static const char *type_name[] =3D { + [VD_AGENT_CLIPBOARD_NONE] =3D "none", + [VD_AGENT_CLIPBOARD_UTF8_TEXT] =3D "text", + [VD_AGENT_CLIPBOARD_IMAGE_PNG] =3D "png", + [VD_AGENT_CLIPBOARD_IMAGE_BMP] =3D "bmp", + [VD_AGENT_CLIPBOARD_IMAGE_TIFF] =3D "tiff", + [VD_AGENT_CLIPBOARD_IMAGE_JPG] =3D "jpg", +#if 0 + [VD_AGENT_CLIPBOARD_FILE_LIST] =3D "files", +#endif +}; + #define GET_NAME(_m, _v) \ (((_v) < ARRAY_SIZE(_m) && (_m[_v])) ? (_m[_v]) : "???") =20 @@ -140,6 +166,10 @@ static void vdagent_send_caps(VDAgentChardev *vd) if (vd->mouse) { caps->caps[0] |=3D (1 << VD_AGENT_CAP_MOUSE_STATE); } + if (vd->clipboard) { + caps->caps[0] |=3D (1 << VD_AGENT_CAP_CLIPBOARD_BY_DEMAND); + caps->caps[0] |=3D (1 << VD_AGENT_CAP_CLIPBOARD_SELECTION); + } =20 vdagent_send_msg(vd, msg); } @@ -232,6 +262,193 @@ static QemuInputHandler vdagent_mouse_handler =3D { .sync =3D vdagent_pointer_sync, }; =20 +/* ------------------------------------------------------------------ */ +/* clipboard */ + +static uint32_t type_qemu_to_vdagent(enum QemuClipboardType type) +{ + switch (type) { + case QEMU_CLIPBOARD_TYPE_TEXT: + return VD_AGENT_CLIPBOARD_UTF8_TEXT; + default: + return VD_AGENT_CLIPBOARD_NONE; + } +} + +static void vdagent_send_clipboard_grab(VDAgentChardev *vd, + QemuClipboardInfo *info) +{ + VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(uint32_t) * (QEMU_CLIPBOARD_TYP= E__COUNT + 1)); + uint8_t *s =3D msg->data; + uint32_t *data =3D (uint32_t *)(msg->data + 4); + uint32_t q, v, type; + + for (q =3D 0, v =3D 0; q < QEMU_CLIPBOARD_TYPE__COUNT; q++) { + type =3D type_qemu_to_vdagent(q); + if (type !=3D VD_AGENT_CLIPBOARD_NONE && info->types[q].available)= { + data[v++] =3D type; + } + } + + *s =3D info->selection; + msg->type =3D VD_AGENT_CLIPBOARD_GRAB; + msg->size =3D sizeof(uint32_t) * (v + 1); + + vdagent_send_msg(vd, msg); +} + +static void vdagent_send_clipboard_data(VDAgentChardev *vd, + QemuClipboardInfo *info, + QemuClipboardType type) +{ + VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(uint32_t) * 2 + + info->types[type].size); + + uint8_t *s =3D msg->data; + uint32_t *t =3D (uint32_t *)(msg->data + 4); + uint8_t *d =3D msg->data + 8; + + *s =3D info->selection; + *t =3D type_qemu_to_vdagent(type); + memcpy(d, info->types[type].data, info->types[type].size); + + msg->type =3D VD_AGENT_CLIPBOARD; + msg->size =3D sizeof(uint32_t) * 2 + info->types[type].size; + + vdagent_send_msg(vd, msg); +} + +static void vdagent_clipboard_notify(Notifier *notifier, void *data) +{ + VDAgentChardev *vd =3D container_of(notifier, VDAgentChardev, cbpeer.u= pdate); + QemuClipboardInfo *info =3D data; + QemuClipboardSelection s =3D info->selection; + QemuClipboardType type; + bool self_update =3D info->owner =3D=3D &vd->cbpeer; + + if (info !=3D vd->cbinfo[s]) { + qemu_clipboard_info_put(vd->cbinfo[s]); + vd->cbinfo[s] =3D qemu_clipboard_info_get(info); + vd->cbpending[s] =3D 0; + if (!self_update) { + vdagent_send_clipboard_grab(vd, info); + } + return; + } + + if (self_update) { + return; + } + + for (type =3D 0; type < QEMU_CLIPBOARD_TYPE__COUNT; type++) { + if (vd->cbpending[s] & (1 << type)) { + vd->cbpending[s] &=3D ~(1 << type); + vdagent_send_clipboard_data(vd, info, type); + } + } +} + +static void vdagent_clipboard_request(QemuClipboardInfo *info, + QemuClipboardType qtype) +{ + VDAgentChardev *vd =3D container_of(info->owner, VDAgentChardev, cbpee= r); + VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(uint32_t) * 2); + uint32_t type =3D type_qemu_to_vdagent(qtype); + uint8_t *s =3D msg->data; + uint32_t *data =3D (uint32_t *)(msg->data + 4); + + if (type =3D=3D VD_AGENT_CLIPBOARD_NONE) { + return; + } + + *s =3D info->selection; + *data =3D type; + msg->type =3D VD_AGENT_CLIPBOARD_REQUEST; + msg->size =3D sizeof(uint32_t) * 2; + + vdagent_send_msg(vd, msg); +} + +static void vdagent_chr_recv_clipboard(VDAgentChardev *vd, VDAgentMessage = *msg) +{ + uint8_t s =3D VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD; + uint32_t size =3D msg->size; + void *data =3D msg->data; + QemuClipboardInfo *info; + QemuClipboardType type; + + if (vd->caps & (1 << VD_AGENT_CAP_CLIPBOARD_SELECTION)) { + s =3D *(uint8_t *)data; + data +=3D 4; + size -=3D 4; + } + + switch (msg->type) { + case VD_AGENT_CLIPBOARD_GRAB: + trace_vdagent_cb_grab_selection(GET_NAME(sel_name, s)); + info =3D qemu_clipboard_info_new(&vd->cbpeer, s); + while (size) { + trace_vdagent_cb_grab_type(GET_NAME(type_name, *(uint32_t *)da= ta)); + switch (*(uint32_t *)data) { + case VD_AGENT_CLIPBOARD_UTF8_TEXT: + info->types[QEMU_CLIPBOARD_TYPE_TEXT].available =3D true; + break; + default: + break; + } + data +=3D 4; + size -=3D 4; + } + qemu_clipboard_update(info); + qemu_clipboard_info_put(info); + break; + case VD_AGENT_CLIPBOARD_REQUEST: + switch (*(uint32_t *)data) { + case VD_AGENT_CLIPBOARD_UTF8_TEXT: + type =3D QEMU_CLIPBOARD_TYPE_TEXT; + break; + default: + return; + } + if (vd->cbinfo[s] && + vd->cbinfo[s]->types[type].available && + vd->cbinfo[s]->owner !=3D &vd->cbpeer) { + if (vd->cbinfo[s]->types[type].data) { + vdagent_send_clipboard_data(vd, vd->cbinfo[s], type); + } else { + vd->cbpending[s] |=3D (1 << type); + qemu_clipboard_request(vd->cbinfo[s], type); + } + } + break; + case VD_AGENT_CLIPBOARD: /* data */ + switch (*(uint32_t *)data) { + case VD_AGENT_CLIPBOARD_UTF8_TEXT: + type =3D QEMU_CLIPBOARD_TYPE_TEXT; + break; + default: + return; + } + data +=3D 4; + size -=3D 4; + qemu_clipboard_set_data(&vd->cbpeer, vd->cbinfo[s], type, + size, data, true); + break; + case VD_AGENT_CLIPBOARD_RELEASE: /* data */ + if (vd->cbinfo[s] && + vd->cbinfo[s]->owner =3D=3D &vd->cbpeer) { + /* set empty clipboard info */ + info =3D qemu_clipboard_info_new(NULL, s); + qemu_clipboard_update(info); + qemu_clipboard_info_put(info); + } + break; + } +} + /* ------------------------------------------------------------------ */ /* chardev backend */ =20 @@ -248,6 +465,11 @@ static void vdagent_chr_open(Chardev *chr, vd->mouse =3D cfg->mouse; } =20 + vd->clipboard =3D VDAGENT_CLIPBOARD_DEFAULT; + if (cfg->has_clipboard) { + vd->clipboard =3D cfg->clipboard; + } + if (vd->mouse) { vd->mouse_hs =3D qemu_input_handler_register(&vd->mouse_dev, &vdagent_mouse_handler); @@ -274,6 +496,15 @@ static void vdagent_chr_recv_caps(VDAgentChardev *vd, = VDAgentMessage *msg) if (vd->caps & (1 << VD_AGENT_CAP_MOUSE_STATE) && vd->mouse_hs) { qemu_input_handler_activate(vd->mouse_hs); } + if (vd->caps & (1 << VD_AGENT_CAP_CLIPBOARD_BY_DEMAND) && + vd->caps & (1 << VD_AGENT_CAP_CLIPBOARD_SELECTION) && + vd->clipboard && + vd->cbpeer.update.notify =3D=3D NULL) { + vd->cbpeer.name =3D "vdagent"; + vd->cbpeer.update.notify =3D vdagent_clipboard_notify; + vd->cbpeer.request =3D vdagent_clipboard_request; + qemu_clipboard_peer_register(&vd->cbpeer); + } } =20 static uint32_t vdagent_chr_recv(VDAgentChardev *vd) @@ -291,6 +522,12 @@ static uint32_t vdagent_chr_recv(VDAgentChardev *vd) case VD_AGENT_ANNOUNCE_CAPABILITIES: vdagent_chr_recv_caps(vd, msg); break; + case VD_AGENT_CLIPBOARD: + case VD_AGENT_CLIPBOARD_GRAB: + case VD_AGENT_CLIPBOARD_REQUEST: + case VD_AGENT_CLIPBOARD_RELEASE: + vdagent_chr_recv_clipboard(vd, msg); + break; default: break; } @@ -336,6 +573,10 @@ static void vdagent_chr_set_fe_open(struct Chardev *ch= r, int fe_open) if (vd->mouse_hs) { qemu_input_handler_deactivate(vd->mouse_hs); } + if (vd->cbpeer.update.notify) { + qemu_clipboard_peer_unregister(&vd->cbpeer); + memset(&vd->cbpeer, 0, sizeof(vd->cbpeer)); + } return; } =20 @@ -352,6 +593,8 @@ static void vdagent_chr_parse(QemuOpts *opts, ChardevBa= ckend *backend, qemu_chr_parse_common(opts, qapi_ChardevVDAgent_base(cfg)); cfg->has_mouse =3D true; cfg->mouse =3D qemu_opt_get_bool(opts, "mouse", VDAGENT_MOUSE_DEFAULT); + cfg->has_clipboard =3D true; + cfg->clipboard =3D qemu_opt_get_bool(opts, "clipboard", VDAGENT_CLIPBO= ARD_DEFAULT); } =20 /* ------------------------------------------------------------------ */ diff --git a/qapi/char.json b/qapi/char.json index d8e96b772523..059c9d634b06 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -396,11 +396,13 @@ # Configuration info for vdagent. # # @mouse: enable/disable mouse, default is enabled. +# @clipboard: enable/disable clipboard, default is disabled. # # Since: 6.0 ## { 'struct': 'ChardevVDAgent', - 'data': { '*mouse' : 'bool' }, + 'data': { '*mouse' : 'bool', + '*clipboard': 'bool' }, 'base': 'ChardevCommon' } =20 ## diff --git a/ui/trace-events b/ui/trace-events index 1a5bd3861da5..90191cc1d285 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -115,3 +115,5 @@ vdagent_close(void) "" vdagent_send(const char *name) "msg %s" vdagent_recv(const char *name) "msg %s" vdagent_peer_cap(const char *name) "cap %s" +vdagent_cb_grab_selection(const char *name) "selection %s" +vdagent_cb_grab_type(const char *name) "type %s" --=20 2.29.2 From nobody Thu May 9 08:22:29 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613741162253318.8081076342862; Fri, 19 Feb 2021 05:26:02 -0800 (PST) Received: from localhost ([::1]:52414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5nF-0004wH-3O for importer@patchew.org; Fri, 19 Feb 2021 08:26:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5bu-0004On-SV for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5bp-0006VF-3e for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:18 -0500 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-425-M5sfoLuYNkaIRKBoajwT-w-1; Fri, 19 Feb 2021 08:14:10 -0500 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 4D73A835E22 for ; Fri, 19 Feb 2021 13:14:09 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA6B25D734; Fri, 19 Feb 2021 13:13:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 42CE71800864; Fri, 19 Feb 2021 14:13:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740452; 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=vaiE+Xf/eoTkNQKfw4Lrn5Cuiui55zVMkTSPMXKhW+w=; b=MjmTR0AvBk7SbQJAeSxGlM8sDfHl8T69ZONEYVTuIoYe37lqaSdHMClSPjoQjecdIA5O2Q 9+oJ6eMt1oigZlU/2F0BRp6nupSLreVu6ryiSl0VyWqxcbmr5nZf713edgQ5azVDFISUkm vLQJD3vaCOU7I+EjrqDAtgmRy0TcKMg= X-MC-Unique: M5sfoLuYNkaIRKBoajwT-w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 5/7] ui/vnc: clipboard support Date: Fri, 19 Feb 2021 14:13:47 +0100 Message-Id: <20210219131349.3993192-6-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-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-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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch adds support for cut+paste to the qemu vnc server, which allows the vnc client exchange clipbaord data with qemu and other peers like the qemu vdagent implementation. Signed-off-by: Gerd Hoffmann --- ui/vnc.h | 24 ++++ ui/vnc-clipboard.c | 326 +++++++++++++++++++++++++++++++++++++++++++++ ui/vnc.c | 20 ++- ui/meson.build | 1 + 4 files changed, 365 insertions(+), 6 deletions(-) create mode 100644 ui/vnc-clipboard.c diff --git a/ui/vnc.h b/ui/vnc.h index 116463d5f099..f611223859ae 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -29,6 +29,7 @@ =20 #include "qemu/queue.h" #include "qemu/thread.h" +#include "ui/clipboard.h" #include "ui/console.h" #include "audio/audio.h" #include "qemu/bitmap.h" @@ -347,6 +348,10 @@ struct VncState =20 Notifier mouse_mode_notifier; =20 + QemuClipboardPeer cbpeer; + QemuClipboardInfo *cbinfo; + uint32_t cbpending; + QTAILQ_ENTRY(VncState) next; }; =20 @@ -416,6 +421,7 @@ enum { #define VNC_ENCODING_XVP 0XFFFFFECB /* -309 */ #define VNC_ENCODING_ALPHA_CURSOR 0XFFFFFEC6 /* -314 */ #define VNC_ENCODING_WMVi 0x574D5669 +#define VNC_ENCODING_CLIPBOARD_EXT 0xc0a1e5ce =20 /*************************************************************************= **** * @@ -457,6 +463,7 @@ enum VncFeatures { VNC_FEATURE_ZYWRLE, VNC_FEATURE_LED_STATE, VNC_FEATURE_XVP, + VNC_FEATURE_CLIPBOARD_EXT, }; =20 #define VNC_FEATURE_RESIZE_MASK (1 << VNC_FEATURE_RESIZE) @@ -473,6 +480,7 @@ enum VncFeatures { #define VNC_FEATURE_ZYWRLE_MASK (1 << VNC_FEATURE_ZYWRLE) #define VNC_FEATURE_LED_STATE_MASK (1 << VNC_FEATURE_LED_STATE) #define VNC_FEATURE_XVP_MASK (1 << VNC_FEATURE_XVP) +#define VNC_FEATURE_CLIPBOARD_EXT_MASK (1 << VNC_FEATURE_CLIPBOARD_= EXT) =20 =20 /* Client -> Server message IDs */ @@ -534,6 +542,17 @@ enum VncFeatures { #define VNC_XVP_ACTION_REBOOT 3 #define VNC_XVP_ACTION_RESET 4 =20 +/* extended clipboard flags */ +#define VNC_CLIPBOARD_TEXT (1 << 0) +#define VNC_CLIPBOARD_RTF (1 << 1) +#define VNC_CLIPBOARD_HTML (1 << 2) +#define VNC_CLIPBOARD_DIB (1 << 3) +#define VNC_CLIPBOARD_FILES (1 << 4) +#define VNC_CLIPBOARD_CAPS (1 << 24) +#define VNC_CLIPBOARD_REQUEST (1 << 25) +#define VNC_CLIPBOARD_PEEK (1 << 26) +#define VNC_CLIPBOARD_NOTIFY (1 << 27) +#define VNC_CLIPBOARD_PROVIDE (1 << 28) =20 /*************************************************************************= **** * @@ -617,4 +636,9 @@ int vnc_zrle_send_framebuffer_update(VncState *vs, int = x, int y, int w, int h); int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, = int h); void vnc_zrle_clear(VncState *vs); =20 +/* vnc-clipboard.c */ +void vnc_server_cut_text_caps(VncState *vs); +void vnc_client_cut_text(VncState *vs, size_t len, uint8_t *text); +void vnc_client_cut_text_ext(VncState *vs, int32_t len, uint32_t flags, ui= nt8_t *data); + #endif /* QEMU_VNC_H */ diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c new file mode 100644 index 000000000000..e729120ba360 --- /dev/null +++ b/ui/vnc-clipboard.c @@ -0,0 +1,326 @@ +/* + * QEMU VNC display driver -- clipboard support + * + * Copyright (C) 2021 Gerd Hoffmann + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "vnc.h" +#include "vnc-jobs.h" + +static uint8_t *inflate_buffer(uint8_t *in, uint32_t in_len, uint32_t *siz= e) +{ + z_stream stream =3D { + .next_in =3D in, + .avail_in =3D in_len, + .zalloc =3D Z_NULL, + .zfree =3D Z_NULL, + }; + uint32_t out_len =3D 8; + uint8_t *out =3D g_malloc(out_len); + int ret; + + stream.next_out =3D out + stream.total_out; + stream.avail_out =3D out_len - stream.total_out; + + ret =3D inflateInit(&stream); + if (ret !=3D Z_OK) { + goto err; + } + + while (stream.avail_in) { + ret =3D inflate(&stream, Z_FINISH); + switch (ret) { + case Z_OK: + case Z_STREAM_END: + break; + case Z_BUF_ERROR: + out_len <<=3D 1; + if (out_len > (1 << 20)) { + goto err_end; + } + out =3D g_realloc(out, out_len); + stream.next_out =3D out + stream.total_out; + stream.avail_out =3D out_len - stream.total_out; + break; + default: + goto err_end; + } + } + + *size =3D stream.total_out; + inflateEnd(&stream); + + return out; + +err_end: + inflateEnd(&stream); +err: + g_free(out); + return NULL; +} + +static uint8_t *deflate_buffer(uint8_t *in, uint32_t in_len, uint32_t *siz= e) +{ + z_stream stream =3D { + .next_in =3D in, + .avail_in =3D in_len, + .zalloc =3D Z_NULL, + .zfree =3D Z_NULL, + }; + uint32_t out_len =3D 8; + uint8_t *out =3D g_malloc(out_len); + int ret; + + stream.next_out =3D out + stream.total_out; + stream.avail_out =3D out_len - stream.total_out; + + ret =3D deflateInit(&stream, Z_DEFAULT_COMPRESSION); + if (ret !=3D Z_OK) { + goto err; + } + + while (ret !=3D Z_STREAM_END) { + ret =3D deflate(&stream, Z_FINISH); + switch (ret) { + case Z_OK: + case Z_STREAM_END: + break; + case Z_BUF_ERROR: + out_len <<=3D 1; + if (out_len > (1 << 20)) { + goto err_end; + } + out =3D g_realloc(out, out_len); + stream.next_out =3D out + stream.total_out; + stream.avail_out =3D out_len - stream.total_out; + break; + default: + goto err_end; + } + } + + *size =3D stream.total_out; + deflateEnd(&stream); + + return out; + +err_end: + deflateEnd(&stream); +err: + g_free(out); + return NULL; +} + +static void vnc_clipboard_send(VncState *vs, uint32_t count, uint32_t *dwo= rds) +{ + int i; + + vnc_lock_output(vs); + vnc_write_u8(vs, VNC_MSG_SERVER_CUT_TEXT); + vnc_write_u8(vs, 0); + vnc_write_u8(vs, 0); + vnc_write_u8(vs, 0); + vnc_write_s32(vs, -(count * sizeof(uint32_t))); /* -(message length) = */ + for (i =3D 0; i < count; i++) { + vnc_write_u32(vs, dwords[i]); + } + vnc_unlock_output(vs); + vnc_flush(vs); +} + +static void vnc_clipboard_provide(VncState *vs, + QemuClipboardInfo *info, + QemuClipboardType type) +{ + uint32_t flags =3D 0; + uint8_t *buf; + void *zbuf; + uint32_t zsize; + + switch (type) { + case QEMU_CLIPBOARD_TYPE_TEXT: + flags |=3D VNC_CLIPBOARD_TEXT; + break; + default: + return; + } + flags |=3D VNC_CLIPBOARD_PROVIDE; + + buf =3D g_malloc(info->types[type].size + 4); + buf[0] =3D (info->types[type].size >> 24) & 0xff; + buf[1] =3D (info->types[type].size >> 16) & 0xff; + buf[2] =3D (info->types[type].size >> 8) & 0xff; + buf[3] =3D (info->types[type].size >> 0) & 0xff; + memcpy(buf + 4, info->types[type].data, info->types[type].size); + zbuf =3D deflate_buffer(buf, info->types[type].size + 4, &zsize); + g_free(buf); + + if (!zbuf) { + return; + } + + vnc_lock_output(vs); + vnc_write_u8(vs, VNC_MSG_SERVER_CUT_TEXT); + vnc_write_u8(vs, 0); + vnc_write_u8(vs, 0); + vnc_write_u8(vs, 0); + vnc_write_s32(vs, -(sizeof(uint32_t) + zsize)); /* -(message length) = */ + vnc_write_u32(vs, flags); + vnc_write(vs, zbuf, zsize); + vnc_unlock_output(vs); + vnc_flush(vs); +} + +static void vnc_clipboard_notify(Notifier *notifier, void *data) +{ + VncState *vs =3D container_of(notifier, VncState, cbpeer.update); + QemuClipboardInfo *info =3D data; + QemuClipboardType type; + bool self_update =3D info->owner =3D=3D &vs->cbpeer; + uint32_t flags =3D 0; + + if (info !=3D vs->cbinfo) { + qemu_clipboard_info_put(vs->cbinfo); + vs->cbinfo =3D qemu_clipboard_info_get(info); + vs->cbpending =3D 0; + if (!self_update) { + if (info->types[QEMU_CLIPBOARD_TYPE_TEXT].available) { + flags |=3D VNC_CLIPBOARD_TEXT; + } + flags |=3D VNC_CLIPBOARD_NOTIFY; + vnc_clipboard_send(vs, 1, &flags); + } + return; + } + + if (self_update) { + return; + } + + for (type =3D 0; type < QEMU_CLIPBOARD_TYPE__COUNT; type++) { + if (vs->cbpending & (1 << type)) { + vs->cbpending &=3D ~(1 << type); + vnc_clipboard_provide(vs, info, type); + } + } +} + +static void vnc_clipboard_request(QemuClipboardInfo *info, + QemuClipboardType type) +{ + VncState *vs =3D container_of(info->owner, VncState, cbpeer); + uint32_t flags =3D 0; + + if (type =3D=3D QEMU_CLIPBOARD_TYPE_TEXT) { + flags |=3D VNC_CLIPBOARD_TEXT; + } + if (!flags) { + return; + } + flags |=3D VNC_CLIPBOARD_REQUEST; + + vnc_clipboard_send(vs, 1, &flags); +} + +void vnc_client_cut_text_ext(VncState *vs, int32_t len, uint32_t flags, ui= nt8_t *data) +{ + if (flags & VNC_CLIPBOARD_CAPS) { + /* need store caps somewhere ? */ + return; + } + + if (flags & VNC_CLIPBOARD_NOTIFY) { + QemuClipboardInfo *info =3D + qemu_clipboard_info_new(&vs->cbpeer, QEMU_CLIPBOARD_SELECTION_= CLIPBOARD); + if (flags & VNC_CLIPBOARD_TEXT) { + info->types[QEMU_CLIPBOARD_TYPE_TEXT].available =3D true; + } + qemu_clipboard_update(info); + qemu_clipboard_info_put(info); + return; + } + + if (flags & VNC_CLIPBOARD_PROVIDE && + vs->cbinfo && + vs->cbinfo->owner =3D=3D &vs->cbpeer) { + uint32_t size =3D 0; + uint8_t *buf =3D inflate_buffer(data, len - 4, &size); + if ((flags & VNC_CLIPBOARD_TEXT) && + buf && size >=3D 4) { + uint32_t tsize =3D read_u32(buf, 0); + uint8_t *tbuf =3D buf + 4; + if (tsize < size) { + qemu_clipboard_set_data(&vs->cbpeer, vs->cbinfo, + QEMU_CLIPBOARD_TYPE_TEXT, + tsize, tbuf, true); + } + } + g_free(buf); + } + + if (flags & VNC_CLIPBOARD_REQUEST && + vs->cbinfo && + vs->cbinfo->owner !=3D &vs->cbpeer) { + if ((flags & VNC_CLIPBOARD_TEXT) && + vs->cbinfo->types[QEMU_CLIPBOARD_TYPE_TEXT].available) { + if (vs->cbinfo->types[QEMU_CLIPBOARD_TYPE_TEXT].data) { + vnc_clipboard_provide(vs, vs->cbinfo, QEMU_CLIPBOARD_TYPE_= TEXT); + } else { + vs->cbpending |=3D (1 << QEMU_CLIPBOARD_TYPE_TEXT); + qemu_clipboard_request(vs->cbinfo, QEMU_CLIPBOARD_TYPE_TEX= T); + } + } + } +} + +void vnc_client_cut_text(VncState *vs, size_t len, uint8_t *text) +{ + QemuClipboardInfo *info =3D + qemu_clipboard_info_new(&vs->cbpeer, QEMU_CLIPBOARD_SELECTION_CLIP= BOARD); + + qemu_clipboard_set_data(&vs->cbpeer, info, QEMU_CLIPBOARD_TYPE_TEXT, + len, text, true); + qemu_clipboard_info_put(info); +} + +void vnc_server_cut_text_caps(VncState *vs) +{ + uint32_t caps[2]; + + if (!vnc_has_feature(vs, VNC_FEATURE_CLIPBOARD_EXT)) { + return; + } + + caps[0] =3D (VNC_CLIPBOARD_PROVIDE | + VNC_CLIPBOARD_NOTIFY | + VNC_CLIPBOARD_REQUEST | + VNC_CLIPBOARD_CAPS | + VNC_CLIPBOARD_TEXT); + caps[1] =3D 0; + vnc_clipboard_send(vs, 2, caps); + + vs->cbpeer.name =3D "vnc"; + vs->cbpeer.update.notify =3D vnc_clipboard_notify; + vs->cbpeer.request =3D vnc_clipboard_request; + qemu_clipboard_peer_register(&vs->cbpeer); +} diff --git a/ui/vnc.c b/ui/vnc.c index 16bb3be770b2..91ec51c7c67d 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -25,6 +25,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu-common.h" #include "vnc.h" #include "vnc-jobs.h" #include "trace.h" @@ -1309,6 +1310,9 @@ void vnc_disconnect_finish(VncState *vs) /* last client gone */ vnc_update_server_surface(vs->vd); } + if (vs->cbpeer.update.notify) { + qemu_clipboard_peer_unregister(&vs->cbpeer); + } =20 vnc_unlock_output(vs); =20 @@ -1734,10 +1738,6 @@ uint32_t read_u32(uint8_t *data, size_t offset) (data[offset + 2] << 8) | data[offset + 3]); } =20 -static void client_cut_text(VncState *vs, size_t len, uint8_t *text) -{ -} - static void check_pointer_type_change(Notifier *notifier, void *data) { VncState *vs =3D container_of(notifier, VncState, mouse_mode_notifier); @@ -2179,6 +2179,10 @@ static void set_encodings(VncState *vs, int32_t *enc= odings, size_t n_encodings) send_xvp_message(vs, VNC_XVP_CODE_INIT); } break; + case VNC_ENCODING_CLIPBOARD_EXT: + vs->features |=3D VNC_FEATURE_CLIPBOARD_EXT_MASK; + vnc_server_cut_text_caps(vs); + break; case VNC_ENCODING_COMPRESSLEVEL0 ... VNC_ENCODING_COMPRESSLEVEL0 += 9: vs->tight->compression =3D (enc & 0x0F); break; @@ -2395,7 +2399,7 @@ static int protocol_client_msg(VncState *vs, uint8_t = *data, size_t len) return 8; } if (len =3D=3D 8) { - uint32_t dlen =3D read_u32(data, 4); + uint32_t dlen =3D abs(read_s32(data, 4)); if (dlen > (1 << 20)) { error_report("vnc: client_cut_text msg payload has %u byte= s" " which exceeds our limit of 1MB.", dlen); @@ -2407,7 +2411,11 @@ static int protocol_client_msg(VncState *vs, uint8_t= *data, size_t len) } } =20 - client_cut_text(vs, read_u32(data, 4), data + 8); + if (read_s32(data, 4) < 0) { + vnc_client_cut_text_ext(vs, abs(read_s32(data, 4)), read_u32(d= ata, 8), data + 12); + break; + } + vnc_client_cut_text(vs, read_u32(data, 4), data + 8); break; case VNC_MSG_CLIENT_XVP: if (!(vs->features & VNC_FEATURE_XVP)) { diff --git a/ui/meson.build b/ui/meson.build index 08447ac15c5e..a98f89b48978 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -30,6 +30,7 @@ vnc_ss.add(files( 'vnc-auth-vencrypt.c', 'vnc-ws.c', 'vnc-jobs.c', + 'vnc-clipboard.c', )) vnc_ss.add(zlib, png, jpeg, gnutls) vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) --=20 2.29.2 From nobody Thu May 9 08:22:29 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613741217331780.5094888115505; Fri, 19 Feb 2021 05:26:57 -0800 (PST) Received: from localhost ([::1]:54166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5o7-0005iw-BR for importer@patchew.org; Fri, 19 Feb 2021 08:26:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5bh-0004DF-SU for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5bf-0006PE-MW for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:05 -0500 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-594-B1naEPIeM6ydov8xMq4G1w-1; Fri, 19 Feb 2021 08:14:01 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2072C835E26 for ; Fri, 19 Feb 2021 13:14:00 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC63519C71; Fri, 19 Feb 2021 13:13:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4FAD11800865; Fri, 19 Feb 2021 14:13:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740442; 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=/4EkCciPuXLrTeP+JpU5d0jaxiH6Xml6816sjzKcizE=; b=UXFjNJhbBfOBcWATyC3vfk8C970pq6Qf1u4nzpd4C8uk/R0TNkGC2d0GdT7PXFP1dDZ7Z3 uxx/MmT09KkcFGC3ZjiUX652sT9w8WT9egW+9Rv7rn/bEdOZVeuX5sRc5BVY/yZLWdmgdx q8GoyRNk2jA9Mg5k1FMqpSGsG0HUEhI= X-MC-Unique: B1naEPIeM6ydov8xMq4G1w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 6/7] ui/gtk: move struct GtkDisplayState to ui/gtk.h Date: Fri, 19 Feb 2021 14:13:48 +0100 Message-Id: <20210219131349.3993192-7-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Want place gtk clipboard code in a separate C file, which in turn requires GtkDisplayState being in a header file. So move it. No functional change. Signed-off-by: Gerd Hoffmann --- include/ui/gtk.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ ui/gtk.c | 55 ---------------------------------------------- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 3c1cd98db8b1..55319843758d 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -18,12 +18,15 @@ #include #endif =20 +#include "ui/console.h" #include "ui/kbd-state.h" #if defined(CONFIG_OPENGL) #include "ui/egl-helpers.h" #include "ui/egl-context.h" #endif =20 +#define MAX_VCS 10 + typedef struct GtkDisplayState GtkDisplayState; =20 typedef struct VirtualGfxConsole { @@ -83,6 +86,60 @@ typedef struct VirtualConsole { }; } VirtualConsole; =20 +struct GtkDisplayState { + GtkWidget *window; + + GtkWidget *menu_bar; + + GtkAccelGroup *accel_group; + + GtkWidget *machine_menu_item; + GtkWidget *machine_menu; + GtkWidget *pause_item; + GtkWidget *reset_item; + GtkWidget *powerdown_item; + GtkWidget *quit_item; + + GtkWidget *view_menu_item; + GtkWidget *view_menu; + GtkWidget *full_screen_item; + GtkWidget *copy_item; + GtkWidget *zoom_in_item; + GtkWidget *zoom_out_item; + GtkWidget *zoom_fixed_item; + GtkWidget *zoom_fit_item; + GtkWidget *grab_item; + GtkWidget *grab_on_hover_item; + + int nb_vcs; + VirtualConsole vc[MAX_VCS]; + + GtkWidget *show_tabs_item; + GtkWidget *untabify_item; + GtkWidget *show_menubar_item; + + GtkWidget *vbox; + GtkWidget *notebook; + int button_mask; + gboolean last_set; + int last_x; + int last_y; + int grab_x_root; + int grab_y_root; + VirtualConsole *kbd_owner; + VirtualConsole *ptr_owner; + + gboolean full_screen; + + GdkCursor *null_cursor; + Notifier mouse_mode_notifier; + gboolean free_scale; + + bool external_pause_update; + + DisplayOptions *opts; +}; + extern bool gtk_use_gl_area; =20 /* ui/gtk.c */ diff --git a/ui/gtk.c b/ui/gtk.c index 79dc2401203a..7b412dd4fe0b 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -60,7 +60,6 @@ #include "chardev/char.h" #include "qom/object.h" =20 -#define MAX_VCS 10 #define VC_WINDOW_X_MIN 320 #define VC_WINDOW_Y_MIN 240 #define VC_TERM_X_MIN 80 @@ -119,60 +118,6 @@ static const guint16 *keycode_map; static size_t keycode_maplen; =20 -struct GtkDisplayState { - GtkWidget *window; - - GtkWidget *menu_bar; - - GtkAccelGroup *accel_group; - - GtkWidget *machine_menu_item; - GtkWidget *machine_menu; - GtkWidget *pause_item; - GtkWidget *reset_item; - GtkWidget *powerdown_item; - GtkWidget *quit_item; - - GtkWidget *view_menu_item; - GtkWidget *view_menu; - GtkWidget *full_screen_item; - GtkWidget *copy_item; - GtkWidget *zoom_in_item; - GtkWidget *zoom_out_item; - GtkWidget *zoom_fixed_item; - GtkWidget *zoom_fit_item; - GtkWidget *grab_item; - GtkWidget *grab_on_hover_item; - - int nb_vcs; - VirtualConsole vc[MAX_VCS]; - - GtkWidget *show_tabs_item; - GtkWidget *untabify_item; - GtkWidget *show_menubar_item; - - GtkWidget *vbox; - GtkWidget *notebook; - int button_mask; - gboolean last_set; - int last_x; - int last_y; - int grab_x_root; - int grab_y_root; - VirtualConsole *kbd_owner; - VirtualConsole *ptr_owner; - - gboolean full_screen; - - GdkCursor *null_cursor; - Notifier mouse_mode_notifier; - gboolean free_scale; - - bool external_pause_update; - - DisplayOptions *opts; -}; - struct VCChardev { Chardev parent; VirtualConsole *console; --=20 2.29.2 From nobody Thu May 9 08:22:29 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613741460482279.54523444290464; Fri, 19 Feb 2021 05:31:00 -0800 (PST) Received: from localhost ([::1]:34070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD5s3-0000tz-Br for importer@patchew.org; Fri, 19 Feb 2021 08:30:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD5br-0004Lz-Fv for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD5bm-0006UX-Pk for qemu-devel@nongnu.org; Fri, 19 Feb 2021 08:14:15 -0500 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-362-yyQIY20nMLCsi8DPjLj49w-1; Fri, 19 Feb 2021 08:14:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92AB0801976 for ; Fri, 19 Feb 2021 13:14:06 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00AEA60BE5; Fri, 19 Feb 2021 13:13:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 604BD1800866; Fri, 19 Feb 2021 14:13:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613740450; 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=rSYWFZxdl+9isG5CaaoD/68Nd7QqhBD+6rAUC7xwL8Q=; b=KoDrXm3j4rXDJegq8b0ghmOwkAyZhxv3UcoJdGcn47Upr6RXJiLPP9G9qxjdibbdcKcVWE 8E8dUvTAOU989pxL03crFhOTCExs0Qc5ngUwz4yUcZ+idauqs/uNPFaJC6RJfJAwpx6x87 aQ/Jz6/BuP/HhdnMXWY8rtfrYRUGq1U= X-MC-Unique: yyQIY20nMLCsi8DPjLj49w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 7/7] ui/gtk: add clipboard support Date: Fri, 19 Feb 2021 14:13:49 +0100 Message-Id: <20210219131349.3993192-8-kraxel@redhat.com> In-Reply-To: <20210219131349.3993192-1-kraxel@redhat.com> References: <20210219131349.3993192-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch adds clipboard support to the qemu gtk ui. Signed-off-by: Gerd Hoffmann --- include/ui/gtk.h | 9 ++++ ui/gtk-clipboard.c | 124 +++++++++++++++++++++++++++++++++++++++++++++ ui/gtk.c | 1 + ui/meson.build | 2 +- 4 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 ui/gtk-clipboard.c diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 55319843758d..08999f8835e6 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -18,6 +18,7 @@ #include #endif =20 +#include "ui/clipboard.h" #include "ui/console.h" #include "ui/kbd-state.h" #if defined(CONFIG_OPENGL) @@ -137,6 +138,11 @@ struct GtkDisplayState { =20 bool external_pause_update; =20 + QemuClipboardPeer cbpeer; + QemuClipboardInfo *cbinfo[QEMU_CLIPBOARD_SELECTION__COUNT]; + uint32_t cbpending[QEMU_CLIPBOARD_SELECTION__COUNT]; + GtkClipboard *gtkcb[QEMU_CLIPBOARD_SELECTION__COUNT]; + DisplayOptions *opts; }; =20 @@ -208,4 +214,7 @@ QEMUGLContext gd_gl_area_get_current_context(DisplayCha= ngeListener *dcl); int gd_gl_area_make_current(DisplayChangeListener *dcl, QEMUGLContext ctx); =20 +/* gtk-clipboard.c */ +void gd_clipboard_init(GtkDisplayState *gd); + #endif /* UI_GTK_H */ diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c new file mode 100644 index 000000000000..4a7f44b25818 --- /dev/null +++ b/ui/gtk-clipboard.c @@ -0,0 +1,124 @@ +/* + * GTK UI -- clipboard support + * + * Copyright (C) 2021 Gerd Hoffmann + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" + +#include "ui/gtk.h" + +static void gd_clipboard_notify(Notifier *notifier, void *data) +{ + GtkDisplayState *gd =3D container_of(notifier, GtkDisplayState, cbpeer= .update); + QemuClipboardInfo *info =3D data; + QemuClipboardSelection s =3D info->selection; + bool self_update =3D info->owner =3D=3D &gd->cbpeer; + + if (info !=3D gd->cbinfo[s]) { + qemu_clipboard_info_put(gd->cbinfo[s]); + gd->cbinfo[s] =3D qemu_clipboard_info_get(info); + gd->cbpending[s] =3D 0; + if (!self_update) { + if (info->types[QEMU_CLIPBOARD_TYPE_TEXT].available) { + qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); + } + } + return; + } + + if (self_update) { + return; + } + + if (info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && + info->types[QEMU_CLIPBOARD_TYPE_TEXT].data) { + gtk_clipboard_set_text(gd->gtkcb[s], + info->types[QEMU_CLIPBOARD_TYPE_TEXT].data, + info->types[QEMU_CLIPBOARD_TYPE_TEXT].size); + } +} + +static void gd_clipboard_request(QemuClipboardInfo *info, + QemuClipboardType type) +{ + GtkDisplayState *gd =3D container_of(info->owner, GtkDisplayState, cbp= eer); + char *text; + + switch (type) { + case QEMU_CLIPBOARD_TYPE_TEXT: + text =3D gtk_clipboard_wait_for_text(gd->gtkcb[info->selection]); + qemu_clipboard_set_data(&gd->cbpeer, info, type, + strlen(text), text, true); + break; + default: + break; + } +} + +static QemuClipboardSelection gd_find_selection(GtkDisplayState *gd, + GtkClipboard *clipboard) +{ + QemuClipboardSelection s; + + for (s =3D 0; s < QEMU_CLIPBOARD_SELECTION__COUNT; s++) { + if (gd->gtkcb[s] =3D=3D clipboard) { + return s; + } + } + return QEMU_CLIPBOARD_SELECTION_CLIPBOARD; +} + +static void gd_owner_change(GtkClipboard *clipboard, + GdkEvent *event, + gpointer data) +{ + GtkDisplayState *gd =3D data; + QemuClipboardSelection s =3D gd_find_selection(gd, clipboard); + QemuClipboardInfo *info; + + info =3D qemu_clipboard_info_new(&gd->cbpeer, s); + if (gtk_clipboard_wait_is_text_available(clipboard)) { + info->types[QEMU_CLIPBOARD_TYPE_TEXT].available =3D true; + } + + qemu_clipboard_update(info); + qemu_clipboard_info_put(info); +} + +void gd_clipboard_init(GtkDisplayState *gd) +{ + gd->cbpeer.name =3D "gtk"; + gd->cbpeer.update.notify =3D gd_clipboard_notify; + gd->cbpeer.request =3D gd_clipboard_request; + qemu_clipboard_peer_register(&gd->cbpeer); + + gd->gtkcb[QEMU_CLIPBOARD_SELECTION_CLIPBOARD] =3D + gtk_clipboard_get(gdk_atom_intern("CLIPBOARD", FALSE)); + gd->gtkcb[QEMU_CLIPBOARD_SELECTION_PRIMARY] =3D + gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE)); + gd->gtkcb[QEMU_CLIPBOARD_SELECTION_SECONDARY] =3D + gtk_clipboard_get(gdk_atom_intern("SECONDARY", FALSE)); + + g_signal_connect(gd->gtkcb[QEMU_CLIPBOARD_SELECTION_CLIPBOARD], + "owner-change", G_CALLBACK(gd_owner_change), gd); + g_signal_connect(gd->gtkcb[QEMU_CLIPBOARD_SELECTION_PRIMARY], + "owner-change", G_CALLBACK(gd_owner_change), gd); + g_signal_connect(gd->gtkcb[QEMU_CLIPBOARD_SELECTION_SECONDARY], + "owner-change", G_CALLBACK(gd_owner_change), gd); +} diff --git a/ui/gtk.c b/ui/gtk.c index 7b412dd4fe0b..0ae3ec20f594 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2252,6 +2252,7 @@ static void gtk_display_init(DisplayState *ds, Displa= yOptions *opts) opts->u.gtk.grab_on_hover) { gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item)); } + gd_clipboard_init(s); } =20 static void early_gtk_display_init(DisplayOptions *opts) diff --git a/ui/meson.build b/ui/meson.build index a98f89b48978..3ea969a6210b 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -64,7 +64,7 @@ if gtk.found() softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) =20 gtk_ss =3D ss.source_set() - gtk_ss.add(gtk, vte, pixman, files('gtk.c')) + gtk_ss.add(gtk, vte, pixman, files('gtk.c', 'gtk-clipboard.c')) gtk_ss.add(when: x11, if_true: files('x_keymap.c')) gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c', = 'gtk-gl-area.c')) ui_modules +=3D {'gtk' : gtk_ss} --=20 2.29.2