From nobody Mon Apr 29 18:42:31 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=1620195081; cv=none; d=zohomail.com; s=zohoarc; b=Q0Idk1vHSupaJS9gmc1d2ml9Jup8FG+VBclr83zLsax90J8ErJ+uPcQDN72GEFTHTv0YaFv7DNUV+oy+9aGz4WKZUgIdjgQLhWCgwbXvbnQyKGx1w2qEWPo8fbfPjXXWvORmjnjtFYfX0qeR8NMrjeaEEqh1kFOJF3RwFmWbF6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195081; 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=icrORmR0oX8budY20qvyou5R7MERVXcTPkmmw+eiCSI=; b=KFYsxaSKGxYAFukkMZptfTBEoXYEx+4KJlM5SPe2kwV7Dcfuev0KtSKoNRuAUHOR7lXGwX70d6TSOScG8wiRlR3XY9SHkZ+RgK/7fycPYHCTx6RJUciGRQNwtbd480+pAGuGWC5Pe5SfKetnhTZOQwFhlLKCcpoMeWwOS9SVQHU= 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 162019508134868.46982276963627; Tue, 4 May 2021 23:11:21 -0700 (PDT) Received: from localhost ([::1]:59594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAkh-00061o-OV for importer@patchew.org; Wed, 05 May 2021 02:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAik-0004ZF-Ay for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAih-0001by-2d for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:17 -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-498-7h4hwu0wNXmLsfaYwJ1_Ug-1; Wed, 05 May 2021 02:09:10 -0400 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 1D0A66414C for ; Wed, 5 May 2021 06:09:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10ED660C17; Wed, 5 May 2021 06:09:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 73D8418003A4; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194954; 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=icrORmR0oX8budY20qvyou5R7MERVXcTPkmmw+eiCSI=; b=YrqMAAS+kSX3MwF6yPE/g69u1uznKvnWFtStpE1y7cuxLq1ue525jSQzCGHXoKCvdU7ei/ 8ChoA5ybXYkNZZ431x2CDOLoJMtNmaKi/OP05+vPutOpKUDnLoCegMdAakWAP8r1KsyT3U 8B+U47jl1SR9ZHSX5OSauqYIBkQ872E= X-MC-Unique: 7h4hwu0wNXmLsfaYwJ1_Ug-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 1/9] build: add separate spice-protocol config option Date: Wed, 5 May 2021 08:08:53 +0200 Message-Id: <20210505060901.828658-2-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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-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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When implementing spice vdagent protocol in qemu we only need the spice-protocol package for that, spice-server is not needed. So go split those two build dependencies. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- configure | 36 ++++++++++++++++++++++++++++++++---- meson.build | 4 ++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 4f374b48890e..e6f959da2347 100755 --- a/configure +++ b/configure @@ -388,6 +388,7 @@ qom_cast_debug=3D"yes" trace_backends=3D"log" trace_file=3D"trace" spice=3D"$default_feature" +spice_protocol=3D"auto" rbd=3D"auto" smartcard=3D"$default_feature" u2f=3D"auto" @@ -1129,7 +1130,15 @@ for opt do ;; --disable-spice) spice=3D"no" ;; - --enable-spice) spice=3D"yes" + --enable-spice) + spice_protocol=3D"yes" + spice=3D"yes" + ;; + --disable-spice-protocol) + spice_protocol=3D"no" + spice=3D"no" + ;; + --enable-spice-protocol) spice_protocol=3D"yes" ;; --disable-libiscsi) libiscsi=3D"disabled" ;; @@ -1866,6 +1875,7 @@ disabled with --disable-FEATURE, default is enabled i= f available vhost-user-blk-server vhost-user-blk server support vhost-vdpa vhost-vdpa kernel backend support spice spice + spice-protocol spice-protocol rbd rados block device (rbd) libiscsi iscsi support libnfs nfs support @@ -4149,6 +4159,19 @@ fi =20 ########################################## # spice probe +if test "$spice_protocol" !=3D "no" ; then + spice_protocol_cflags=3D$($pkg_config --cflags spice-protocol 2>/dev/nul= l) + if $pkg_config --atleast-version=3D0.12.3 spice-protocol; then + spice_protocol=3D"yes" + else + if test "$spice_protocol" =3D "yes" ; then + feature_not_found "spice_protocol" \ + "Install spice-protocol(>=3D0.12.3) devel" + fi + spice_protocol=3D"no" + fi +fi + if test "$spice" !=3D "no" ; then cat > $TMPC << EOF #include @@ -4157,13 +4180,13 @@ EOF spice_cflags=3D$($pkg_config --cflags spice-protocol spice-server 2>/dev= /null) spice_libs=3D$($pkg_config --libs spice-protocol spice-server 2>/dev/nul= l) if $pkg_config --atleast-version=3D0.12.5 spice-server && \ - $pkg_config --atleast-version=3D0.12.3 spice-protocol && \ + test "$spice_protocol" =3D "yes" && \ compile_prog "$spice_cflags" "$spice_libs" ; then spice=3D"yes" else if test "$spice" =3D "yes" ; then feature_not_found "spice" \ - "Install spice-server(>=3D0.12.5) and spice-protocol(>=3D0.12.3)= devel" + "Install spice-server(>=3D0.12.5) devel" fi spice=3D"no" fi @@ -5807,9 +5830,14 @@ fi if test "$posix_memalign" =3D "yes" ; then echo "CONFIG_POSIX_MEMALIGN=3Dy" >> $config_host_mak fi + +if test "$spice_protocol" =3D "yes" ; then + echo "CONFIG_SPICE_PROTOCOL=3Dy" >> $config_host_mak + echo "SPICE_PROTOCOL_CFLAGS=3D$spice_protocol_cflags" >> $config_host_mak +fi if test "$spice" =3D "yes" ; then echo "CONFIG_SPICE=3Dy" >> $config_host_mak - echo "SPICE_CFLAGS=3D$spice_cflags" >> $config_host_mak + echo "SPICE_CFLAGS=3D$spice_cflags $spice_protocol_cflags" >> $config_ho= st_mak echo "SPICE_LIBS=3D$spice_libs" >> $config_host_mak fi =20 diff --git a/meson.build b/meson.build index d8bb1ec5aa97..51898a96ba4d 100644 --- a/meson.build +++ b/meson.build @@ -445,11 +445,15 @@ if 'CONFIG_LIBJACK' in config_host endif spice =3D not_found spice_headers =3D not_found +spice_protocol =3D not_found if 'CONFIG_SPICE' in config_host spice =3D declare_dependency(compile_args: config_host['SPICE_CFLAGS'].s= plit(), link_args: config_host['SPICE_LIBS'].split()) spice_headers =3D declare_dependency(compile_args: config_host['SPICE_CF= LAGS'].split()) endif +if 'CONFIG_SPICE_PROTOCOL' in config_host + spice_protocol =3D declare_dependency(compile_args: config_host['SPICE_P= ROTOCOL_CFLAGS'].split()) +endif rt =3D cc.find_library('rt', required: false) libdl =3D not_found if 'CONFIG_PLUGIN' in config_host --=20 2.31.1 From nobody Mon Apr 29 18:42:31 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=1620195242; cv=none; d=zohomail.com; s=zohoarc; b=YEVo1TXgKm/7G7Cel9w6h24u05nV+DQbWU0xikWIewIlYjBIWj2J+31m+73uyaD+pAA8YZy2QM3cVhK4oWEzYGMC0T7ZV54NiX93kMVLOpbvYzght1n2+tfYHYt3kMaBtpKcP72lqXTW2SxRyQQUH+SsBZ3HqgWpy+b8JS95aoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195242; 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=oZ61DNE037oMggZMkAH0ULnEyDBT5mamM5hRgXhlLcQ=; b=i1MY7M7dECxMK+nfrcgdjS9/dbqUUI93/ZkqCrVla5F2DYoD3K9ZDZZF57PqrFoozVGOYjxPZG5wKJiVPWneUxlLGT+s0sswAY41NEHNWYkFe7IECx5hsmkSOYp3WTgHWY773tnQ9/J7l6dFpzRXuHrmp9mg2d1rOVxmW7rERBI= 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 1620195242387768.9623270106299; Tue, 4 May 2021 23:14:02 -0700 (PDT) Received: from localhost ([::1]:40678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAnJ-0001RV-DI for importer@patchew.org; Wed, 05 May 2021 02:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAir-0004jP-GT for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAio-0001i0-HW for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:25 -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-451-CINuC5ifN5m7drvCH_l09g-1; Wed, 05 May 2021 02:09:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 504F564157 for ; Wed, 5 May 2021 06:09:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 52EC860CCE; Wed, 5 May 2021 06:09:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 832D518003A5; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194961; 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=oZ61DNE037oMggZMkAH0ULnEyDBT5mamM5hRgXhlLcQ=; b=aFG6XmC6U8oadupXC32fZAV1F4cjKU6j2jeuy4sMvOJkzJkoKXocLLyWKubx36HtoRMCTf e1FZha40QoXAXUi9oyNXIfkP3YrL2uJysSO0wIzlZ5fY0un8VbexXzB9rptpLGpylZRJNz WAoqb27m2DW9d3PIftdrtPstgVy+KOo= X-MC-Unique: CINuC5ifN5m7drvCH_l09g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 2/9] ui: add clipboard infrastructure Date: Wed, 5 May 2021 08:08:54 +0200 Message-Id: <20210505060901.828658-3-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add some infrastructure to manage the clipboard in qemu. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/ui/clipboard.h | 62 ++++++++++++++++++++++++++++ ui/clipboard.c | 92 ++++++++++++++++++++++++++++++++++++++++++ ui/meson.build | 1 + 3 files changed, 155 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..876de7621911 --- /dev/null +++ b/include/ui/clipboard.h @@ -0,0 +1,62 @@ +#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]; +}; + +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_ref(QemuClipboardInfo *info); +void qemu_clipboard_info_unref(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..abf2b98f1f89 --- /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_ref(QemuClipboardInfo *info) +{ + info->refcount++; + return info; +} + +void qemu_clipboard_info_unref(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 e8d3ff41b905..fc4fb75c2869 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.31.1 From nobody Mon Apr 29 18:42:31 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=1620195089; cv=none; d=zohomail.com; s=zohoarc; b=Fo1AuL6fUMgPIqhiQo3giQOD7UbVUNeO8aD/PPQkK+Z8R3slL1hunZHyMZ/Jt2/qv1wPdfb+8+LbK4OaVTHaJPsy42xZdnMaoQUB9twj+9zHiyfhh1cmO8fBbISBtJEUzETrHDz+lspCzzKPNWg46HiJ6bELZQ1xzRJWFESpamQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195089; 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=wiCETXVCuMYJVkRzKBIdII4ftgIXftaZPUA1JVYM84Y=; b=ICaAAhHDmOHYG0y5Ny986U+CRRZbwC3w69YwXoB6I9FIlTfcFh3vBeiSZuHyp6j/E2erHmz3Pk7AeKykrYgsn3tamUoRs1qkhvAK6gYyJsp48i9EtHKt8Ct+K0gY/iRtox7bHIve0Fnh3j265/QxEErBUKIPIc4jipW3i+ZX/L4= 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 1620195089735342.30078440130217; Tue, 4 May 2021 23:11:29 -0700 (PDT) Received: from localhost ([::1]:60390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAkq-0006LX-Jp for importer@patchew.org; Wed, 05 May 2021 02:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAiq-0004iG-Uo for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAio-0001i1-CY for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:24 -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-503-alj9k5qSMeqBQjg39HQw7Q-1; Wed, 05 May 2021 02:09:19 -0400 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 B60098042A8 for ; Wed, 5 May 2021 06:09:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C6C519C44; Wed, 5 May 2021 06:09:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 92A42180062B; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194961; 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=wiCETXVCuMYJVkRzKBIdII4ftgIXftaZPUA1JVYM84Y=; b=BuVCwKQsYplB/aS3uT7XGnprCqvnAfZdkrRVC84jE7UR1np1ArzMke0Y726XItJ9grB37W mKUigLO6YSOPC8IOtYtxkPHRv4EwTWsOnDF8Jj40bHbcD0VwZ47ahWgaGZe+8H5zkRvAsF SmYouH90WezEfQTBYUskMcwUsnWf6NU= X-MC-Unique: alj9k5qSMeqBQjg39HQw7Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 3/9] ui: add clipboard documentation Date: Wed, 5 May 2021 08:08:55 +0200 Message-Id: <20210505060901.828658-4-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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-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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Document clipboard infrastructure in qemu. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/ui/clipboard.h | 133 ++++++++++++++++++++++++++++++++++++++++- docs/devel/index.rst | 1 + docs/devel/ui.rst | 8 +++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 docs/devel/ui.rst diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h index 876de7621911..e5bcb365ed62 100644 --- a/include/ui/clipboard.h +++ b/include/ui/clipboard.h @@ -3,17 +3,47 @@ =20 #include "qemu/notify.h" =20 +/** + * DOC: Introduction + * + * The header ``ui/clipboard.h`` declares the qemu clipboard interface. + * + * All qemu elements which want use the clipboard can register as + * clipboard peer. Subsequently they can set the clipboard content + * and get notifications for clipboard updates. + * + * Typical users are user interfaces (gtk), remote access protocols + * (vnc) and devices talking to the guest (vdagent). + * + * Even though the design allows different data types only plain text + * is supported for now. + */ + typedef enum QemuClipboardType QemuClipboardType; typedef enum QemuClipboardSelection QemuClipboardSelection; typedef struct QemuClipboardPeer QemuClipboardPeer; typedef struct QemuClipboardInfo QemuClipboardInfo; =20 +/** + * enum QemuClipboardType + * + * @QEMU_CLIPBOARD_TYPE_TEXT: text/plain; charset=3Dutf-8 + * @QEMU_CLIPBOARD_TYPE__COUNT: type count. + */ enum QemuClipboardType { - QEMU_CLIPBOARD_TYPE_TEXT, /* text/plain; charset=3Dutf-8 */ + QEMU_CLIPBOARD_TYPE_TEXT, QEMU_CLIPBOARD_TYPE__COUNT, }; =20 /* same as VD_AGENT_CLIPBOARD_SELECTION_* */ +/** + * enum QemuClipboardSelection + * + * @QEMU_CLIPBOARD_SELECTION_CLIPBOARD: clipboard (explitcit cut+paste). + * @QEMU_CLIPBOARD_SELECTION_PRIMARY: primary selection (select + middle m= ouse button). + * @QEMU_CLIPBOARD_SELECTION_SECONDARY: secondary selection (dunno). + * @QEMU_CLIPBOARD_SELECTION__COUNT: selection count. + */ enum QemuClipboardSelection { QEMU_CLIPBOARD_SELECTION_CLIPBOARD, QEMU_CLIPBOARD_SELECTION_PRIMARY, @@ -21,6 +51,15 @@ enum QemuClipboardSelection { QEMU_CLIPBOARD_SELECTION__COUNT, }; =20 +/** + * struct QemuClipboardPeer + * + * @name: peer name. + * @update: notifier for clipboard updates. + * @request: callback for clipboard data requests. + * + * Clipboard peer description. + */ struct QemuClipboardPeer { const char *name; Notifier update; @@ -28,6 +67,16 @@ struct QemuClipboardPeer { QemuClipboardType type); }; =20 +/** + * struct QemuClipboardInfo + * + * @refcount: reference counter. + * @owner: clipboard owner. + * @selection: clipboard selection. + * @types: clipboard data array (one entry per type). + * + * Clipboard content data and metadata. + */ struct QemuClipboardInfo { uint32_t refcount; QemuClipboardPeer *owner; @@ -40,18 +89,100 @@ struct QemuClipboardInfo { } types[QEMU_CLIPBOARD_TYPE__COUNT]; }; =20 +/** + * qemu_clipboard_peer_register + * + * @peer: peer information. + * + * Register clipboard peer. Registering is needed for both active + * (set+grab clipboard) and passive (watch clipboard for updates) + * interaction with the qemu clipboard. + */ void qemu_clipboard_peer_register(QemuClipboardPeer *peer); + +/** + * qemu_clipboard_peer_unregister + * + * @peer: peer information. + * + * Unregister clipboard peer. + */ void qemu_clipboard_peer_unregister(QemuClipboardPeer *peer); =20 +/** + * qemu_clipboard_info_new + * + * @owner: clipboard owner. + * @selection: clipboard selection. + * + * Allocate a new QemuClipboardInfo and initialize it with the given + * @owner and @selection. + * + * QemuClipboardInfo is a reference-counted struct. The new struct is + * returned with a reference already taken (i.e. reference count is + * one). + */ QemuClipboardInfo *qemu_clipboard_info_new(QemuClipboardPeer *owner, QemuClipboardSelection selectio= n); +/** + * qemu_clipboard_info_ref + * + * @info: clipboard info. + * + * Increase @info reference count. + */ QemuClipboardInfo *qemu_clipboard_info_ref(QemuClipboardInfo *info); + +/** + * qemu_clipboard_info_unref + * + * @info: clipboard info. + * + * Decrease @info reference count. When the count goes down to zero + * free the @info struct itself and all clipboard data. + */ void qemu_clipboard_info_unref(QemuClipboardInfo *info); =20 +/** + * qemu_clipboard_update + * + * @info: clipboard info. + * + * Update the qemu clipboard. Notify all registered peers (including + * the clipboard owner) that the qemu clipboard has been updated. + * + * This is used for both new completely clipboard content and for + * clipboard data updates in response to qemu_clipboard_request() + * calls. + */ void qemu_clipboard_update(QemuClipboardInfo *info); + +/** + * qemu_clipboard_request + * + * @info: clipboard info. + * @type: clipboard data type. + * + * Request clipboard content. Typically the clipboard owner only + * advertises the available data types and provides the actual data + * only on request. + */ void qemu_clipboard_request(QemuClipboardInfo *info, QemuClipboardType type); =20 +/** + * qemu_clipboard_set_data + * + * @peer: clipboard peer. + * @info: clipboard info. + * @type: clipboard data type. + * @size: data size. + * @data: data blob. + * @update: notify peers about the update. + * + * Set clipboard content for the given @type. This function will make + * a copy of the content data and store that. + */ void qemu_clipboard_set_data(QemuClipboardPeer *peer, QemuClipboardInfo *info, QemuClipboardType type, diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 6cf7e2d2330c..cbdbb9049182 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -36,6 +36,7 @@ Contents: multi-thread-tcg tcg-plugins bitops + ui reset s390-dasd-ipl clocks diff --git a/docs/devel/ui.rst b/docs/devel/ui.rst new file mode 100644 index 000000000000..06c7d622ce74 --- /dev/null +++ b/docs/devel/ui.rst @@ -0,0 +1,8 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Qemu UI subsystem +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Qemu Clipboard +-------------- + +.. kernel-doc:: include/ui/clipboard.h --=20 2.31.1 From nobody Mon Apr 29 18:42:31 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=1620195263; cv=none; d=zohomail.com; s=zohoarc; b=VqYf5lxgtinnS/RyMaXVCiffQIKr9aL1kLEgBYdI2+VpgO4lUThuBJf6xuDE4vJ0K249Y9oJfxLg0jleZtG2hpWgmj9e1hnZj+2vm+1RLRUz+IapRZud2ZZ07lQCmCDpaZBN/zy2Q4PerxbjgrgSh97qS34BgWs7/Mkdvt7zEiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195263; 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=IloglYeMQuhagYaxisju2rLj7ZPUENYdDHAC47DQ7AI=; b=KNSCrL4zHEQW9qiMHqar3v5k6kPGugdHesZPgvjJhFAxmC581WEX764MrKl5NIJf5Zc0nt3gI8QIkvgUkWOWtmRlGN9gYB8G3R9yVa+grmocAqo6DfJhyXexIx7749N+4fep/g5MshuxaLBezzW1IqRBHds3e1TOc7dCU1Ji5+k= 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 1620195263083434.6861716779165; Tue, 4 May 2021 23:14:23 -0700 (PDT) Received: from localhost ([::1]:42878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAne-0002JX-1U for importer@patchew.org; Wed, 05 May 2021 02:14:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAj0-0004yx-HZ for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAiy-0001oS-2L for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:34 -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-205-eEHFqDdvN2u47okxLZynWg-1; Wed, 05 May 2021 02:09:28 -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 20D338042BC for ; Wed, 5 May 2021 06:09:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13EF25D6D1; Wed, 5 May 2021 06:09:20 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A50771800794; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194971; 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=IloglYeMQuhagYaxisju2rLj7ZPUENYdDHAC47DQ7AI=; b=jKhMHbSUjWZajy0OXK+BR3nlQW7frRqaqyVsuXsq3m4WcBmOjTjcyeCHKQZLttW1SfQXny ij22qAfRK3osjWykZhaG2YtlY2bftoSB3iAaXoFo8jKWkeMZdGqx77AlVUj3FLrATMH1Fh zJG7/nVu94FrggRD2voX+8OaDl+p+A0= X-MC-Unique: eEHFqDdvN2u47okxLZynWg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 4/9] ui/vdagent: core infrastructure Date: Wed, 5 May 2021 08:08:56 +0200 Message-Id: <20210505060901.828658-5-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , 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 qemu-vdagent,id=3Dvdagent \ -device virtserialport,chardev=3Dvdagent,name=3Dcom.redhat.spice.0 This patch adds just the protocol basics: initial handshake and capability negotiation. The following patches will add actual functionality and also add fields to the initially empty ChardevVDAgent qapi struct. Signed-off-by: Gerd Hoffmann Acked-by: Markus Armbruster --- ui/vdagent.c | 323 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 17 ++- ui/meson.build | 1 + ui/trace-events | 8 ++ 4 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 ui/vdagent.c diff --git a/ui/vdagent.c b/ui/vdagent.c new file mode 100644 index 000000000000..e757a3c9c710 --- /dev/null +++ b/ui/vdagent.c @@ -0,0 +1,323 @@ +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "include/qemu-common.h" +#include "chardev/char.h" +#include "trace.h" + +#include "qapi/qapi-types-char.h" + +#include "spice/vd_agent.h" + +struct VDAgentChardev { + Chardev parent; + + /* guest vdagent */ + uint32_t caps; + VDIChunkHeader chunk; + uint32_t chunksize; + uint8_t *msgbuf; + uint32_t msgsize; + uint8_t *xbuf; + uint32_t xoff, xsize; +}; +typedef struct VDAgentChardev VDAgentChardev; + +#define TYPE_CHARDEV_QEMU_VDAGENT "chardev-qemu-vdagent" + +DECLARE_INSTANCE_CHECKER(VDAgentChardev, QEMU_VDAGENT_CHARDEV, + TYPE_CHARDEV_QEMU_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; + uint32_t msgoff =3D 0; + VDIChunkHeader chunk; + + trace_vdagent_send(GET_NAME(msg_name, msg->type)); + + msg->protocol =3D VD_AGENT_PROTOCOL; + + while (msgoff < msgsize) { + chunk.port =3D VDP_CLIENT_PORT; + chunk.size =3D msgsize - msgoff; + if (chunk.size > 1024) { + chunk.size =3D 1024; + } + vdagent_send_buf(vd, &chunk, sizeof(chunk)); + vdagent_send_buf(vd, msgbuf + msgoff, chunk.size); + msgoff +=3D chunk.size; + } +} + +static void vdagent_send_caps(VDAgentChardev *vd) +{ + g_autofree VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(VDAgentAnnounceCapab= ilities) + + 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) +{ +#if defined(HOST_WORDS_BIGENDIAN) + /* + * TODO: vdagent protocol is defined to be LE, + * so we have to byteswap everything on BE hosts. + */ + error_setg(errp, "vdagent is not supported on bigendian hosts"); + return; +#endif + + *be_opened =3D true; +} + +static void vdagent_chr_recv_caps(VDAgentChardev *vd, VDAgentMessage *msg) +{ + VDAgentAnnounceCapabilities *caps =3D (void *)msg->data; + int i; + + if (msg->size < (sizeof(VDAgentAnnounceCapabilities) + + sizeof(uint32_t))) { + return; + } + + 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 void vdagent_chr_recv_msg(VDAgentChardev *vd, VDAgentMessage *msg) +{ + trace_vdagent_recv_msg(GET_NAME(msg_name, msg->type), msg->size); + + switch (msg->type) { + case VD_AGENT_ANNOUNCE_CAPABILITIES: + vdagent_chr_recv_caps(vd, msg); + break; + default: + break; + } +} + +static void vdagent_reset_xbuf(VDAgentChardev *vd) +{ + g_clear_pointer(&vd->xbuf, g_free); + vd->xoff =3D 0; + vd->xsize =3D 0; +} + +static void vdagent_chr_recv_chunk(VDAgentChardev *vd) +{ + VDAgentMessage *msg =3D (void *)vd->msgbuf; + + if (!vd->xsize) { + if (vd->msgsize < sizeof(*msg)) { + error_report("%s: message too small: %d < %zd", __func__, + vd->msgsize, sizeof(*msg)); + return; + } + if (vd->msgsize =3D=3D msg->size + sizeof(*msg)) { + vdagent_chr_recv_msg(vd, msg); + return; + } + } + + if (!vd->xsize) { + vd->xsize =3D msg->size + sizeof(*msg); + vd->xbuf =3D g_malloc0(vd->xsize); + } + + if (vd->xoff + vd->msgsize > vd->xsize) { + error_report("%s: Oops: %d+%d > %d", __func__, + vd->xoff, vd->msgsize, vd->xsize); + vdagent_reset_xbuf(vd); + return; + } + + memcpy(vd->xbuf + vd->xoff, vd->msgbuf, vd->msgsize); + vd->xoff +=3D vd->msgsize; + if (vd->xoff < vd->xsize) { + return; + } + + msg =3D (void *)vd->xbuf; + vdagent_chr_recv_msg(vd, msg); + vdagent_reset_xbuf(vd); +} + +static void vdagent_reset_bufs(VDAgentChardev *vd) +{ + memset(&vd->chunk, 0, sizeof(vd->chunk)); + vd->chunksize =3D 0; + g_free(vd->msgbuf); + vd->msgbuf =3D NULL; + vd->msgsize =3D 0; +} + +static int vdagent_chr_write(Chardev *chr, const uint8_t *buf, int len) +{ + VDAgentChardev *vd =3D QEMU_VDAGENT_CHARDEV(chr); + uint32_t copy, ret =3D len; + + while (len) { + if (vd->chunksize < sizeof(vd->chunk)) { + copy =3D sizeof(vd->chunk) - vd->chunksize; + if (copy > len) { + copy =3D len; + } + memcpy((void *)(&vd->chunk) + vd->chunksize, buf, copy); + vd->chunksize +=3D copy; + buf +=3D copy; + len -=3D copy; + if (vd->chunksize < sizeof(vd->chunk)) { + break; + } + + assert(vd->msgbuf =3D=3D NULL); + vd->msgbuf =3D g_malloc0(vd->chunk.size); + } + + copy =3D vd->chunk.size - vd->msgsize; + if (copy > len) { + copy =3D len; + } + memcpy(vd->msgbuf + vd->msgsize, buf, copy); + vd->msgsize +=3D copy; + buf +=3D copy; + len -=3D copy; + + if (vd->msgsize =3D=3D vd->chunk.size) { + trace_vdagent_recv_chunk(vd->chunk.size); + vdagent_chr_recv_chunk(vd); + vdagent_reset_bufs(vd); + } + } + + return ret; +} + +static void vdagent_chr_set_fe_open(struct Chardev *chr, int fe_open) +{ + VDAgentChardev *vd =3D QEMU_VDAGENT_CHARDEV(chr); + + if (!fe_open) { + trace_vdagent_close(); + /* reset state */ + vdagent_reset_bufs(vd); + 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_QEMU_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 6413970fa73b..990801e642bb 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -390,12 +390,25 @@ 'data': { '*size': 'int' }, 'base': 'ChardevCommon' } =20 +## +# @ChardevQemuVDAgent: +# +# Configuration info for qemu vdagent implementation. +# +# Since: 6.1 +# +## +{ 'struct': 'ChardevQemuVDAgent', + 'data': { }, + 'base': 'ChardevCommon', + 'if': 'defined(CONFIG_SPICE_PROTOCOL)' } + ## # @ChardevBackend: # # Configuration info for the new chardev backend. # -# Since: 1.4 (testdev since 2.2, wctablet since 2.9) +# Since: 1.4 (testdev since 2.2, wctablet since 2.9, vdagent since 6.1) ## { 'union': 'ChardevBackend', 'data': { 'file': 'ChardevFile', @@ -417,6 +430,8 @@ 'if': 'defined(CONFIG_SPICE)' }, 'spiceport': { 'type': 'ChardevSpicePort', 'if': 'defined(CONFIG_SPICE)' }, + 'qemu-vdagent': { 'type': 'ChardevQemuVDAgent', + 'if': 'defined(CONFIG_SPICE_PROTOCOL)' }, 'vc': 'ChardevVC', 'ringbuf': 'ChardevRingbuf', # next one is just for compatibility diff --git a/ui/meson.build b/ui/meson.build index fc4fb75c2869..bad49fb6de60 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_protocol, 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 5d1da6f23668..c34cffb0452b 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -124,3 +124,11 @@ 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_chunk(uint32_t size) "size %d" +vdagent_recv_msg(const char *name, uint32_t size) "msg %s, size %d" +vdagent_peer_cap(const char *name) "cap %s" --=20 2.31.1 From nobody Mon Apr 29 18:42:31 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=1620195234; cv=none; d=zohomail.com; s=zohoarc; b=Ewt3lLUlRpopNF513QryLxNjQvvdjQscdFBYvI+hRz9naODKgNCY5meGOeIgKVfEPIyl4y8XixAB2UFQzvn02NztnMLvGvYWygEpSpCT3kGgZyFrZnlTbi6zNl56YW6ZSmIJFbm9sJTtGbX161UKw3p1XOITE+cfMbJOQ/Gwehg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195234; 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=jRmAJKQ165NdHx+No/LIeKp3gdjYsdqGs6dZbDFnRI8=; b=mLsRxisbm95CLjdG+JW/D/d7poY/A31j0O18PgsK/ara3tOhEukiborcJ64FsQ/B7GFe1PvO915Ap6jVzV1OJywN7UQMTDU2fzSQmrYD7Tey5NohLYQZiZUPEJI4P+qYK8CsI6wsTwNjvf8iSP24KxhdJsSpMFaVelnV9soIH+k= 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 1620195234540579.4299657885795; Tue, 4 May 2021 23:13:54 -0700 (PDT) Received: from localhost ([::1]:39888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAnB-000186-CU for importer@patchew.org; Wed, 05 May 2021 02:13:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAiy-0004xJ-AO for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAiw-0001nF-8N for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:32 -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-601-jDVvLl6iPXmejPi5rQxERw-1; Wed, 05 May 2021 02:09:28 -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 27B20107ACE4 for ; Wed, 5 May 2021 06:09:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 488D25D703; Wed, 5 May 2021 06:09:20 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B587D1800795; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194969; 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=jRmAJKQ165NdHx+No/LIeKp3gdjYsdqGs6dZbDFnRI8=; b=CSXq/9ekLIt6ra2Cp9impsqM4QsfR22i5B4QReQP+gpnNQimwXZ6TbkYIz8aO7lwvhH39F ubKL8dlVGjgUfLcA66MclPGKzNF72pLLt15Jqny1BVksM4EvLvSv4tFl6ONaFU6e+Guvqw yFi0CqZ/uOsbQta9nv+YNVBxNwNmg9g= X-MC-Unique: jDVvLl6iPXmejPi5rQxERw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 5/9] ui/vdagent: add mouse support Date: Wed, 5 May 2021 08:08:57 +0200 Message-Id: <20210505060901.828658-6-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster 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 --- chardev/char.c | 3 + ui/vdagent.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 4 +- 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index 398f09df19cd..9714057541fb 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -932,6 +932,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 e757a3c9c710..c013706efb6a 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -2,15 +2,25 @@ #include "qapi/error.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 +#define VDAGENT_MOUSE_DEFAULT true + struct VDAgentChardev { Chardev parent; =20 + /* config */ + bool mouse; + /* guest vdagent */ uint32_t caps; VDIChunkHeader chunk; @@ -19,6 +29,14 @@ struct VDAgentChardev { uint32_t msgsize; uint8_t *xbuf; uint32_t xoff, xsize; + + /* 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 @@ -123,13 +141,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, +#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); + } + 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 @@ -138,6 +256,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, @@ -147,6 +268,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 @@ -170,6 +301,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) @@ -291,18 +425,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 From nobody Mon Apr 29 18:42:31 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=1620195099; cv=none; d=zohomail.com; s=zohoarc; b=jvOyYcZ9dMGUkIwR8/tZ9iy/sv9sfeOsqafzepBwsnw9GqHh8lwCVzDxOyPvrn8kLv2rssFuhpPnKt6BJK57fhwi7zbB9/DzIuv1IAK2x83nR9YZFmFkkAivs3lD5jn3d65R1q2PX0xrXLpT+aWQSqFwtVU7lx//k92/A81OE0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195099; 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=ohFCeV4HoDVZiVqQpClcd0br8MLaa4FJ5CJbXmknSqQ=; b=B6kkZN5uCGFcURXmrxXut7k5GHWwvXvIRxLNPh3NQcKr0nIX76TxdNXzRCHcLp+h2j2IIqdjOgXxlJ4fHazAhzqJnGQS3fwmAdIt8oYI4wIaiABsObdpwigb+SyWUtvtdVJRVaJ6eOFXSV5IRorHfowH4r0zSJyqOBVeoPApyFM= 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 162019509996223.189613003165732; Tue, 4 May 2021 23:11:39 -0700 (PDT) Received: from localhost ([::1]:33032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAl0-0006gr-Mj for importer@patchew.org; Wed, 05 May 2021 02:11:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAj3-00050K-2T for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAiz-0001p8-86 for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:35 -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-115-eBmosg5gOKiEjbER2IOVJg-1; Wed, 05 May 2021 02:09:30 -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 BC57F801817 for ; Wed, 5 May 2021 06:09:29 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40F5A5D6D1; Wed, 5 May 2021 06:09:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C8226180079A; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194972; 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=ohFCeV4HoDVZiVqQpClcd0br8MLaa4FJ5CJbXmknSqQ=; b=BgiMdKhwuH17fKw9k5yML777G4NeBOfZzRC6M1zSrUiM1RvSTW+Ey5bX6MM05ZQEtu6wt+ ThwwKFOQeQa2LmESt1WNXRgbHm7Q5FnuTqfryNZD/Bfjqo1q3oCMWhImnlsRnPU3bWKg88 Y2xGULbmeDrA1SI+iOIiDAmtU4fE8Z4= X-MC-Unique: eBmosg5gOKiEjbER2IOVJg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 6/9] ui/vdagent: add clipboard support Date: Wed, 5 May 2021 08:08:58 +0200 Message-Id: <20210505060901.828658-7-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , 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 | 292 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/char.json | 4 +- ui/trace-events | 2 + 4 files changed, 300 insertions(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index 9714057541fb..39d41d3df7bb 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -935,6 +935,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 c013706efb6a..64213aa25a06 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -4,6 +4,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" @@ -14,12 +15,14 @@ #include "spice/vd_agent.h" =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; @@ -37,6 +40,11 @@ struct VDAgentChardev { uint32_t mouse_btn; uint32_t mouse_display; QemuInputHandlerState *mouse_hs; + + /* clipboard */ + QemuClipboardPeer cbpeer; + QemuClipboardInfo *cbinfo[QEMU_CLIPBOARD_SELECTION__COUNT]; + uint32_t cbpending[QEMU_CLIPBOARD_SELECTION__COUNT]; }; typedef struct VDAgentChardev VDAgentChardev; =20 @@ -92,6 +100,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 @@ -148,6 +174,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); } @@ -248,6 +278,243 @@ static QemuInputHandler vdagent_mouse_handler =3D { .sync =3D vdagent_pointer_sync, }; =20 +/* ------------------------------------------------------------------ */ +/* clipboard */ + +static bool have_clipboard(VDAgentChardev *vd) +{ + return vd->clipboard && + (vd->caps & (1 << VD_AGENT_CAP_CLIPBOARD_BY_DEMAND)); +} + +static bool have_selection(VDAgentChardev *vd) +{ + return vd->caps & (1 << VD_AGENT_CAP_CLIPBOARD_SELECTION); +} + +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) +{ + g_autofree VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(uint32_t) * (QEMU_CL= IPBOARD_TYPE__COUNT + 1)); + uint8_t *s =3D msg->data; + uint32_t *data =3D (uint32_t *)msg->data; + uint32_t q, type; + + if (have_selection(vd)) { + *s =3D info->selection; + data++; + msg->size +=3D sizeof(uint32_t); + } else if (info->selection !=3D QEMU_CLIPBOARD_SELECTION_CLIPBOARD) { + return; + } + + for (q =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 =3D type; + data++; + msg->size +=3D sizeof(uint32_t); + } + } + + msg->type =3D VD_AGENT_CLIPBOARD_GRAB; + vdagent_send_msg(vd, msg); +} + +static void vdagent_send_clipboard_data(VDAgentChardev *vd, + QemuClipboardInfo *info, + QemuClipboardType type) +{ + g_autofree VDAgentMessage *msg =3D g_malloc0(sizeof(VDAgentMessage) + + sizeof(uint32_t) * 2 + + info->types[type].size); + + uint8_t *s =3D msg->data; + uint32_t *data =3D (uint32_t *)msg->data; + + if (have_selection(vd)) { + *s =3D info->selection; + data++; + msg->size +=3D sizeof(uint32_t); + } else if (info->selection !=3D QEMU_CLIPBOARD_SELECTION_CLIPBOARD) { + return; + } + + *data =3D type_qemu_to_vdagent(type); + data++; + msg->size +=3D sizeof(uint32_t); + + memcpy(data, info->types[type].data, info->types[type].size); + msg->size +=3D info->types[type].size; + + msg->type =3D VD_AGENT_CLIPBOARD; + 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_unref(vd->cbinfo[s]); + vd->cbinfo[s] =3D qemu_clipboard_info_ref(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); + g_autofree 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; + + if (type =3D=3D VD_AGENT_CLIPBOARD_NONE) { + return; + } + + if (have_selection(vd)) { + *s =3D info->selection; + data++; + msg->size +=3D sizeof(uint32_t); + } + + *data =3D type; + msg->size +=3D sizeof(uint32_t); + + msg->type =3D VD_AGENT_CLIPBOARD_REQUEST; + 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 (have_selection(vd)) { + if (size < 4) { + return; + } + s =3D *(uint8_t *)data; + if (s >=3D QEMU_CLIPBOARD_SELECTION__COUNT) { + return; + } + 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); + if (size > sizeof(uint32_t) * 10) { + /* + * spice has 6 types as of 2021. Limiting to 10 entries + * so we we have some wiggle room. + */ + return; + } + while (size >=3D sizeof(uint32_t)) { + 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 sizeof(uint32_t); + size -=3D sizeof(uint32_t); + } + qemu_clipboard_update(info); + qemu_clipboard_info_unref(info); + break; + case VD_AGENT_CLIPBOARD_REQUEST: + if (size < sizeof(uint32_t)) { + return; + } + 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 */ + if (size < sizeof(uint32_t)) { + return; + } + 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_unref(info); + } + break; + } +} + /* ------------------------------------------------------------------ */ /* chardev backend */ =20 @@ -273,6 +540,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); @@ -304,6 +576,12 @@ static void vdagent_chr_recv_caps(VDAgentChardev *vd, = VDAgentMessage *msg) if (have_mouse(vd) && vd->mouse_hs) { qemu_input_handler_activate(vd->mouse_hs); } + if (have_clipboard(vd) && 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 void vdagent_chr_recv_msg(VDAgentChardev *vd, VDAgentMessage *msg) @@ -314,6 +592,14 @@ static void vdagent_chr_recv_msg(VDAgentChardev *vd, V= DAgentMessage *msg) 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: + if (have_clipboard(vd)) { + vdagent_chr_recv_clipboard(vd, msg); + } + break; default: break; } @@ -428,6 +714,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 @@ -444,6 +734,8 @@ static void vdagent_chr_parse(QemuOpts *opts, ChardevBa= ckend *backend, 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); + 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 5711e8c60aeb..adf2685f6889 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -396,12 +396,14 @@ # Configuration info for qemu vdagent implementation. # # @mouse: enable/disable mouse, default is enabled. +# @clipboard: enable/disable clipboard, default is disabled. # # Since: 6.1 # ## { 'struct': 'ChardevQemuVDAgent', - 'data': { '*mouse': 'bool' }, + 'data': { '*mouse': 'bool', + '*clipboard': 'bool' }, 'base': 'ChardevCommon', 'if': 'defined(CONFIG_SPICE_PROTOCOL)' } =20 diff --git a/ui/trace-events b/ui/trace-events index c34cffb0452b..c86542e2b69b 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -132,3 +132,5 @@ vdagent_send(const char *name) "msg %s" vdagent_recv_chunk(uint32_t size) "size %d" vdagent_recv_msg(const char *name, uint32_t size) "msg %s, size %d" 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.31.1 From nobody Mon Apr 29 18:42:31 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=1620195252; cv=none; d=zohomail.com; s=zohoarc; b=Fl0k67fTNo5g0aIXTWBnh/2bt7l3XZoDc450Cr+Zy9lkm9aUzgKb5orRt+td/szET+JUD63ljOtRB6+8nUXy4WaoSzO6r7tjcxF8U8GWpfy0hJT/AT5J1d8vqEmTmaQPpOfyKjDWrnE6XSDFSHnBVlQ1XrLLPH8dw3zDJpbUEjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195252; 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=cawWSxeAhP3XqhR8EO5ORNuEmzfLTfvUdRcZ2WkWxZE=; b=i9w//oqRcEl9uP8NZyX9+g2Is2FbL49H9YZH5PeFA6z6UvYmDI8bwhcEyY3k0ixcPqIfAAaMWknnzHsmCG2/ox0JL3uwUmuMHTBwDlAj8LBIJIxyozzYG0HupY6A/s1/3YdadcMxK5vQ7SFThd2W83x2YMcYmt6NuhAu8klPcuU= 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 1620195252090845.5012911215324; Tue, 4 May 2021 23:14:12 -0700 (PDT) Received: from localhost ([::1]:41664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAnT-0001pg-0Z for importer@patchew.org; Wed, 05 May 2021 02:14:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAjA-00052u-Lw for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAj6-0001sL-3V for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:44 -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-521-ysf4v3WyNt2PQVo2P6smBA-1; Wed, 05 May 2021 02:09:37 -0400 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 9D22F107ACE4 for ; Wed, 5 May 2021 06:09:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D7176062C; Wed, 5 May 2021 06:09:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DC92718007A2; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194979; 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=cawWSxeAhP3XqhR8EO5ORNuEmzfLTfvUdRcZ2WkWxZE=; b=hg+UouBJqsd/ZoKKARYLhA//0iSsKI45avq1uAegfBCnoJp5ng6gD07WQWAOM5OvjuEbxr 5Og52zSM9UWqP+WcI4tj/8XB50AobiY6WUmEVGEevZMaqJYXYHAkXsaEtbff//ndmmhKn9 lWCoqADOFhG0nI8/QvKb0vZPK+NRcfM= X-MC-Unique: ysf4v3WyNt2PQVo2P6smBA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 7/9] ui/vnc: clipboard support Date: Wed, 5 May 2021 08:08:59 +0200 Message-Id: <20210505060901.828658-8-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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-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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster 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 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 Reviewed-by: Marc-Andr=C3=A9 Lureau --- ui/vnc.h | 24 ++++ ui/vnc-clipboard.c | 323 +++++++++++++++++++++++++++++++++++++++++++++ ui/vnc.c | 20 ++- ui/meson.build | 1 + 4 files changed, 362 insertions(+), 6 deletions(-) create mode 100644 ui/vnc-clipboard.c diff --git a/ui/vnc.h b/ui/vnc.h index d4f3e1555809..a7149831f906 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" @@ -348,6 +349,10 @@ struct VncState =20 Notifier mouse_mode_notifier; =20 + QemuClipboardPeer cbpeer; + QemuClipboardInfo *cbinfo; + uint32_t cbpending; + QTAILQ_ENTRY(VncState) next; }; =20 @@ -417,6 +422,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 /*************************************************************************= **** * @@ -458,6 +464,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) @@ -474,6 +481,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 */ @@ -535,6 +543,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 /*************************************************************************= **** * @@ -618,4 +637,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..9f077965d056 --- /dev/null +++ b/ui/vnc-clipboard.c @@ -0,0 +1,323 @@ +/* + * 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; + g_autofree uint8_t *buf =3D NULL; + g_autofree void *zbuf =3D NULL; + 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); + 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_unref(vs->cbinfo); + vs->cbinfo =3D qemu_clipboard_info_ref(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_unref(info); + return; + } + + if (flags & VNC_CLIPBOARD_PROVIDE && + vs->cbinfo && + vs->cbinfo->owner =3D=3D &vs->cbpeer) { + uint32_t size =3D 0; + g_autofree 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); + } + } + } + + 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_unref(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 456db47d713d..1d7f7f326c52 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" @@ -1352,6 +1353,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 @@ -1777,10 +1781,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); @@ -2222,6 +2222,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; @@ -2438,7 +2442,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); @@ -2450,7 +2454,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 bad49fb6de60..f37ef882e0e3 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.31.1 From nobody Mon Apr 29 18:42:31 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=1620195389; cv=none; d=zohomail.com; s=zohoarc; b=OvyGiSKhExe8W0WWZ6aQqwLJdmpMZbtijKmHlAupnOcscLIxN7yumnaIT53/egdGeuorBe0OJgqbacNb1e0IrlPLfLdxQNepR1YY6KH81iTwRHW/vAd7z2oOVtkVz8WlgOiP7zK1b+f4Ct13JcSM5Xnt8wh4Qfp10fI7tWoxgEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195389; 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=/kHGcQeH/YsVoKE6U8oVby4nJ8sCvLALF+LYet0BZAg=; b=nE81TmEQ98AKuwM2YOwpNiBDuhXLZf4lVnAmMpL9oj6zvVmr3CwRJtJgv+SijgSksmKzQtuTIyVtZAklcRBizOKMM5NMonjE59sLRrDFijvsW+d8bpAlxP2I0UQfOIaQixAH8r1Oxcu4CYsUPnqeA1m1QJ+YLW1ElcUQQwNpqfY= 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 1620195389723184.97134500196717; Tue, 4 May 2021 23:16:29 -0700 (PDT) Received: from localhost ([::1]:47218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leApg-0004A4-Hu for importer@patchew.org; Wed, 05 May 2021 02:16:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAjF-00059h-B8 for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAjB-0001uH-HR for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:49 -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-457-Ch6Z1j8zN42uwNptFQPCNA-1; Wed, 05 May 2021 02:09:43 -0400 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 2C4D38042A8 for ; Wed, 5 May 2021 06:09:42 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 69B0B5C22A; Wed, 5 May 2021 06:09:31 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E8FAE18007A3; Wed, 5 May 2021 08:09:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194984; 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=/kHGcQeH/YsVoKE6U8oVby4nJ8sCvLALF+LYet0BZAg=; b=BspldtMX868GUIx5kTLWMznZ6sNGjJj+Qnt+dnws4CH6B0vcdRbhAW9baAuxIT+Ks442xE NgoEVIERSfAfzBXIjnbZ5ZSHkHOTZHlB90Cq/vGW/mNjvUVN9LwTgVUA2KApR8Sj2IojUa /7asdoeXPskDRSeUSKFQ739NS6eYti0= X-MC-Unique: Ch6Z1j8zN42uwNptFQPCNA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 8/9] ui/gtk: move struct GtkDisplayState to ui/gtk.h Date: Wed, 5 May 2021 08:09:00 +0200 Message-Id: <20210505060901.828658-9-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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-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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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 5ae0ad60a600..6e751794043f 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 1ea12535284a..7da288a25156 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.31.1 From nobody Mon Apr 29 18:42:31 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=1620195536; cv=none; d=zohomail.com; s=zohoarc; b=d918OyGEGtPJVGCUS5Gv8lCZduYIYFP5Atf7+vTmJcxl2x1M8SGLjJ1+cbG4CwUXJKpsR4X7UKSPsA5qSyLPRXuxlCnsz40+hOEiwHiZ9pXKlZxVPEkT2778twi2Yre3BQGia2tgU5A7QxGczY5VxpZldUgtX6VbQkdNI0/4UYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620195536; 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=zOk5OEcKcdXn23t64U4NrTFDIle1ZChHHUjWfDIas1g=; b=SktbLrCdNk8cVVJXGWkSsYMEEXNMAE+FaOnGdwM0zKC/i+jMzMdQQsDgKTxDFeWBBQ/eOm+J6U/W38mQT6LwIjNDu1sx+wsr0L0UAvN4hJMxbqCj3OZL625iMLJd6c+5SsnkO0KUdM1ksJiZWzJn8u0IqVMMDV7ogp1w+VgEoJo= 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 1620195536536158.8778845700774; Tue, 4 May 2021 23:18:56 -0700 (PDT) Received: from localhost ([::1]:51426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leAs2-0005rv-AQ for importer@patchew.org; Wed, 05 May 2021 02:18:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAjI-0005HM-4v for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leAjF-0001wl-TH for qemu-devel@nongnu.org; Wed, 05 May 2021 02:09:51 -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-156-HXFVUIXKO2uz10CqEjZUqw-1; Wed, 05 May 2021 02:09:47 -0400 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 42A2C801B1A for ; Wed, 5 May 2021 06:09:46 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F7DF1002D71; Wed, 5 May 2021 06:09:39 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 068E418007A4; Wed, 5 May 2021 08:09:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620194989; 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=zOk5OEcKcdXn23t64U4NrTFDIle1ZChHHUjWfDIas1g=; b=VKS0q5ygvzgLae/ulce2tLF5qubkJBWtDvoZuvjWGyiwd7xtuJLW5IiRmM9BUu7FD9DHuA 9QgXP00uDeXb7m8+pbSkrRXa1JZOCyucPuWcSOoDPQdxPqg6HJh7lB2PltFQVRJrh3LyZy xVe0pymbZueeY6jeHqafhSora0e0wLM= X-MC-Unique: HXFVUIXKO2uz10CqEjZUqw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 9/9] ui/gtk: add clipboard support Date: Wed, 5 May 2021 08:09:01 +0200 Message-Id: <20210505060901.828658-10-kraxel@redhat.com> In-Reply-To: <20210505060901.828658-1-kraxel@redhat.com> References: <20210505060901.828658-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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , 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 | 10 +++ ui/gtk-clipboard.c | 192 +++++++++++++++++++++++++++++++++++++++++++++ ui/gtk.c | 1 + ui/meson.build | 2 +- 4 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 ui/gtk-clipboard.c diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 6e751794043f..9516670ebc87 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,12 @@ 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]; + bool cbowner[QEMU_CLIPBOARD_SELECTION__COUNT]; + DisplayOptions *opts; }; =20 @@ -207,4 +214,7 @@ void gtk_gl_area_init(void); 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..bff28d203014 --- /dev/null +++ b/ui/gtk-clipboard.c @@ -0,0 +1,192 @@ +/* + * 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 "qemu/main-loop.h" + +#include "ui/gtk.h" + +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_clipboard_get_data(GtkClipboard *clipboard, + GtkSelectionData *selection_data, + guint selection_info, + gpointer data) +{ + GtkDisplayState *gd =3D data; + QemuClipboardSelection s =3D gd_find_selection(gd, clipboard); + QemuClipboardType type =3D QEMU_CLIPBOARD_TYPE_TEXT; + QemuClipboardInfo *info =3D qemu_clipboard_info_ref(gd->cbinfo[s]); + + qemu_clipboard_request(info, type); + while (info =3D=3D gd->cbinfo[s] && + info->types[type].available && + info->types[type].data =3D=3D NULL) { + main_loop_wait(false); + } + + if (info =3D=3D gd->cbinfo[s] && gd->cbowner[s]) { + gtk_selection_data_set_text(selection_data, + info->types[type].data, + info->types[type].size); + } else { + /* clipboard owner changed while waiting for the data */ + } + + qemu_clipboard_info_unref(info); +} + +static void gd_clipboard_clear(GtkClipboard *clipboard, + gpointer data) +{ + GtkDisplayState *gd =3D data; + QemuClipboardSelection s =3D gd_find_selection(gd, clipboard); + + gd->cbowner[s] =3D false; +} + +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_unref(gd->cbinfo[s]); + gd->cbinfo[s] =3D qemu_clipboard_info_ref(info); + gd->cbpending[s] =3D 0; + if (!self_update) { + GtkTargetList *list; + GtkTargetEntry *targets; + gint n_targets; + + list =3D gtk_target_list_new(NULL, 0); + if (info->types[QEMU_CLIPBOARD_TYPE_TEXT].available) { + gtk_target_list_add_text_targets(list, 0); + } + targets =3D gtk_target_table_new_from_list(list, &n_targets); + + gtk_clipboard_clear(gd->gtkcb[s]); + gd->cbowner[s] =3D true; + gtk_clipboard_set_with_data(gd->gtkcb[s], + targets, n_targets, + gd_clipboard_get_data, + gd_clipboard_clear, + gd); + + gtk_target_table_free(targets, n_targets); + gtk_target_list_unref(list); + } + return; + } + + if (self_update) { + return; + } + + /* + * Clipboard got updated, with data probably. No action here, we + * are waiting for updates in gd_clipboard_get_data(). + */ +} + +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]); + if (text) { + qemu_clipboard_set_data(&gd->cbpeer, info, type, + strlen(text), text, true); + g_free(text); + } + break; + default: + break; + } +} + +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; + + if (gd->cbowner[s]) { + /* ignore notifications about our own grabs */ + return; + } + + + switch (event->owner_change.reason) { + case GDK_SETTING_ACTION_NEW: + 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_unref(info); + break; + default: + break; + } +} + +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 7da288a25156..98046f577b9d 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2267,6 +2267,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 f37ef882e0e3..b5aed14886cf 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -65,7 +65,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-gl-area.= c')) gtk_ss.add(when: [x11, opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl= .c')) --=20 2.31.1