From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id MQMHAm6xAWp0vi8AWB0awg (envelope-from ) for ; Mon, 11 May 2026 06:37:34 -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=whkiNrWY; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=o20fBKXW; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=nkzBq2wc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Hn5k1Ayr; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id ECE811E0C3; Mon, 11 May 2026 06:37:33 -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 560531E093 for ; Mon, 11 May 2026 06:37:32 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE6B14BABF2D for ; Mon, 11 May 2026 10:37:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EE6B14BABF2D 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=whkiNrWY; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=o20fBKXW; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=nkzBq2wc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Hn5k1Ayr Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id EF1D44BA79AB for ; Mon, 11 May 2026 10:36:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF1D44BA79AB 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 EF1D44BA79AB 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=1778495770; cv=none; b=dqHu4guJ69IhCHpsGRUWSylDup9X8ada7M9g0CoS4cYrnV+BonGvKybTYAtPLQoFzhJVFUw/j49LMUGYONiFwA5n3A3jZ7Bi+frkVBo4DCP/WMFqs5F/AdreQygU7ZwXroXUNhx7s/dmgPH6eZ9nlzC+L7ry6EDEdUoajNlDm9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778495770; c=relaxed/simple; bh=hnuAiP1ALb+JzED0GbGjcz3Wb3Aim/UWrpMVHrVFVMY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=qyHObawNpLz7uqYGY8ON97wNBr76H1nj8kAysivyWCiw5JTBNgkcrhFj0114tESsIilxHtdIdZ88QAxqMTa4Htz7csv4AGoR5gFEs/I6G8q7jEQoSwuZ6nU3NkRG399Y+DAqXv1pLBQZD7zZWgArY48SX0CCRLhzPBFhH6Yb63Q= 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=whkiNrWY; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=o20fBKXW; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=nkzBq2wc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Hn5k1Ayr DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EF1D44BA79AB 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 A67B761849 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=aNeCLIYj1YzndUJy2Y1e6NKnlZcABWDjiWQda0a12ms=; b=whkiNrWYxgXGQnmk4FJZVNaNCPpwvLiYYZYT+VVG793gIE+DatmGSSOhLTicqzLQtq4IWz YixWWqA6VWxcFkvVwP3by7KmlAIom0QLdZ4C8PBjiUXBlFGFqQgOKKgpFz1iMxbXBb2o9o ZH+RXCvooCIA7oZFOuVl/uqjfVh29t8= 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=aNeCLIYj1YzndUJy2Y1e6NKnlZcABWDjiWQda0a12ms=; b=o20fBKXWYW4MeytwnZxwRLBGfazHei3lD+guWtcu9TzRnmrx7/qTw7uX0hbiS0WGJvxLDM fh1Lky2e0vNTi3Bw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=nkzBq2wc; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Hn5k1Ayr 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=aNeCLIYj1YzndUJy2Y1e6NKnlZcABWDjiWQda0a12ms=; b=nkzBq2wc9Ztx2FT6Ac/YwMBD9bdL69Q2pBh7+kFN9smxzQJdQ7b/cAK+GvmyfXdh8/JyBs xOEu1l49fc/arzLAmr+G5bMdzZVx5oAYYsiGAD0rszRxnJKypzJU2fCo+oamYwtaZn44Hh 8fMnX5gZ+w8RwxA/LYTPOOm0z8CmKag= 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=aNeCLIYj1YzndUJy2Y1e6NKnlZcABWDjiWQda0a12ms=; b=Hn5k1AyrhmG0S3wO25PfUu75QMIteFAE8vycNI02KnaEl6HSyA9qefAy5fBITTK1aohM28 lx0uhBWEBBAaacAg== 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 90285593AA 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 CGLYIQaxAWqEcwAAD6G6ig (envelope-from ) for ; Mon, 11 May 2026 10:35:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 1/3] [gdb/tui] Factor out require_tui_terminal Date: Mon, 11 May 2026 12:35:47 +0200 Message-ID: <20260511103549.2641036-2-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)[suse.de:mid,suse.de:dkim,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; 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-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: A67B761849 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 I noticed this bit of code in tui_enable: ... /* Check required terminal capabilities. The MinGW port of ncurses does have them, but doesn't expose them through "cup". */ cap = tigetstr ((char *) "cup"); if (cap == NULL || cap == (char *) -1 || *cap == '\0') { endwin (); delscreen (s); error (_("Cannot enable the TUI: " "terminal doesn't support cursor addressing [TERM=%s]"), gdb_getenv_term ()); } ... At this point in tui_enable, we need endwin and delscreen to clean up after newterm, but the check can be done before newterm. Fix this by factoring out a new function require_tui_terminal, and moving the code there. --- gdb/tui/tui.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index de2faa36af7..c1457e148a2 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -406,6 +406,28 @@ require_tui_interpreter () interp); } +/* Error out if the terminal doesn't support TUI. */ + +static void +require_tui_terminal () +{ + /* Don't try to setup curses (and print funny control + characters) if we're not outputting to a terminal. */ + if (!gdb_stderr->isatty ()) + error (_("Cannot enable the TUI when output is not a terminal")); + + /* Check required terminal capabilities. The MinGW port of + ncurses does have them, but doesn't expose them through "cup". */ +#ifndef __MINGW32__ + const char *cap = tigetstr ((char *) "cup"); + const char *not_a_string_capability = (char *) -1; + if (cap == nullptr || cap == not_a_string_capability || *cap == '\0') + error (_("Cannot enable the TUI: " + "terminal doesn't support cursor addressing [TERM=%s]"), + gdb_getenv_term ()); +#endif +} + /* 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. @@ -434,18 +456,13 @@ tui_enable (void) { WINDOW *w; SCREEN *s; -#ifndef __MINGW32__ - const char *cap; -#endif /* If the top level interpreter is not the console/tui (e.g., MI), enabling curses will certainly lose. */ require_tui_interpreter (); - /* Don't try to setup curses (and print funny control - characters) if we're not outputting to a terminal. */ - if (!gdb_stderr->isatty ()) - error (_("Cannot enable the TUI when output is not a terminal")); + /* Require a terminal that supports TUI. */ + require_tui_terminal (); /* Don't try initialization again. */ tui_finish_init = TRIBOOL_UNKNOWN; @@ -473,20 +490,6 @@ tui_enable (void) start_color (); } - /* Check required terminal capabilities. The MinGW port of - ncurses does have them, but doesn't expose them through "cup". */ -#ifndef __MINGW32__ - cap = tigetstr ((char *) "cup"); - if (cap == NULL || cap == (char *) -1 || *cap == '\0') - { - endwin (); - delscreen (s); - error (_("Cannot enable the TUI: " - "terminal doesn't support cursor addressing [TERM=%s]"), - gdb_getenv_term ()); - } -#endif - /* We must mark the tui sub-system active before trying to setup the current layout as tui windows defined by an extension language rely on this flag being true in order to know that the window -- 2.51.0