From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id J0qzGUGxAWpFvi8AWB0awg (envelope-from ) for ; Mon, 11 May 2026 06:36:49 -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=zblGZgaS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=fv3W/9Gv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lGWrogIS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FnBA+MnZ; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 44BEC1E0C3; Mon, 11 May 2026 06:36:49 -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 EDBC41E093 for ; Mon, 11 May 2026 06:36:47 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7356C4BA9006 for ; Mon, 11 May 2026 10:36:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7356C4BA9006 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=zblGZgaS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=fv3W/9Gv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lGWrogIS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FnBA+MnZ Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 89BB24BA7980 for ; Mon, 11 May 2026 10:35:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89BB24BA7980 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 89BB24BA7980 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778495755; cv=none; b=gsgbRBTwIQFaLyMusmAzXll8BRHYC3zHxwasCQkKYJ3I4B1wOlM9xiMwWqe2Ss04WqzXcGWmztg8OPzhUnQ7HovkpcoVrugexN7+tMmLnTWu6F0s6gZOb4VAvIrSvxwbqOfxujFbuT7Dy1uFZ73nKqrWeV4+Mt1eD5us9IgWEdk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778495755; c=relaxed/simple; bh=X+PPFw6m4h8rDoSmrOrtceHfINFG72u4fYM61clQroE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=rtuairnuGd9mOB2Zw+V7C17c5H6nlisYN91ZgCj1Wu2IgN8+kzH7eNP9U8IkDXiE9HymRcqN8KBKR+6AyZPl+gqHo2nnIPDs2MR4Em3K5SVxI2wqe535L208d3vPI46szCmBnjO+E72waJ7/Ro6Yvp/Z6Rgf5OCKX2AJJ4XevQ8= 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=zblGZgaS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=fv3W/9Gv; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lGWrogIS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FnBA+MnZ DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89BB24BA7980 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 C8446686CC 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=wLpOAsYAsHMF66dtk+bjAvagfVbmKWcGVEVe+k0YQcM=; b=zblGZgaSLvEYhk1J6X/SOG85FRp41mv1Q2S6uqB60T4ZoP7hlCFiOxFuFTWScb0JJhs9EC ymi8207txpscJwQ2XGnK7bsN3gO2yFOd2ELLN8TzA9TykQnwj0mFIU+nLSw76CbJD1iPwX qdkC8OeFQj+bSgF+AYJBDYumUfzwBXY= 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=wLpOAsYAsHMF66dtk+bjAvagfVbmKWcGVEVe+k0YQcM=; b=fv3W/9Gv0zrBxBNnBI6IFeUjS4LdqZOF3GHy6Lg8VP7F6RpW3D96HxSyCBOFyiDEWf6RGt XkaSExWT+3ySGjBQ== Authentication-Results: smtp-out2.suse.de; none 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=wLpOAsYAsHMF66dtk+bjAvagfVbmKWcGVEVe+k0YQcM=; b=lGWrogISIlOA+Zxl6v67ljiY95V8YtChV8sw/Wh8ipLGFfffcFbLETl9uCBIDy/19ruDlF +9E7HDeJcERS+X0B8+OLAQlKYaBVUXp70iocksm1BzE9aSqnwdfNcQEHkvc6UUpkhfUmrv R1BuVmdXrPOe0RtVGiYC2QF/ufPUrc4= 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=wLpOAsYAsHMF66dtk+bjAvagfVbmKWcGVEVe+k0YQcM=; b=FnBA+MnZIb2wayuXKSGddghCjsKlBdW7ncY2RPppLjKlXodUPWgjepPcHFb0oGoEwW+V++ rDNpooCW36swbsBQ== 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 AE0D7593AB 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 cBcEKQaxAWqEcwAAD6G6ig (envelope-from ) for ; Mon, 11 May 2026 10:35:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/3] [gdb/tui] Factor out init_ncurses Date: Mon, 11 May 2026 12:35:48 +0200 Message-ID: <20260511103549.2641036-3-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-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; 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)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; 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 c1457e148a2..11bcba813bc 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. @@ -455,7 +483,6 @@ tui_enable (void) 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. */ @@ -467,19 +494,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