From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6ZCMBCro8Wl9FQMAWB0awg (envelope-from ) for ; Wed, 29 Apr 2026 07:14:50 -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=Dj4NrmAx; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jYxl34d0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Dj4NrmAx; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jYxl34d0; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 0DDCF1E0BA; Wed, 29 Apr 2026 07:14:50 -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 54B471E067 for ; Wed, 29 Apr 2026 07:14:49 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 88EA84BB24D6 for ; Wed, 29 Apr 2026 11:14:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88EA84BB24D6 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=Dj4NrmAx; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jYxl34d0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Dj4NrmAx; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jYxl34d0 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id D5C274BB24F3 for ; Wed, 29 Apr 2026 11:13:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D5C274BB24F3 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 D5C274BB24F3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777461213; cv=none; b=DmcoNQMJ6I7Ouz/UyaznRRclDFwHsZm+MuAj77wzf2ARoSGQqw5lbUOgne2UN/xlw30CwPQdrWP6NMKWHBCcKuFwtE/roRxRYrtLH91q551cVS+HAgoKudsijBibJZa0oyGejPBiQBeY0DwRNs7L/6syYzuvEQRBB9mFjuAv8PM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777461213; c=relaxed/simple; bh=YSTy1lYx7+XbjNzbiwjsm2iOeQMUj+KCNTh377ZimLY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=EHzvIrtQu00SXnhOIT5Tl7Fufe1pBtzbFs7DPhgVtiF7yIqI5QOaSR83lqAddM53a56VUGmG1p7fEhXWwALIaKvDA7mZ0EALoS7A2Q7Ht0w5We6EfIrCUSUWGjgQ8G8lFH9OIJKceqOR1zBmPMwej9Fm65oVXwa6DmmjV5wmG4s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D5C274BB24F3 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-out1.suse.de (Postfix) with ESMTPS id 7473D6A866 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=s+gOg63CEHhvgeIo7a5qeEuyrkySdD5J+Lb/7L6I/m0=; b=Dj4NrmAx93L4Xoc7Zku61fA4rQZ9gG7cJ/fIot7v9oeGX1Ofgh8/dnrriwHj7FgB9myN7Z xS7Wpx+RAGpgzjVWy/CdVxX5Bxse1VmaiDtFZa7LiVa3uL7eU1gSHM76p+ltjusqgKBEFa dXiNIKkue1ktPk8YEMYTxIP64wmBVqs= 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=s+gOg63CEHhvgeIo7a5qeEuyrkySdD5J+Lb/7L6I/m0=; b=jYxl34d0eChtGlde8FkekE7aS7GdNMBXteUtssQ9qbqiP5eFaGUxkelY4GK0nR2Y3ljzWB ly10DJxMWtZjyUAw== Authentication-Results: smtp-out1.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=s+gOg63CEHhvgeIo7a5qeEuyrkySdD5J+Lb/7L6I/m0=; b=Dj4NrmAx93L4Xoc7Zku61fA4rQZ9gG7cJ/fIot7v9oeGX1Ofgh8/dnrriwHj7FgB9myN7Z xS7Wpx+RAGpgzjVWy/CdVxX5Bxse1VmaiDtFZa7LiVa3uL7eU1gSHM76p+ltjusqgKBEFa dXiNIKkue1ktPk8YEMYTxIP64wmBVqs= 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=s+gOg63CEHhvgeIo7a5qeEuyrkySdD5J+Lb/7L6I/m0=; b=jYxl34d0eChtGlde8FkekE7aS7GdNMBXteUtssQ9qbqiP5eFaGUxkelY4GK0nR2Y3ljzWB ly10DJxMWtZjyUAw== 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 5DC07593B0 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 oGCtFdbn8WlqIAAAD6G6ig (envelope-from ) for ; Wed, 29 Apr 2026 11:13:26 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/3] [gdb/tui] Factor out init_ncurses Date: Wed, 29 Apr 2026 13:13:24 +0200 Message-ID: <20260429111325.1600061-3-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)[-0.999]; 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 Factor out init_ncurses out of tui_enable, and make sure calling it twice is harmless. --- gdb/tui/tui.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 0cafd361878..ea01448f087 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -428,6 +428,34 @@ require_tui_terminal () #endif } +/* Initialize ncurses, if necessary. */ + +static SCREEN * +init_ncurses () +{ + static SCREEN *tui_screen = nullptr; + if (tui_screen != nullptr) + { + /* Init ncurses only once. */ + return tui_screen; + } + + tui_screen = newterm (nullptr, stdout, stdin); + +#ifdef __MINGW32__ + /* The MinGW port of ncurses requires $TERM to be unset in order + to activate the Windows console driver. */ + if (tui_screen == nullptr) + tui_screen = newterm ((char *) "unknown", stdout, stdin); +#endif + + if (tui_screen == nullptr) + error (_("Cannot enable the TUI: error opening terminal [TERM=%s]"), + gdb_getenv_term ()); + + return tui_screen; +} + /* Enter in the tui mode (curses). When in normal mode, it installs the tui hooks in gdb, redirects the gdb output, configures the readline to work in tui mode. @@ -454,7 +482,6 @@ tui_enable (void) else if (tui_finish_init == TRIBOOL_TRUE) { WINDOW *w; - SCREEN *s; /* If the top level interpreter is not the console/tui (e.g., MI), enabling curses will certainly lose. */ @@ -466,19 +493,9 @@ tui_enable (void) /* Don't try initialization again. */ tui_finish_init = TRIBOOL_UNKNOWN; - s = newterm (NULL, stdout, stdin); -#ifdef __MINGW32__ - /* The MinGW port of ncurses requires $TERM to be unset in order - to activate the Windows console driver. */ - if (s == NULL) - s = newterm ((char *) "unknown", stdout, stdin); -#endif - if (s == NULL) - { - error (_("Cannot enable the TUI: error opening terminal [TERM=%s]"), - gdb_getenv_term ()); - } + SCREEN *s = init_ncurses (); w = stdscr; + if (has_colors ()) { #ifdef HAVE_USE_DEFAULT_COLORS -- 2.51.0