From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 9A6F5385843E for ; Fri, 26 May 2023 13:02:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9A6F5385843E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CB3411FD66 for ; Fri, 26 May 2023 13:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1685106168; 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=sTmmeyOiaZ7Ir4mlryS6T8Siz6p3FpPUHMMIVpO//7g=; b=FxoDha/H6QO9rKRfg3uSJ2YtRmOlrHitf8mC9O8DVT1pGR0rmrHpPBOL03xeO7Woix0AZY yUjLT18WamAD5/IuLME5jpF/YVaaIQUk0TmczPwZcTm7QHyZDjpwOT+GuYxps25OUgUehN t+hdCUwvDJiZVMpeBkJIY2As8pc5bvk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1685106168; 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=sTmmeyOiaZ7Ir4mlryS6T8Siz6p3FpPUHMMIVpO//7g=; b=zWZKwvowr0qv6Cz9p0ilLdrDFU1rdvL2IvkI87FISl38mLW+ULxwZkRKtPP6VpQgtb7Sa7 04UNmFPBwqksInBw== Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id BA0F613684 for ; Fri, 26 May 2023 13:02:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id kKdkLPitcGRHYAAAGKfGzw (envelope-from ) for ; Fri, 26 May 2023 13:02:48 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 3/3] [gdb/testsuite] Add test-case gdb.tui/color-prompt.exp Date: Fri, 26 May 2023 15:03:00 +0200 Message-Id: <20230526130300.20974-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230526130300.20974-1-tdevries@suse.de> References: <20230526130300.20974-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Add a test-case that sets a prompt with color in TUI. The line containing the prompt is shown by get_line_with_attrs as follows: ... (gdb) ... The 31 means red, but only for foreground colors, for background colors 41 means red. Make this more readable by using color names for both foreground and background, such that we have instead: .... (gdb) ... Tested on x86_64-linux. --- gdb/testsuite/gdb.tui/color-prompt.exp | 32 +++++++++++++++++++++++ gdb/testsuite/gdb.tui/tuiterm.exp | 24 +++++++++++++++++- gdb/testsuite/lib/tuiterm.exp | 35 ++++++++++++++++++++++++-- 3 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 gdb/testsuite/gdb.tui/color-prompt.exp diff --git a/gdb/testsuite/gdb.tui/color-prompt.exp b/gdb/testsuite/gdb.tui/color-prompt.exp new file mode 100644 index 00000000000..8482e1b7695 --- /dev/null +++ b/gdb/testsuite/gdb.tui/color-prompt.exp @@ -0,0 +1,32 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check using a prompt with color in TUI. + +tuiterm_env + +Term::clean_restart 24 80 + +# Set colored prompt. +if {![Term::enter_tui]} { + unsupported "TUI not supported" + return +} + +Term::command "set prompt \\033\[31m(gdb) \\033\[0m" + +set line [Term::get_line_with_attrs $Term::_cur_row] +gdb_assert { [regexp "^$gdb_prompt *$" $line] } \ + "prompt with color" diff --git a/gdb/testsuite/gdb.tui/tuiterm.exp b/gdb/testsuite/gdb.tui/tuiterm.exp index bccb7ef445a..c1751418130 100644 --- a/gdb/testsuite/gdb.tui/tuiterm.exp +++ b/gdb/testsuite/gdb.tui/tuiterm.exp @@ -699,8 +699,30 @@ proc test_attrs {} { 5 1 25 0 } + fg { + 30 black + 31 red + 32 green + 33 yellow + 34 blue + 35 magenta + 36 cyan + 37 white + 39 default + } + bg { + 40 black + 41 red + 42 green + 43 yellow + 44 blue + 45 magenta + 46 cyan + 47 white + 49 default + } } { - setup_terminal 8 1 + setup_terminal 12 1 set re "" foreach { arg val } $vals { Term::_insert "a" diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index 90b885d7ab4..b7c877593b7 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -561,6 +561,37 @@ namespace eval Term { } } + # Translate the color numbers as used in proc _csi_m to a name. + proc _color_attr { n } { + switch -exact -- $n { + 0 { + return black + } + 1 { + return red + } + 2 { + return green + } + 3 { + return yellow + } + 4 { + return blue + } + 5 { + return magenta + } + 6 { + return cyan + } + 7 { + return white + } + default { error "unsupported color number: $n" } + } + } + # Select Graphic Rendition. # # https://vt100.net/docs/vt510-rm/SGR.html @@ -607,13 +638,13 @@ namespace eval Term { set _attrs(invisible) 0 } 30 - 31 - 32 - 33 - 34 - 35 - 36 - 37 { - set _attrs(fg) $item + set _attrs(fg) [_color_attr [expr $item - 30]] } 39 { set _attrs(fg) default } 40 - 41 - 42 - 43 - 44 - 45 - 46 - 47 { - set _attrs(bg) $item + set _attrs(bg) [_color_attr [expr $item - 40]] } 49 { set _attrs(bg) default -- 2.35.3