From nobody Tue Feb 10 12:59:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640070943; cv=none; d=zohomail.com; s=zohoarc; b=KG9gyYxqG6Z2wzVENDePS4tqbwxq5efmv3/v483BtXQq+372wMh/Calcq8zXamg3wT5TfLwr2PuJciwMWuxZr/7BbhTpaz2YlS9yuYtfuXk9JeSPF6MPHqWgvfMhc3ApB08uSeBWBz/H6mpTQZ0iIMq0y86GHKfb1y4IHWS5mBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640070943; 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=AiN9BUutgkzLtBp/GAyVU25mmPg2j5ZZqIuXUaGx4/4=; b=Tg787ZFURePz963MoVkdxRGwKDqaO7cB5JFf3z/kSEfVLbkAQ3lx4zrCfNiQjXPOxFcRxLHSpbH/oTsFdcQ7oNsoczcBJGWh5pHBa7VzczLMBgQ5MpXKItPo/x/H53ajFNKHnZEBT3nMNOpxV2C5vmZ2vpl0//ZIGXZWqQssd6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1640070943929186.43156054783447; Mon, 20 Dec 2021 23:15:43 -0800 (PST) Received: from localhost ([::1]:45214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzZN7-0007an-Eq for importer@patchew.org; Tue, 21 Dec 2021 02:15:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzZ85-00025U-B2 for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:00:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzZ83-0001hn-3w for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:00:09 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-438-nav0vnlmOQCRQXMN_zZPew-1; Tue, 21 Dec 2021 01:59:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 664E0802C91; Tue, 21 Dec 2021 06:59:57 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 708BD838DF; Tue, 21 Dec 2021 06:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640070006; 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=AiN9BUutgkzLtBp/GAyVU25mmPg2j5ZZqIuXUaGx4/4=; b=NqEbJCJTg55RSbedWoI01MajEelMRVo8p4gSGJM04gKLPZ7Y6blUSqH5cSbbBTyDe1yzod SINxw5OYkNkKwS3vojkGtYLk/l9SfkDrOr5n6ynU4l/ClO7KkoHkL+QkfLxyKrpolse5pI Py+FErDZqdMrZV6YFVpGMrLa9Ruhxzw= X-MC-Unique: nav0vnlmOQCRQXMN_zZPew-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PULL v2 03/36] ui: generalize clipboard notifier Date: Tue, 21 Dec 2021 10:58:22 +0400 Message-Id: <20211221065855.142578-4-marcandre.lureau@redhat.com> In-Reply-To: <20211221065855.142578-1-marcandre.lureau@redhat.com> References: <20211221065855.142578-1-marcandre.lureau@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=marcandre.lureau@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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, richard.henderson@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640070945834100001 From: Marc-Andr=C3=A9 Lureau Use a QemuClipboardNotify union type for extendable clipboard events. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Gerd Hoffmann --- include/ui/clipboard.h | 32 ++++++++++++++++++++++++++++++-- ui/clipboard.c | 12 ++++++++---- ui/gtk-clipboard.c | 20 ++++++++++++++++---- ui/vdagent.c | 27 ++++++++++++++++++--------- ui/vnc-clipboard.c | 20 +++++++++++++++----- ui/vnc.c | 2 +- ui/cocoa.m | 17 +++++++++++++---- 7 files changed, 101 insertions(+), 29 deletions(-) diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h index 6298986b15c3..d82cf314811c 100644 --- a/include/ui/clipboard.h +++ b/include/ui/clipboard.h @@ -20,8 +20,10 @@ */ =20 typedef enum QemuClipboardType QemuClipboardType; +typedef enum QemuClipboardNotifyType QemuClipboardNotifyType; typedef enum QemuClipboardSelection QemuClipboardSelection; typedef struct QemuClipboardPeer QemuClipboardPeer; +typedef struct QemuClipboardNotify QemuClipboardNotify; typedef struct QemuClipboardInfo QemuClipboardInfo; =20 /** @@ -55,18 +57,44 @@ enum QemuClipboardSelection { * struct QemuClipboardPeer * * @name: peer name. - * @update: notifier for clipboard updates. + * @notifier: notifier for clipboard updates. * @request: callback for clipboard data requests. * * Clipboard peer description. */ struct QemuClipboardPeer { const char *name; - Notifier update; + Notifier notifier; void (*request)(QemuClipboardInfo *info, QemuClipboardType type); }; =20 +/** + * enum QemuClipboardNotifyType + * + * @QEMU_CLIPBOARD_UPDATE_INFO: clipboard info update + * + * Clipboard notify type. + */ +enum QemuClipboardNotifyType { + QEMU_CLIPBOARD_UPDATE_INFO, +}; + +/** + * struct QemuClipboardNotify + * + * @type: the type of event. + * @info: a QemuClipboardInfo event. + * + * Clipboard notify data. + */ +struct QemuClipboardNotify { + QemuClipboardNotifyType type; + union { + QemuClipboardInfo *info; + }; +}; + /** * struct QemuClipboardInfo * diff --git a/ui/clipboard.c b/ui/clipboard.c index d7b008d62a07..743b39edf424 100644 --- a/ui/clipboard.c +++ b/ui/clipboard.c @@ -8,7 +8,7 @@ static QemuClipboardInfo *cbinfo[QEMU_CLIPBOARD_SELECTION__= COUNT]; =20 void qemu_clipboard_peer_register(QemuClipboardPeer *peer) { - notifier_list_add(&clipboard_notifiers, &peer->update); + notifier_list_add(&clipboard_notifiers, &peer->notifier); } =20 void qemu_clipboard_peer_unregister(QemuClipboardPeer *peer) @@ -18,8 +18,7 @@ void qemu_clipboard_peer_unregister(QemuClipboardPeer *pe= er) for (i =3D 0; i < QEMU_CLIPBOARD_SELECTION__COUNT; i++) { qemu_clipboard_peer_release(peer, i); } - - notifier_remove(&peer->update); + notifier_remove(&peer->notifier); } =20 bool qemu_clipboard_peer_owns(QemuClipboardPeer *peer, @@ -44,10 +43,15 @@ void qemu_clipboard_peer_release(QemuClipboardPeer *pee= r, =20 void qemu_clipboard_update(QemuClipboardInfo *info) { + QemuClipboardNotify notify =3D { + .type =3D QEMU_CLIPBOARD_UPDATE_INFO, + .info =3D info, + }; g_autoptr(QemuClipboardInfo) old =3D NULL; + assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT); =20 - notifier_list_notify(&clipboard_notifiers, info); + notifier_list_notify(&clipboard_notifiers, ¬ify); =20 old =3D cbinfo[info->selection]; cbinfo[info->selection] =3D qemu_clipboard_info_ref(info); diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c index 35b7a2c22838..44ff810234ff 100644 --- a/ui/gtk-clipboard.c +++ b/ui/gtk-clipboard.c @@ -74,10 +74,9 @@ static void gd_clipboard_clear(GtkClipboard *clipboard, gd->cbowner[s] =3D false; } =20 -static void gd_clipboard_notify(Notifier *notifier, void *data) +static void gd_clipboard_update_info(GtkDisplayState *gd, + QemuClipboardInfo *info) { - 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; =20 @@ -118,6 +117,19 @@ static void gd_clipboard_notify(Notifier *notifier, vo= id *data) */ } =20 +static void gd_clipboard_notify(Notifier *notifier, void *data) +{ + GtkDisplayState *gd =3D + container_of(notifier, GtkDisplayState, cbpeer.notifier); + QemuClipboardNotify *notify =3D data; + + switch (notify->type) { + case QEMU_CLIPBOARD_UPDATE_INFO: + gd_clipboard_update_info(gd, notify->info); + return; + } +} + static void gd_clipboard_request(QemuClipboardInfo *info, QemuClipboardType type) { @@ -172,7 +184,7 @@ static void gd_owner_change(GtkClipboard *clipboard, void gd_clipboard_init(GtkDisplayState *gd) { gd->cbpeer.name =3D "gtk"; - gd->cbpeer.update.notify =3D gd_clipboard_notify; + gd->cbpeer.notifier.notify =3D gd_clipboard_notify; gd->cbpeer.request =3D gd_clipboard_request; qemu_clipboard_peer_register(&gd->cbpeer); =20 diff --git a/ui/vdagent.c b/ui/vdagent.c index 64e00170017f..de827aad27ab 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -417,10 +417,9 @@ static void vdagent_send_empty_clipboard_data(VDAgentC= hardev *vd, vdagent_send_clipboard_data(vd, info, type); } =20 -static void vdagent_clipboard_notify(Notifier *notifier, void *data) +static void vdagent_clipboard_update_info(VDAgentChardev *vd, + QemuClipboardInfo *info) { - 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; @@ -449,6 +448,19 @@ static void vdagent_clipboard_notify(Notifier *notifie= r, void *data) } } =20 +static void vdagent_clipboard_notify(Notifier *notifier, void *data) +{ + VDAgentChardev *vd =3D + container_of(notifier, VDAgentChardev, cbpeer.notifier); + QemuClipboardNotify *notify =3D data; + + switch (notify->type) { + case QEMU_CLIPBOARD_UPDATE_INFO: + vdagent_clipboard_update_info(vd, notify->info); + return; + } +} + static void vdagent_clipboard_request(QemuClipboardInfo *info, QemuClipboardType qtype) { @@ -658,9 +670,9 @@ static void vdagent_chr_recv_caps(VDAgentChardev *vd, V= DAgentMessage *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) { + if (have_clipboard(vd) && vd->cbpeer.notifier.notify =3D=3D NULL) { vd->cbpeer.name =3D "vdagent"; - vd->cbpeer.update.notify =3D vdagent_clipboard_notify; + vd->cbpeer.notifier.notify =3D vdagent_clipboard_notify; vd->cbpeer.request =3D vdagent_clipboard_request; qemu_clipboard_peer_register(&vd->cbpeer); } @@ -799,7 +811,7 @@ static void vdagent_disconnect(VDAgentChardev *vd) if (vd->mouse_hs) { qemu_input_handler_deactivate(vd->mouse_hs); } - if (vd->cbpeer.update.notify) { + if (vd->cbpeer.notifier.notify) { qemu_clipboard_peer_unregister(&vd->cbpeer); memset(&vd->cbpeer, 0, sizeof(vd->cbpeer)); } @@ -807,11 +819,8 @@ static void vdagent_disconnect(VDAgentChardev *vd) =20 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(); - vdagent_disconnect(vd); return; } =20 diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c index 67284b556cd8..6a0b1058840e 100644 --- a/ui/vnc-clipboard.c +++ b/ui/vnc-clipboard.c @@ -189,10 +189,8 @@ static void vnc_clipboard_provide(VncState *vs, vnc_flush(vs); } =20 -static void vnc_clipboard_notify(Notifier *notifier, void *data) +static void vnc_clipboard_update_info(VncState *vs, QemuClipboardInfo *inf= o) { - 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; @@ -223,6 +221,18 @@ static void vnc_clipboard_notify(Notifier *notifier, v= oid *data) } } =20 +static void vnc_clipboard_notify(Notifier *notifier, void *data) +{ + VncState *vs =3D container_of(notifier, VncState, cbpeer.notifier); + QemuClipboardNotify *notify =3D data; + + switch (notify->type) { + case QEMU_CLIPBOARD_UPDATE_INFO: + vnc_clipboard_update_info(vs, notify->info); + return; + } +} + static void vnc_clipboard_request(QemuClipboardInfo *info, QemuClipboardType type) { @@ -316,9 +326,9 @@ void vnc_server_cut_text_caps(VncState *vs) caps[1] =3D 0; vnc_clipboard_send(vs, 2, caps); =20 - if (!vs->cbpeer.update.notify) { + if (!vs->cbpeer.notifier.notify) { vs->cbpeer.name =3D "vnc"; - vs->cbpeer.update.notify =3D vnc_clipboard_notify; + vs->cbpeer.notifier.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 af02522e8416..9b603382e75e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1354,7 +1354,7 @@ void vnc_disconnect_finish(VncState *vs) /* last client gone */ vnc_update_server_surface(vs->vd); } - if (vs->cbpeer.update.notify) { + if (vs->cbpeer.notifier.notify) { qemu_clipboard_peer_unregister(&vs->cbpeer); } =20 diff --git a/ui/cocoa.m b/ui/cocoa.m index 68a6302184ab..6640a2e80ebb 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1808,14 +1808,12 @@ static void cocoa_clipboard_request(QemuClipboardIn= fo *info, =20 static QemuClipboardPeer cbpeer =3D { .name =3D "cocoa", - .update =3D { .notify =3D cocoa_clipboard_notify }, + .notifier =3D { .notify =3D cocoa_clipboard_notify }, .request =3D cocoa_clipboard_request }; =20 -static void cocoa_clipboard_notify(Notifier *notifier, void *data) +static void cocoa_clipboard_update_info(QemuClipboardInfo *info) { - QemuClipboardInfo *info =3D data; - if (info->owner =3D=3D &cbpeer || info->selection !=3D QEMU_CLIPBOARD_= SELECTION_CLIPBOARD) { return; } @@ -1831,6 +1829,17 @@ static void cocoa_clipboard_notify(Notifier *notifie= r, void *data) qemu_event_set(&cbevent); } =20 +static void cocoa_clipboard_notify(Notifier *notifier, void *data) +{ + QemuClipboardNotify *notify =3D data; + + switch (notify->type) { + case QEMU_CLIPBOARD_UPDATE_INFO: + cocoa_clipboard_update_info(notify->info); + return; + } +} + static void cocoa_clipboard_request(QemuClipboardInfo *info, QemuClipboardType type) { --=20 2.34.1.8.g35151cf07204