From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 234vJPzn8Wl9FQMAWB0awg (envelope-from ) for ; Wed, 29 Apr 2026 07:14:04 -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=l+8wNGtG; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=rUtH3BXA; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=l+8wNGtG; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=rUtH3BXA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 810FE1E0BA; Wed, 29 Apr 2026 07:14:04 -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 DC38C1E067 for ; Wed, 29 Apr 2026 07:14:02 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id C569D4BB24FA for ; Wed, 29 Apr 2026 11:14:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C569D4BB24FA 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=l+8wNGtG; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=rUtH3BXA; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=l+8wNGtG; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=rUtH3BXA Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id B5D8E4BB1C3C for ; Wed, 29 Apr 2026 11:13:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B5D8E4BB1C3C 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 B5D8E4BB1C3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777461208; cv=none; b=i2/uhVNCbGw/hsjG/HVLNRBV8RZVHqFY9BDmVjZoMLSRGs4333AtGA+T4FvwOYKpZAIxYl51tY2JrWXdc7531exxd1W7tzwVgAqUokZYCxMb/1wjYt7t2mrRXUqXQPpcsrCuy0Lv6Q7mkodTJEyDr2nXrLwtXfqNH+54jZGh84o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777461208; c=relaxed/simple; bh=BXhMqZ8wL7o09VgadGsLJBBNPe9YL0CUF05873nwHC0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=CXD6FXTay7cwH+NIm8S5J1qL8tdjVxQjcmSAKIySR1So/o1NMWnpsgP0wJI12LvEcMJrURcmlWvaAYkneY4+IBxrPTKDG8z8KSX9KR6hNiFn7novzeZ1Y4TUnp7tCklI1T9agZi4JM1rYE/yuV7EeFfFUvKNUnoXZ+XDfH/0iCc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5D8E4BB1C3C Received: from imap1.dmz-prg2.suse.org (unknown [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-out2.suse.de (Postfix) with ESMTPS id 8EB5B5BD41 for ; Wed, 29 Apr 2026 11:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777461206; 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=Vv+aetLayeCJgob8n2G/3UlFJG2YTdijFXhaQWYU+mM=; b=l+8wNGtGxFvUCFMiO7M5XLZ4NhIcPznFSbLMTgCUW58NT6//ZSVEkoOdBC3qKC/T6WB7Ia p5IV1xn2CiBw2qtd3ohYh4vXZQJgKfTJbZjnzZ7PAjtgeffp/Lu1bb90XUD2+BZ0ufTzeN tjM7Ubvr40cb7IKQqUSVstbh72xCMOc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777461206; 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=Vv+aetLayeCJgob8n2G/3UlFJG2YTdijFXhaQWYU+mM=; b=rUtH3BXAP9Gu6OxZCyOC5NhbATxNHHnl9/GdXFR6gxb73eNVtGLdGadUY6zcExjBeb1ocn OdmB2Jr4sIl6+kAA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777461206; 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=Vv+aetLayeCJgob8n2G/3UlFJG2YTdijFXhaQWYU+mM=; b=l+8wNGtGxFvUCFMiO7M5XLZ4NhIcPznFSbLMTgCUW58NT6//ZSVEkoOdBC3qKC/T6WB7Ia p5IV1xn2CiBw2qtd3ohYh4vXZQJgKfTJbZjnzZ7PAjtgeffp/Lu1bb90XUD2+BZ0ufTzeN tjM7Ubvr40cb7IKQqUSVstbh72xCMOc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777461206; 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=Vv+aetLayeCJgob8n2G/3UlFJG2YTdijFXhaQWYU+mM=; b=rUtH3BXAP9Gu6OxZCyOC5NhbATxNHHnl9/GdXFR6gxb73eNVtGLdGadUY6zcExjBeb1ocn OdmB2Jr4sIl6+kAA== 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 781C5593B2 for ; Wed, 29 Apr 2026 11:13:26 +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 UN4PHNbn8WlqIAAAD6G6ig (envelope-from ) for ; Wed, 29 Apr 2026 11:13:26 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 3/3] [gdb/tui] Allow second tui enable if first fails Date: Wed, 29 Apr 2026 13:13:25 +0200 Message-ID: <20260429111325.1600061-4-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260429111325.1600061-1-tdevries@suse.de> References: <20260429111325.1600061-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] 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 shell mode. Fix this by using reset_shell_mode instead. --- gdb/tui/tui.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index ea01448f087..ee967e1e38b 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -493,7 +493,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 ()) @@ -530,9 +530,21 @@ tui_enable (void) } catch (const gdb_exception &) { - endwin (); - delscreen (s); + /* Clean up screen. */ + clear (); + refresh (); + + /* Reset terminal to shell terminal mode. We can't use endwin here, + because afterwards the defer destructor might call doupdate, + restoring program terminal mode. */ + reset_shell_mode (); + + /* 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