From nobody Mon May 25 13:49:02 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1777318815; cv=none; d=zohomail.com; s=zohoarc; b=SnyagsU6T9ffw4BVLmesV7I8wkpfgv6LAU3Rg0V8wx6u8BGwa8Tjw6umDjqSqEWqn6+7OdR2dly2lVIeClOvcJf9EjpyUdhov52OAbFz6fG2vsr4LCBlr+b563+B0J/PXw93W4E5sJkyrHPRs02VtGRIIUojTGMPmdQB9LlQJuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777318815; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o1m5TZjfPpKFGxNcdvdtQL+COsgMLl98v9ZR1ImYqYM=; b=PrnPnx5IsWZslT+YoS/l7OWWxZFO/Ux6cUincBb+Ji5RTedl6d3hhyaxcoP/CyT3XgwscmSWfmD4N3oA50jJcFHIPSYLMA2H/iuWPhrWXEGEyA9Hfd702L+tSSyrpZS9rUK/Xz/j36qx4nAQSUv3LXMOg0MlCTTf+kzDXbTY0MQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177731881534719.067996886944798; Mon, 27 Apr 2026 12:40:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wHRnp-0007Uq-VZ; Mon, 27 Apr 2026 15:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHRna-0007T8-0R for qemu-devel@nongnu.org; Mon, 27 Apr 2026 15:39:20 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wHRnY-0006s8-Dl for qemu-devel@nongnu.org; Mon, 27 Apr 2026 15:39:17 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-488a9033b2cso113154385e9.2 for ; Mon, 27 Apr 2026 12:39:15 -0700 (PDT) Received: from [192.168.0.10] ([2a03:ab00:1000:1b60:331a:b316:78f6:effc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a773e70c2sm8281035e9.10.2026.04.27.12.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 12:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777318754; x=1777923554; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=o1m5TZjfPpKFGxNcdvdtQL+COsgMLl98v9ZR1ImYqYM=; b=JsZKJVTslNlRLf5GumJ8nz0Ym7TzKFXcfz/jKn24Y4yvR/FH4pnTsvWMcf5zzCiwPe EpGy5IicWWOFzjiDma8OBLgkYHvTn58S/k1lqXJ08Nic74Lm4ktWokANA4IQKniUGwyc eToIb+IESv8nBQGQFmBrGdzel+HDMsXG/fE3yIRWFoAu14ovmYpGkrRXOuwP8zqRnBFZ 7ECRrbDKlZn6bRSmdHLYqAE4uuEIs/MOf5uC5wUhzmweP1riDxEbjD/YNmdW0zXsWop/ ZnZhfmXmOP7t6oRc9UBg7dLhXgDlKaH392lnSqpne312d5/2TSOJF15MKFpD2M3PBxJs ds+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777318754; x=1777923554; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=o1m5TZjfPpKFGxNcdvdtQL+COsgMLl98v9ZR1ImYqYM=; b=OhVwdA/cvSCte+VHdZYiAKPPd1b9pru1NhqxoR4wNVGwcH5/1oaLBuGUj2M1owDILv HSJd9qqhx8OkJw9mMPW98Q1lr3NtK2UMWCe8uqfpm/K20mbq40T0BCJ88t7z1IOs2pop i3Fm4Odu1Y+z9ho9unB43noI2O5Otou0frrdkp6wOfUm3cdB23Paa/2cUugmjFis8Hhn CHY2LZ/7n4tCvtGuky204HYIVcDfoTj92j84ZPiUEFuNN9IvipvnGldWTtIt9SJRNV0m k0Q/B908UraKzTuMpGUJmUX9qr9bsyKEVEi2qdasbLar0XKxlDQrg/g5p6/8OfU7zFiv QnsQ== X-Gm-Message-State: AOJu0YxyAKm3NnSH/0+aQ+tA608fS/6Kml1drV6Oqpk8x2HyI/5Yu278 q4fPfdRDFRHsMvfVnxJeMU+8Gp9YJG6Q4pVgGV9aX84jt9yv/VVoPOIA X-Gm-Gg: AeBDies9tmd/r8OWLq+ySlt9mXsJiJ2cX3rgjBr6gb71HFU5nUowMj+IshIsRMdeqK8 hY38/2jNGSE7WneF8NWBW8dc6Sz3Nq0Xhg8Y1m/7MrHHK6+ybUzlsxLBnlflYlnUa08nenuf+2+ qcwA1xWQtaByoaGbXiqT4dFRRJ6ReImMhwdFSnVDoC4sqrDp948o2zvWvaKQtlQHpUX/GD5+4OY WRHUfH9WTuzN2kjG6w0HIctzQL2uW7XhveVfzLOxNJVfRuo5n9UbOOoCdk2Rb0q9isdpvc17ag7 OHnb7aX1a3gwWb6f5Abtj4t0536F8VRNzEM1iKkpR3iHjOEI5b5+NcnWYcFb7WgjI699az92z7L A/fSwOgfdrKCmEc9JfUoonhv1lFuGAnT2rO4vjp/0b5gGV4tW+ewOZd2TUy7+nYe61SLzk8Us94 kCimemhFyA86YPpujJGGL68lVdsSR1Og9Fxr0fA4M= X-Received: by 2002:a05:600c:3386:b0:488:a977:8de with SMTP id 5b1f17b1804b1-48a77e64f29mr142535e9.16.1777318754450; Mon, 27 Apr 2026 12:39:14 -0700 (PDT) From: =?utf-8?q?Jind=C5=99ich_Makovi=C4=8Dka?= Date: Mon, 27 Apr 2026 21:39:10 +0200 Subject: [PATCH v4 1/2] ui/gtk: Use non-blocking clipboard retrieval MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260427-gtk-clipboard-v4-1-176ad9919931@gmail.com> References: <20260427-gtk-clipboard-v4-0-176ad9919931@gmail.com> In-Reply-To: <20260427-gtk-clipboard-v4-0-176ad9919931@gmail.com> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jindrich Makovicka X-Mailer: b4 0.14.3 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=makovick@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1777318816379158500 Signed-off-by: Jindrich Makovicka --- ui/gtk-clipboard.c | 53 ++++++++++++++++++++++++++++++++++++++++----------= --- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c index 65d89ec601..463ed4e905 100644 --- a/ui/gtk-clipboard.c +++ b/ui/gtk-clipboard.c @@ -136,26 +136,55 @@ static void gd_clipboard_notify(Notifier *notifier, v= oid *data) } } =20 +static void +gd_clipboard_request_text_received_callback(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + QemuClipboardInfo *info =3D (QemuClipboardInfo *)data; + + if (text) { + qemu_clipboard_set_data(info->owner, info, QEMU_CLIPBOARD_TYPE_TEX= T, + strlen(text), text, true); + } + qemu_clipboard_info_unref(info); +} + static void gd_clipboard_request(QemuClipboardInfo *info, QemuClipboardType type) { GtkDisplayState *gd =3D container_of(info->owner, GtkDisplayState, cbp= eer); - char *text; =20 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); - } + qemu_clipboard_info_ref(info); + gtk_clipboard_request_text(gd->gtkcb[info->selection], + gd_clipboard_request_text_received_call= back, + info); break; default: break; } } =20 +static void gd_clipboard_owner_change_targets_received_callback( + GtkClipboard *clipboard, + GdkAtom *targets, + gint n_targets, + gpointer data) +{ + QemuClipboardInfo *info =3D (QemuClipboardInfo *)data; + + if (n_targets) { + if (gtk_targets_include_text(targets, n_targets)) { + info->types[QEMU_CLIPBOARD_TYPE_TEXT].available =3D true; + } + } + + qemu_clipboard_update(info); + qemu_clipboard_info_unref(info); +} + static void gd_owner_change(GtkClipboard *clipboard, GdkEvent *event, gpointer data) @@ -173,12 +202,10 @@ static void gd_owner_change(GtkClipboard *clipboard, switch (event->owner_change.reason) { case GDK_OWNER_CHANGE_NEW_OWNER: 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); + gtk_clipboard_request_targets( + clipboard, + gd_clipboard_owner_change_targets_received_callback, + info); break; default: qemu_clipboard_peer_release(&gd->cbpeer, s); --=20 2.53.0 From nobody Mon May 25 13:49:02 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1777318813; cv=none; d=zohomail.com; s=zohoarc; b=FmoROd3IKfvx1Mp9RGrtE04xdPLgwg0ldEfIqjdf6Eacd7hlGXto+BQwMbHSAS79Qu/Mz640ZWSHYvqw/LSCJq9XI0kJB6WQd/ImrfAJlfe9rSQNvzIlBYtBHdD8hQGNsTwYeOW7+3VIuXhs4I9c8h6yhevUvsQP3AgJiNV1kEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777318813; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/dB9Jl1UuY5f333X9zTcSj/D8VVe4daYWJBNZAwS8QI=; b=TqYrSlZz7cdSbE/MSQco92IkMBMYRuFtQP63nUZMORg7vtOddHMOsT20jebYAX0Q9EvL0J7nBFsa4bAPIyh1jaqiMkDcU+C5E39V1dw+o4XXv5Ryc0aj/MAT2yfsfv8gP3rcdOyYT7zkGBg2N2RWP48ISDpc2wQWd9zJL2hnAT8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777318813479556.005307453453; Mon, 27 Apr 2026 12:40:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wHRnn-0007U9-NO; Mon, 27 Apr 2026 15:39:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHRne-0007TY-CQ for qemu-devel@nongnu.org; Mon, 27 Apr 2026 15:39:27 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wHRnZ-0006sC-3Z for qemu-devel@nongnu.org; Mon, 27 Apr 2026 15:39:19 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-488b8bc6bc9so76837915e9.3 for ; Mon, 27 Apr 2026 12:39:16 -0700 (PDT) Received: from [192.168.0.10] ([2a03:ab00:1000:1b60:331a:b316:78f6:effc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a773e70c2sm8281035e9.10.2026.04.27.12.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 12:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777318755; x=1777923555; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/dB9Jl1UuY5f333X9zTcSj/D8VVe4daYWJBNZAwS8QI=; b=aRsQ6Xo41JmKqiiqpSBXPduSbdu8YHbe07YOTpmJrEUkZdq5PK6AFeGlWb2qgUr1N9 3+/JfN7PCdRpqfsoapenNWVi1CGp8G+fkeQicYkOndhV2jn/LaPLM4tXnjgTZhRY8Rzz Edl2rB0+4taz96mhwNC0msh6kqzUsbTp+rFG37w3bzVusc/TvPGxP/xMj8KMfmrwX275 K/xGIltN97SZJ3Hd89JhDINOaWcO3afJk/Pw8pOOH50+LT3vet3l3bWjbEoyHHBYadfz imr4qJjLw6lXGEF9z5UdLsEP3CsVHJoAGM7KAbus/JX7eix8cjsEWiqBHXY61WqAmbPG xS4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777318755; x=1777923555; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=/dB9Jl1UuY5f333X9zTcSj/D8VVe4daYWJBNZAwS8QI=; b=p9kNreMBVWFqzYKxicX2OCd3LNv96owclPKo1R0pSBiDaWqGgKatfgn3oe2/xZkH0N Q3ge3MFfSFLsiK+gXJ0+PmkIOU2Le3qjU+dCKPjzal0nIvv6j7fuueEh7x9WXbxK2SVC 1rvKHwgfkSjyp4OHM/usVGpM5Y457CmCzJKPpMjBZIfFJdCDkK0OSEZLuymW3w23qMjL tTO05PfGSOD/2iRis78tQf3nvIMH8WFJwW4CtM9SsLGRp/RWsahEq40ENJNiGYEnAZ+r sIkruRPl6F2tv5MkvSSM5c+3Ury+mcwwVaduiYdj/WckkL+iA6A+oe3SXwAaFYhM/9dJ VvsQ== X-Gm-Message-State: AOJu0YzjTPSFsE0n0cLwDvFeXLxhbAIvs5mdd93cMAut1xqcYL/HZFDs No+PtDH9QfQ6VUjDWNE+dcqi0Rb35IIuYiSONgeTdpe3uLTrW49WZHvm X-Gm-Gg: AeBDiesK9PPLQ+knx7w1z1Y7utHt9rXpqb532nRGxgkErJD7sb+BIkXtIp6OlJKEUbJ l3yTeAzRl/9nlq1icFg6bH2cC75j1e5WvJ7vvuVoI6vTx35pDqvJrrol3runBmCJ8m1RgcU1Mk1 4LUyJDI0obWELFBKxXK+IvD8yIghFEegFKhnXDKYM43A2496Nb1Ma+p8bQQA+Ag4XwVWFiPfq/J ShyL/CvVPSCKFsforuwu4O45HYZJkcNQBDbs8H8OpohGfbjLAu+N/y7+McAYsyuHgjNI4FXviai PqlC2oBK9CACW+vo1YKqc0lf7bgNr1pOuFhQjJug6nJ7zHTobEWM95EyIs6CS5CmYwIMKG9CEUa il7O8hzDFnvisawR9xT7L6l9WMqb5FdMk+b1eYYbXN6PElmRPhL9fDzDWHHi5Y2q3KnW+tgKd8z 5v9P0bMobKust3eaSRXHKaq1kcqy9tK+ja0o5ju8o= X-Received: by 2002:a05:600c:4593:b0:48a:599a:36fe with SMTP id 5b1f17b1804b1-48a77b1d78cmr1131295e9.24.1777318754992; Mon, 27 Apr 2026 12:39:14 -0700 (PDT) From: =?utf-8?q?Jind=C5=99ich_Makovi=C4=8Dka?= Date: Mon, 27 Apr 2026 21:39:11 +0200 Subject: [PATCH v4 2/2] ui/gtk: Keep GTK clipboard enabled MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260427-gtk-clipboard-v4-2-176ad9919931@gmail.com> References: <20260427-gtk-clipboard-v4-0-176ad9919931@gmail.com> In-Reply-To: <20260427-gtk-clipboard-v4-0-176ad9919931@gmail.com> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jindrich Makovicka X-Mailer: b4 0.14.3 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=makovick@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1777318815410154100 Signed-off-by: Jindrich Makovicka --- meson.build | 4 ---- meson_options.txt | 7 ------- ui/gtk.c | 2 -- ui/meson.build | 4 +--- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 096303f021..761c0436a3 100644 --- a/meson.build +++ b/meson.build @@ -1932,7 +1932,6 @@ endif gtk =3D not_found gtkx11 =3D not_found vte =3D not_found -have_gtk_clipboard =3D get_option('gtk_clipboard').enabled() =20 if get_option('gtk') \ .disable_auto_if(not have_system) \ @@ -1954,8 +1953,6 @@ if get_option('gtk') \ method: 'pkg-config', required: get_option('vte')) endif - elif have_gtk_clipboard - error('GTK clipboard requested, but GTK not found') endif endif =20 @@ -2475,7 +2472,6 @@ if glusterfs.found() endif config_host_data.set('CONFIG_GTK', gtk.found()) config_host_data.set('CONFIG_VTE', vte.found()) -config_host_data.set('CONFIG_GTK_CLIPBOARD', have_gtk_clipboard) config_host_data.set('CONFIG_HEXAGON_IDEF_PARSER', get_option('hexagon_ide= f_parser')) config_host_data.set('CONFIG_LIBATTR', have_old_libattr) config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found()) diff --git a/meson_options.txt b/meson_options.txt index 31d5916cfc..286461129b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -262,13 +262,6 @@ option('vnc_sasl', type : 'feature', value : 'auto', description: 'SASL authentication for VNC server') option('vte', type : 'feature', value : 'auto', description: 'vte support for the gtk UI') - -# GTK Clipboard implementation is disabled by default, since it may cause = hangs -# of the guest VCPUs. See gitlab issue 1150: -# https://gitlab.com/qemu-project/qemu/-/issues/1150 - -option('gtk_clipboard', type: 'feature', value : 'disabled', - description: 'clipboard support for the gtk UI (EXPERIMENTAL, MAY H= ANG)') option('xkbcommon', type : 'feature', value : 'auto', description: 'xkbcommon support') option('zstd', type : 'feature', value : 'auto', diff --git a/ui/gtk.c b/ui/gtk.c index 9ebe7e8df0..5e63c502ed 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2601,9 +2601,7 @@ static void gtk_display_init(DisplayState *ds, Displa= yOptions *opts) opts->u.gtk.show_tabs) { gtk_menu_item_activate(GTK_MENU_ITEM(s->show_tabs_item)); } -#ifdef CONFIG_GTK_CLIPBOARD gd_clipboard_init(s); -#endif /* CONFIG_GTK_CLIPBOARD */ =20 /* GTK's event polling must happen on the main thread. */ qemu_main =3D NULL; diff --git a/ui/meson.build b/ui/meson.build index 4e533d3046..6405e21d5d 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -111,9 +111,7 @@ if gtk.found() =20 gtk_ss =3D ss.source_set() gtk_ss.add(gtk, vte, pixman, files('gtk.c')) - if have_gtk_clipboard - gtk_ss.add(files('gtk-clipboard.c')) - endif + gtk_ss.add(files('gtk-clipboard.c')) gtk_ss.add(when: x11, if_true: files('x_keymap.c')) gtk_ss.add(when: opengl, if_true: files('gtk-gl-area.c')) gtk_ss.add(when: [x11, opengl], if_true: files('gtk-egl.c')) --=20 2.53.0