From nobody Wed Aug 26 09:50:18 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1781168858; cv=none; d=zohomail.com; s=zohoarc; b=RDpAU7vbJJdPjkV1WONhthQAqG8OIBDKhtyQYBMz6fRyLq1m057+xoW7VpY4O8oLid2/ue5QB1lm6losiXyLV3hv1OX8Oru+vRiPNEbtjP4Iqz24lNgX831oDE2+g1ddMawu7QtePIZic4JSpAO5Oh6hCYYwdJzAP37fMh7prvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781168858; 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=PXp6IDcQDWTnCpWDPYd10qxyz4SzrMGhedvswMrxwag=; b=jLmb/kveDJ1sxNLlwAn4WjuN9Ig3XhUB5Jgl1dB7blmfpJLcPU8nhXC0iiQ32qbMZo6pHwVkjrsdyx1G3wawimhMzvesxnigYbQmLxIdTZJLZH0Abjw00qL919rUT4VDySXjUtS4VNUWCYR2ae4qgujPJ/FOnDlrNK8oN1SSZ0U= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781168858210952.7444951979113; Thu, 11 Jun 2026 02:07:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXbMp-0006Cx-Ho; Thu, 11 Jun 2026 05:06:27 -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 1wXbMk-0006CX-4G for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:06:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbMi-0005MS-4k for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:06:21 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-9mZrpGpoPY62YSBKbxjy0w-1; Thu, 11 Jun 2026 05:06:16 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B416F195D02B; Thu, 11 Jun 2026 09:06:14 +0000 (UTC) Received: from localhost (unknown [10.44.24.21]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5DAD731D2; Thu, 11 Jun 2026 09:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781168779; 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=PXp6IDcQDWTnCpWDPYd10qxyz4SzrMGhedvswMrxwag=; b=RahwR32w/1dApZHhU29WdQuV+KfwyGQ4aVeEH/qppeWDW7NBsrrRYbmoI8wi4BhQGPDjbC QVzgYnZxRzIXVHE8h8lErIGrIArdw4ntv4w1EfnTYv05kJn0gtLFlKPvKyvNqmzACnO38D kOA4KF3oEf5bHtHVsSBYRWsx8oTxO/w= X-MC-Unique: 9mZrpGpoPY62YSBKbxjy0w-1 X-Mimecast-MFC-AGG-ID: 9mZrpGpoPY62YSBKbxjy0w_1781168774 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Thu, 11 Jun 2026 13:03:44 +0400 Subject: [PATCH v3 29/35] ui/gtk: fix tab re-insertion order on window close MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260611-b4-ui-v3-29-72bcbbea0fae@redhat.com> References: <20260611-b4-ui-v3-0-72bcbbea0fae@redhat.com> In-Reply-To: <20260611-b4-ui-v3-0-72bcbbea0fae@redhat.com> To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Fabiano Rosas , Laurent Vivier , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Akihiko Odaki , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=2010; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=xP4Iks1pyzqBMR8iuAQ0TMhb5HtWj5rEEvbuyLR4l2o=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqKnnhKoe/4hRwzr6q0Ya9eLLtgN6CuZdQgnXlH Q/CIdneJ5+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaip54QAKCRDa6OEJdZac 5aEUEAC3qBpph5jTp3elbqk84Z0zRvVXMgXTiYBInFChBzal91/mJlgiRezxDDlQSLcHR5OJt31 BRlizjEi2Z/JxjjpVaQJSb+cd4Qlx8FdxYCUEUrWR1Vnr4Nf/l1rzstmggnmwTK0vTpNgoZisRN CL3MDBmU9sKNpgqe79PBOMXmBH9EM/Fx5XJ1kqnCwRtfKuKR91y8XDoDu3Ear04CXH9E/amJSi+ SnZs9bt/X8fSQVYjf/q3sMdlNy8zytOXlMm82F4GqVPNNRoPd8I9JrAyamxRd4A+Lkmw8e4Keyj 0od9awKREDW8aDeNS+AzvSVMQoUbjU47ZuOqN98Uf7KjgcEY8op4leZbhQmgsciUoqz8wBx481c QNo5PI79YH5KjIYjc/WIpq6mGQFmnH1Ga+YcvtYrXFdGz2oUGialhcD2HO2MZTHXJUaMS9AgR3h oUyvuN2MA/XqDgHOnHoZtsRBwwZr3rpdO+URoL3uYHWexR5qqPSDNJCCI5AjcLWsdfyZw1InBCu c1zmGBU5+5fB3KhvlG8wwkFHWnwPaHKAFMM1Ig+yOFhBXCtZvsBSXKfiyN5HMzIFDCRHCrIinst udXVRcDcRAzvmjTFKKCO9o5krTDJ6MJNeZYUq8ZrsqSpNlp4NzFFA2vedZquFvEHOeQDQrYdowe IkRpmyOcq1dYCdg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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 @redhat.com) X-ZM-MESSAGEID: 1781168858581158500 Add gd_vc_notebook_pos() which computes the correct notebook position for a console by counting only non-detached (non-windowed) tabs before it. Use it in gd_tab_window_close() so a re-attached tab is inserted at its logical position rather than appended at the end. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/gtk.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 929e4cf43f7..741f7bfe373 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1464,16 +1464,37 @@ static void gd_menu_show_tabs(GtkMenuItem *item, vo= id *opaque) gd_update_windowsize(vc); } =20 +static int gd_vc_notebook_pos(GtkDisplayState *s, VirtualConsole *target) +{ + int pos =3D 0; + guint i; + + for (i =3D 0; i < s->vcs->len; i++) { + VirtualConsole *vc =3D g_ptr_array_index(s->vcs, i); + if (vc =3D=3D target) { + return pos; + } + if (!vc->window) { + pos++; + } + } + g_assert_not_reached(); +} + static gboolean gd_tab_window_close(GtkWidget *widget, GdkEvent *event, void *opaque) { VirtualConsole *vc =3D opaque; GtkDisplayState *s =3D vc->s; + int page; =20 gtk_widget_set_sensitive(vc->menu_item, true); - gd_widget_reparent(vc->window, s->notebook, vc->tab_item); - gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(s->notebook), - vc->tab_item, vc->label); + g_object_ref(vc->tab_item); + gtk_container_remove(GTK_CONTAINER(vc->window), vc->tab_item); + page =3D gd_vc_notebook_pos(s, vc); + gtk_notebook_insert_page(GTK_NOTEBOOK(s->notebook), + vc->tab_item, gtk_label_new(vc->label), page); + g_object_unref(vc->tab_item); gtk_widget_destroy(vc->window); vc->window =3D NULL; #if defined(CONFIG_OPENGL) --=20 2.54.0