From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UdeQH1OxAWpFvi8AWB0awg (envelope-from ) for ; Mon, 11 May 2026 06:37:07 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=anIwwifU; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1vE74Prz; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=THyQ42hC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=TS+9pKU+; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 488C51E0CA; Mon, 11 May 2026 06:37:07 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 636A71E0BA for ; Mon, 11 May 2026 06:37:05 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CF6454BA23DF for ; Mon, 11 May 2026 10:37:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF6454BA23DF Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=anIwwifU; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1vE74Prz; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=THyQ42hC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=TS+9pKU+ Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id ACFE74BA7981 for ; Mon, 11 May 2026 10:35:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACFE74BA7981 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ACFE74BA7981 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778495755; cv=none; b=A32HxZik0L6a9LfNsSI//4kw/FjaM+utosFD8MxpQhSeluHhWl/s62pNhb/2OvPPCkyD6CA0/gNPPg4p6u5J1bjwbd79uLPawxnKUQYuePQgo8JsNY+KckTQpfthCLmOUxdPqNaET5NiUCIbY9Q6N357gtTN2vE8cdUInYEvht4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778495755; c=relaxed/simple; bh=QF9YuW2VOXJqqwlMeyahdjaGXrplhvLLtcdog5rTHuI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=sDGcIZYyWIi4koEd+R3PUOsKt1B66ciSSkwcQQeJtaIvpEhdjRHtdKHqqR6prTb6/Fz8OfxG34ERP0KN2zfHeONfUZNnxS6sqzqY9cgUtgLoMvpY9LufcwAhLegFLNjRb1X6kn6bYp41oLrlaY030thLdrleZW0R/d2Juzuc21Q= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=anIwwifU; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1vE74Prz; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=THyQ42hC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=TS+9pKU+ DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ACFE74BA7981 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E56DD6C245 for ; Mon, 11 May 2026 10:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1778495754; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dep56k2y7k74WgMMeWWFi2C61WciEyv5AwTr40lW8eE=; b=anIwwifUwO8vqGgv/7q7FdZA4rT7b1WhkVwcEXHSC360vc4qTDP+c76yhTlmniy1cBWyjp TAauFNAdl5uqL9ED3hWRWkx+O1OmkTCRJU/8fVx42gCKnrw2CkcfFY58LTpP8ayo/yuKkl u0+8tF1DAOXbDl/DT/I9qzAjyhsA6VI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1778495754; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dep56k2y7k74WgMMeWWFi2C61WciEyv5AwTr40lW8eE=; b=1vE74Prz49/YUPP1bt7R64/fI9zWbeR/ciCR3guEtC6mtsCXeO+1caK+ISu3DobEfd+98Z uHQaUEFFWw+3dKAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=THyQ42hC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=TS+9pKU+ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1778495750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dep56k2y7k74WgMMeWWFi2C61WciEyv5AwTr40lW8eE=; b=THyQ42hCnIcDAr/BpoRX6BUySVlFFkQrOVmfESjBf6crHVxCI0N2u4vfFDQz7zAwiLzFsD W1+TOP8ViYw6UyPAme+gGKe1usE5er3diMPwq2X2tIoLUa+TUON9jGkbxtZmqX6rlkdz/G ks1Rugwu32QPhUXbt4rkCf1tCzukc+0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1778495750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dep56k2y7k74WgMMeWWFi2C61WciEyv5AwTr40lW8eE=; b=TS+9pKU+Kg2IJFdLW7+dhvqprJL3qnUVYJQ20dMXAe3wbh6y9KSXFIvFSHQnYHjsaSZkt1 jkf+u8v7x8fYcKBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CA662593AC for ; Mon, 11 May 2026 10:35:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sEwAMAaxAWqEcwAAD6G6ig (envelope-from ) for ; Mon, 11 May 2026 10:35:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 3/3] [gdb/tui] Allow second tui enable if first fails Date: Mon, 11 May 2026 12:35:49 +0200 Message-ID: <20260511103549.2641036-4-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260511103549.2641036-1-tdevries@suse.de> References: <20260511103549.2641036-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:mid]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: E56DD6C245 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Commit fb23d7ba4a2 ("[gdb/tui] Handle error in tui_enable") handles a particular error during tui_enable, but doesn't allow trying to enable TUI again. I tried to get this to work, but didn't manage because I didn't understand the interaction between endwin and the "tui_batch_rendering defer" destructor: - first endwin restores the shell terminal mode - then the defer destructor calls doupdate, restoring program terminal mode. Fix this by checking for tui_active in ~tui_batch_rendering. --- gdb/tui/tui-wingeneral.c | 2 +- gdb/tui/tui.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 86f13d275b4..149ca4efc6e 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -46,7 +46,7 @@ tui_batch_rendering::tui_batch_rendering () tui_batch_rendering::~tui_batch_rendering () { suppress_output = m_saved_suppress; - if (!suppress_output) + if (!suppress_output && tui_active) doupdate (); } diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 11bcba813bc..958fc47b7b6 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -494,7 +494,7 @@ tui_enable (void) /* Don't try initialization again. */ tui_finish_init = TRIBOOL_UNKNOWN; - SCREEN *s = init_ncurses (); + init_ncurses (); w = stdscr; if (has_colors ()) @@ -532,8 +532,13 @@ tui_enable (void) catch (const gdb_exception &) { endwin (); - delscreen (s); + + /* Initialization failed, so TUI is not active. */ tui_active = false; + + /* Allow trying to initialize TUI again. */ + tui_finish_init = TRIBOOL_TRUE; + throw; } -- 2.51.0