From nobody Mon May 25 13:48:47 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=1777109965; cv=none; d=zohomail.com; s=zohoarc; b=J4Bllqgpdc8j+b+V64Cyjtni6TpgvwZCMaRoHbLkmdmc2p66eQ3TdWIVm+/a6ZMvKpQBv7ofvUVx4iKzrCW2NJWqHpac1RYr4d+A6aADj1xSeZrFWEMD+B5cyOyi4XemWZ498q0a4QjPP8PBMygsO4dItZv88Tm3uldaB8ko8Pk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777109965; 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=LCgfLW4eJkIhPYxNrsoCQg29VR4jKVLe2eGTdUa5TzxBb7QLYSWPpQViwReMO0/acBkrQ5ssMJrB6L79zfHDEe7hsjlxpLipdF9nONj16szv/oORszJOb4F4qmzTOUQXHQKopfCMvBOBKVF2doIqXv1bLKM/+Jb8ngn+Ksby9Zc= 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 1777109965091331.68004372220014; Sat, 25 Apr 2026 02:39:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGZTG-000598-AI; Sat, 25 Apr 2026 05:38:42 -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 1wGZTC-00058O-Qz for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:38:39 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wGZTB-0005zy-8Q for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:38:38 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-43d7badbd7dso4258769f8f.2 for ; Sat, 25 Apr 2026 02:38:36 -0700 (PDT) Received: from [192.168.0.10] ([2a03:ab00:1000:1b60:331a:b316:78f6:effc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4e3a18csm74965992f8f.20.2026.04.25.02.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Apr 2026 02:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777109915; x=1777714715; 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=DQwBF1cdpNJ7X3gGxp/0T7KgDci8YTFf2yjND2VjMRKwwWlSHXlpGXgnuDrtWcIm7g bHZceUQkrfSNPBT6ykH7JrlaNX+zSxkhnhGDZjhwGsfrUMPEq+i2tvjPcFlTKd5vYs1H XBPq3gSh2LhJNQ9jrGtlIhKksiMpcUX4FWWzntShRudhb4qLFw4GVg8heIEfNEQbjYDc AHeDRpEls+y//XGAnpohQ8oeg8UCw+v0zaT+LgWtx6sJV/6LxNMjr93XXXUxCbWVCMu5 pgmLIE/O/eI/QRvc2gslcKEgrf0NI67x4wDg5VfPs9PXxxAd3doXEVmxAKwJt+msNxTr gNHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777109915; x=1777714715; 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=bZAcJBbtDWTpB1YQVtgSTqQYCItqT06Iaeqo3yYwOIbovl9FqBIzbqlOn54Z0NfMvB kKLmDw9tFXzR3o0w4o3UvN5qmdi7Xx9wZkOwUH3loyS5SrfCTbjJOmj/9MhSWWC101Ph MsZUsADcgm4SwFgOmJVI3vJ7NL4qFw0mN4SA5n2uI/yizOT6VUelJOD85EID5PBWnsBJ nNe1H1ERfY19A9bc4p7r11csppZ1zgvTfLLDSfXvpyITDM68EMm2rK1U5pkhmtvtUeWf cs1OJlk3yS7ZBn4ZrPsvma/bNtvfk3FbPgQ3dfqFeb+vrzFhLe6+hHG08dUX4F6xidIj 2lsA== X-Gm-Message-State: AOJu0YyUpCB2kh9RI+AoY/mRMYQRwTwaYIgmCMwGbipau9FKnHtEC6Sf jU+yQuBgJ7Nn1nsWXkuEMoa/9xxdHWEKNj/EOEx1BdvDz3xXogMvQN5zgbc5s59mnqc= X-Gm-Gg: AeBDievsX1XT2g0meT2NKdJ3yfhdBig5Zx0r3DrFvqvQVoGWBkvv9jTtBaG/wdA3z/a 9sIIccKMoeXmzZGDbuTaMQ90wyHL2TKQQcHyHlSIbFW0lMowiXkAocjEprhdwhY++M9MBRAgrMU Xh9vJfWN47cBzadZCRxSltowLSeUdJo8s6TNdUh0hs1bs4227ATlj943yAgXTD3YcrqehBplQnN W12KbSFxgcdbbJaSBFGv4UvkSjCi6ILlx5xOsd1dOM+HnV5fA70JjMFeaqi4tQWRU1+jB5Uy0zd I+MPQDAt+7KehntNdf8QLEQb4dWzA8CrX7M5RWglCIRjJpAlcxX67aUHSzgtFu1jWwicumLq3O5 /BRGEGxjjvz76KY/BNoAZooffBfZniK5T/rCrvZgajQL0dWNzfUsfyyHHwpBjoFw5+X3XNjkPH7 J9gUKlyNbXXapVFeOvkCospa0abdtnXVtWD4gSF3Y= X-Received: by 2002:adf:ffd0:0:b0:43f:e413:f6fd with SMTP id ffacd0b85a97d-43fe413f7c0mr37696053f8f.0.1777109915063; Sat, 25 Apr 2026 02:38:35 -0700 (PDT) From: =?utf-8?q?Jind=C5=99ich_Makovi=C4=8Dka?= Date: Sat, 25 Apr 2026 11:38:31 +0200 Subject: [PATCH 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-v1-1-6bd99e708e14@gmail.com> References: <20260425-gtk-clipboard-v1-0-6bd99e708e14@gmail.com> In-Reply-To: <20260425-gtk-clipboard-v1-0-6bd99e708e14@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::432; envelope-from=makovick@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1777109967121158500 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:47 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=1777109959; cv=none; d=zohomail.com; s=zohoarc; b=QQlkk/9NmIASVTMg3eP0GILcAs+FuXbQvoOpIeXJuwskG9EzqmawGWCFBFCGUY0rq/FaWzr8s20YZjmXNraN0E4PMpYQVqgjJEi5j2HTllDIVO7UYCIOJWwJCKaA5r7FAKMaOMBEtvsYrIhWCVbnN0UWZM4/Jt0Sva6dmcaaxXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777109959; 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=2dMq8uAY2hZDh7iH5qWRo1QMrdAHDTbtAcXk7hVbErE=; b=HSdWJxQW8j0moIorPV6SMpSN2r8sckWAJFjqQO0pENVMEKpR+TvQ+IObErLNe0mQ0ERcQ/5qEjLCBOB1sohp9RnsDWi9sAA3So5LMvFH1LE0qG9WVKC0c3t8rmg3CNEALlUBboD3UWWkKruU7MbcLe5cJ5dS6s32G55BoDc9SE0= 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 1777109959666441.3756451777904; Sat, 25 Apr 2026 02:39:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGZTH-00059d-Nv; Sat, 25 Apr 2026 05:38:43 -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 1wGZTE-00058j-9S for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:38:41 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wGZTC-00060z-DW for qemu-devel@nongnu.org; Sat, 25 Apr 2026 05:38:40 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-43fe8bda8e9so4743607f8f.1 for ; Sat, 25 Apr 2026 02:38:38 -0700 (PDT) Received: from [192.168.0.10] ([2a03:ab00:1000:1b60:331a:b316:78f6:effc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4e3a18csm74965992f8f.20.2026.04.25.02.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Apr 2026 02:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777109917; x=1777714717; 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=2dMq8uAY2hZDh7iH5qWRo1QMrdAHDTbtAcXk7hVbErE=; b=OVNUlNJMH15KtJQzOb/beX1miL1s8PB0AQr+TAZai80uHWbE/2gkxiPPfpJq6VHzbT mk779H3H3ZVDkgznnFV2J4y14Rypb+TDhUCBGlJHT8UnizHi35XPL0LnIPn2qRJoKjcM /6ZkXJp5UEW3QKEy23OpJbhZ0iX+dUlqhGllCEHRMb62Rl6iLdjufV1kcJfCtL55aLqH 8318xhPSwPWedUA8hdXuoT93ZiAKBNl38NxBQDPmAgAWrPbv+97yTVgvV0OEbXUWfURE u6SJq0DrERkmDrznbCZ6QLASNFQnRyO4X8gDXFi+S82O5tj7+i4pMkspggHTU/1+X6z+ znuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777109917; x=1777714717; 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=2dMq8uAY2hZDh7iH5qWRo1QMrdAHDTbtAcXk7hVbErE=; b=GbRYgQuZlKcfXqw/qNUiWyH1LHgsHQLX/YTDys2dao6oEOrXkrpA3q0Cz8gkRpGORI 8UBYksqiSEcCFvSixGvj7yHePbHGtUanWjWz4ng1aQLnsjtjI6GRD8uBztY8WFgZVVYx SsoBzlK19nlccTVXFh/KnUDrf+5+OQ1zq8+Kut8I148NHywRYqg0onsJBTkvSoW11LYX psa8n2UPnTYE4TxbtfxU6ooOhNGUQrhXKvusxBZKcBAx7C8PfW/u3DPHtxR679+9ALmB 1JtLQZHnj+uTNmPbV/YCD2RY4VdF9GIuZWafg/z4mVWxDUvapXmFJjwe8Ux9Sqsh5GCs S1XA== X-Gm-Message-State: AOJu0Yx9HeV3jDIlUHqUKo56kcJZhK80qSk+rPpuyhoSkNiPemw9DFG7 /y+WHUV5JW6fqe3tTY/qGf9EXtybZX+r8CLIr6cgJGLh/LHQO287m/D4Dsd5bP953Yc= X-Gm-Gg: AeBDiev9nr3lx4Xpxm8NQCUDQYLGQXcAYIC/7d0TfGr1l66Y9+pxw97dRbCLjzTRWsy Tqqbj7C+KQd8ixC9Qb3HuvRVS5b67rU8jXst2G2Sb1z5xFQnYTNB24AfZV9q+Vp/4ONZszqw2Uc Hxbs3rZsI17EpMJceT6uDdqCSfWw0VsYFNX5HQ2NfDjFcZ9dg/hDGQb0HFjQg/X9Pj1K4dXEgZc JeiMCyA3rrEkFd1bZvY2i5b1N6yaufYwDEXFKYKDpwf7DG0hhTpG5KwS+NZyvB/YTQJZuVGWDlE sskBkrrfbyq3ejsqD8mZl3Nrf+qW/CvrcMVI/GkoUn7+Xgl2PDsY6JAIhxBUE4Bdni29OsZyq0t n8BLhpghxuYFtokAmK/xdp7Bee31ODuOAQvoRXt8PNeOMrconn1gizRNuQucxa8Pa/JH+wPDHpK 7mq+rju6bwHCOvIMDCL4BaUygaKZks1i4PAXbdTPc= X-Received: by 2002:a05:6000:40ca:b0:43e:a70d:763d with SMTP id ffacd0b85a97d-43fe3e14e43mr54017384f8f.46.1777109916564; Sat, 25 Apr 2026 02:38:36 -0700 (PDT) From: =?utf-8?q?Jind=C5=99ich_Makovi=C4=8Dka?= Date: Sat, 25 Apr 2026 11:38:32 +0200 Subject: [PATCH 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-v1-2-6bd99e708e14@gmail.com> References: <20260425-gtk-clipboard-v1-0-6bd99e708e14@gmail.com> In-Reply-To: <20260425-gtk-clipboard-v1-0-6bd99e708e14@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::433; envelope-from=makovick@gmail.com; helo=mail-wr1-x433.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: 1777109961457158500 Signed-off-by: Jindrich Makovicka --- meson.build | 4 ---- meson_options.txt | 2 -- ui/gtk.c | 2 -- ui/meson.build | 4 +--- 4 files changed, 1 insertion(+), 11 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..1d4523682b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -267,8 +267,6 @@ option('vte', type : 'feature', value : 'auto', # of the guest VCPUs. See gitlab issue 1150: # https://gitlab.com/qemu-project/qemu/-/issues/1150 =20 -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