From nobody Mon May 25 13:48:45 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=1777110862; cv=none; d=zohomail.com; s=zohoarc; b=DBrndTfUUh+AQj9vr6t5L6bV6IpUxZMdZ9tJIvQ4nN/dNlVPvuqa+BanVsmbRTQmV27ZouMILE7X5mPYczfMXvazZSPElmGnC794c+idM13/N4zm45+bml0mhGuAHny5aux1Lot7UnVXZQHQuXZYmJ8iMI4XjeciFwAETi3VKJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777110862; 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=KS523ZuLQajlqaW9nRPPvwWPNkbM/GgW7sZV4UtjmFI=; b=L+y25XHrEC8dbj3ZbbRqpKnXg37Vb6XUjgRZdE8nB+Q7sBf1VxR9eAQaFLwlx9NCBwxV9HqqL+/LUcFi7ybCroNED4OPyK3WKFiNu848mVfdGpPnPms87HQ795L3K6+j9mIl482gcRl3euttdU/MgMc7eFmN5g+QzQhNmYON1NE= 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 1777110862269266.24633380398507; Sat, 25 Apr 2026 02:54:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGZhz-0002vz-Jt; Sat, 25 Apr 2026 05:53:55 -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 1wGZhv-0002vE-BN for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:53:51 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wGZht-0002B1-Ur for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:53:51 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-43eb012ac4fso5177108f8f.0 for ; Sat, 25 Apr 2026 02:53:49 -0700 (PDT) Received: from [192.168.0.10] ([2a03:ab00:1000:1b60:331a:b316:78f6:effc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cc0d51sm67574574f8f.10.2026.04.25.02.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Apr 2026 02:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777110828; x=1777715628; 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=KS523ZuLQajlqaW9nRPPvwWPNkbM/GgW7sZV4UtjmFI=; b=HxrWQBxPWuldQ/O+RqaBf1qhakajFXhtkAPA6UdGmKDbD+7180WhJhLjJW0klFgqMG W4CQkS1EBdXpj7jsLJ1DJBFO0XF2jTmK2ymNpoJFYqahN6AFGR9fETnABGF2EQHCZVjC WniRmfGvePUDCYhUmga+IlAum+0X1g+sMb3KA8D/LrtzT0XP8GLaSJzqKbsc6trkHVEM HgGwYmwMR6KYZlucsf+bZ/oUrMweWeICLPkIe2kg0J9zRNvjP+bVuwcNsgF2JSn8VHsU 83PHhe5Dy7bjjlbgJdhURT3isCXrFUHOBl7XFxswFzPxIBaL5xlWApi5GDrTtzZugcm1 GQ9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777110828; x=1777715628; 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=KS523ZuLQajlqaW9nRPPvwWPNkbM/GgW7sZV4UtjmFI=; b=So7bCQ8eCX5UW/TNu0oWiq1L7vfzn1Rxl5g8CUdCqO4YoPBPQYm4r/ETbT9mB2J5Gp EqXIU+Qib7zC3/N9evs2xONj2B3bmGwGgEnANS+b6VDpzr6QIw1Nu9jJRUkQLm3JsO1v Kurcs9TVkiXaveBDKVXa87dT0wRBq42S9qt4hF3FWCXivH61xcF/pg06q3w0oQR+rFKa jashThd6KA3HVLaUuV8kqZDA9CXmcuIXnSohBjlUqjYIE+wuHJgBWfhxxzpITKJGftkf bYgNWYsZwMNdn6FLxy9N6AMgJccmaV9pcsSkjMMpGc1PlasdPCIYCQHTYtuAAGVBREBC QNtw== X-Gm-Message-State: AOJu0YwUvv33dqJnqpWaQyH7gBPchpK7yiX2MoaAhTAlAS8rED09631r Z+/m7IaPmxtrQwZ4yZHkJVU9gzX8Y2p7EkY0oa2qtnvYwbDkVRbw/6U8 X-Gm-Gg: AeBDievdrTXuXyBVIeP1FDLbCQbDoiI9+U3QlUDWz6vPlBOs7IURye7nAst0y9SanwY f2vbr2T90gub/hWdhfrVMtLz9XgUculuMZQor2f8cmf+Kr0QNKBclyjK+gpjRugojuc0PV4Xvps ZjR+k5bE3zzAJzE49IWGodrLuI6cT6ZLbMfEfByqbq130/k8GZz2mPowvPyduLxePbgqwmte+JF q37x/gXXWVc8lJM2H8puNgQqErlxwWVO4HLi0nEhl6TgElsaX8xaHF8p3Opz3EK+jjzRN7IgXB4 pws0tpE6Nmhzp1LIIfO1UWAADtBXssykyVcaV9K0BlsuqLyJEAENjPOep/f2owYJdvDJU/PZPFA s6VaWpMoQmCPu3zZVUgc99FODkZaZcSbpHUWE9EcCERf5Ct/aa4896YhRVrC3Hd2GhXwqA5+0zy obkR+cxWHTMy+m4bCxZH/nYtY2zGseeEYF36r09qk= X-Received: by 2002:a05:6000:184d:b0:43d:e31:68d1 with SMTP id ffacd0b85a97d-43fe3dd958amr55703038f8f.21.1777110828404; Sat, 25 Apr 2026 02:53:48 -0700 (PDT) From: =?utf-8?q?Jind=C5=99ich_Makovi=C4=8Dka?= Date: Sat, 25 Apr 2026 11:53:40 +0200 Subject: [PATCH v2 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: <20260425-gtk-clipboard-v2-1-b098f3cf69cc@gmail.com> References: <20260425-gtk-clipboard-v2-0-b098f3cf69cc@gmail.com> In-Reply-To: <20260425-gtk-clipboard-v2-0-b098f3cf69cc@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?= , 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::429; envelope-from=makovick@gmail.com; helo=mail-wr1-x429.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: 1777110864259158500 Signed-off-by: Jindrich Makovicka --- ui/gtk-clipboard.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c index 65d89ec601..23d32947cc 100644 --- a/ui/gtk-clipboard.c +++ b/ui/gtk-clipboard.c @@ -136,26 +136,50 @@ 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_text_received_callback(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + QemuClipboardInfo *info =3D (QemuClipboardInfo *)data; + if (text) { + 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 +197,9 @@ 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_text(clipboard, + gd_clipboard_owner_change_text_received= _callback, + info); break; default: qemu_clipboard_peer_release(&gd->cbpeer, s); --=20 2.53.0 From nobody Mon May 25 13:48:45 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=1777110874; cv=none; d=zohomail.com; s=zohoarc; b=gl6CLZg/6DbycVBukHPN0hTT+A71ZG/VqjMKr1PwZlbfycnk4pki74IcfcogkwKYnizjn/OM5d/bJfergrPoZswPpKjnaANxCvCwmb5+K6MZ9aWmE7LjrMku2UlymHgNaA7N3LXZedhjExNabOgAzTSDpcuPMKULcDr1FO+PQmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777110874; 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=ak/WzdlMfKzniqlIHL2N1mtB/p/2UjSHJ54PG93fz1Cj2/ID9+peaRvbtNWSml+MFRImRNk/CPkcnQvaY4wRAyjafYP+uXTEx2OhZKNL6Guu26FdmwsjhmjWYnwV1M7OxM5KTGX/OS0WFwRi0bi/AZumfzQovxpRPkfFYisZHQ4= 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 1777110874204922.3483314652764; Sat, 25 Apr 2026 02:54:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGZi0-0002wW-BB; Sat, 25 Apr 2026 05:53:56 -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 1wGZhy-0002vm-BD for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:53:54 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wGZhv-0002B9-R4 for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:53:53 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-43d734223e4so5901072f8f.0 for ; Sat, 25 Apr 2026 02:53:51 -0700 (PDT) Received: from [192.168.0.10] ([2a03:ab00:1000:1b60:331a:b316:78f6:effc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cc0d51sm67574574f8f.10.2026.04.25.02.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Apr 2026 02:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777110830; x=1777715630; 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=XH251KxSkJt5l4cS9OuzkjaCGXG4P4EVJVvXIBKdgWoPdIgP8uVfJZHJ33Fe2NbGnH EdPnQCekERzS8bYSl5b6A4XoVD+Z+Xuv78cZ8vertP5FNJqN9aVpn670CJ7EFhIRClmO KwMPJLKJgnVNSZYsu/W8jmk4u3j/HMFw6OnIW/Y4K5kIN1IoskWWd2pWubL0ufwo/3uA cYoHNJ+Uq2rpHS4C43frve5xLXKj6WCx/ehaZwQWukwM+xUEyuqenoUyc1vZAgmgQIcI RNH+nsa3r0aTiBFO9I+VkHaDwjBWUeO8zCALbIID6Ajz+Qco7wE/CSG8x+ZoRhHATDYb f+hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777110830; x=1777715630; 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=a6VnKjGOLR4eId2LinwHbjzKpF3F2Pe0ZfRFB6sMwOqGSZEGDvCtrDJLPD8V17/UfE brYL1R9XV7J3ID/gX6L9dIohTDnt41dIHAvbsprfSbopStO+Fggd8/actN4bU15TJ6XJ xyHvnT8MWMZfNLbWFLgjKFZb4pxn8nDuTNwKq/nsNfsaYf2e2EbDDUgiY0THzHRUu7GS 2RJhCCWMuzqKJfGeYQSCa1x7DiPGYEyUrvzWIBjZA1rSTC88cvWnS0iy+pk/CAlA/fDe MrPymnyCQApd/GuUJOzU+hNKSEahT1JqOzmBcMLVGS3B0VD08jaKn+OU+LIW0A73Xv7D Vmig== X-Gm-Message-State: AOJu0YyaWr7Gyr8ylABMEdw45dyGDI2YHsTcw2x/sIzruseZWXvgvGVt u6bNUvavGz4koaCccWAFvOuAPt7OeeQkGtHooL+f9XKPKTZ4G9KdOU1TFNdkQnFfCIo= X-Gm-Gg: AeBDiev8qiAS4uFAx4aElIkdJdDSR13jnAHLcBIfxahf4yUtZw8FmnX4sAyaINvzwsV 5v/0vpqVWW45FtTbMwrBLH44LjPwO+aUjvF2alOuUEqdXCxu+QSS/FSxVo9sJD8MqJkQckuDV6q QiHpPCi2OhNKtrOgVWK7QSPq6c/UwcsZzDZqj7qszC/c7B4BpZjxDtngTLcbwosISpn3rq+Wzch OCA5yCJwCYlooKh/rQZxxb5Unu4zOHsNWhh/4OruZpXpyzHXX3j/nAzVKxIvVk5PqhwTlP49PrZ ImXZdYH5EUkTXjHkDeoy7ApbRtlqoo0WVZzZgMFQ2oAluRIXE+5RcWGDOD14XD+GtrAqrzDprZz MDgnHw0pEKAVCJHaS49ZfJ7JOfznd4uLuDPk6vd+k1g0hC+2bj2ulOPBrwAFO0QddmZo9VDCa9k Aq9HcB30jVtQlTIKr3237nb56MLdf9GDlWX4fCAUw= X-Received: by 2002:a05:6000:4550:b0:441:37b5:d788 with SMTP id ffacd0b85a97d-44137b5d7c1mr2669049f8f.8.1777110830202; Sat, 25 Apr 2026 02:53:50 -0700 (PDT) From: =?utf-8?q?Jind=C5=99ich_Makovi=C4=8Dka?= Date: Sat, 25 Apr 2026 11:53:41 +0200 Subject: [PATCH v2 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: <20260425-gtk-clipboard-v2-2-b098f3cf69cc@gmail.com> References: <20260425-gtk-clipboard-v2-0-b098f3cf69cc@gmail.com> In-Reply-To: <20260425-gtk-clipboard-v2-0-b098f3cf69cc@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?= , 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::431; envelope-from=makovick@gmail.com; helo=mail-wr1-x431.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: 1777110875874158500 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