From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id E2C1C3858D20 for ; Mon, 22 May 2023 09:38:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E2C1C3858D20 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 imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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-out1.suse.de (Postfix) with ESMTPS id 276DA21995 for ; Mon, 22 May 2023 09:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684748328; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Vjtv8b0A5b1RB2CMeaqEEXriCuCByNPN7FUNiFJk0kE=; b=DKLTsPdNvUbbUVhX75+hYYqTlD1njKyaF/DaUDPPhKaVvzBLj//8VpQfoP/S2oYKbze4Ns vdbRn0vVKr9Kn+P70yG3rXdJa8osU3I/5R+APCDIXUOWrhD610QWCjhFcZkOPxSa1uYmnD m+wUjgPXy1WxPOUYPV1/7pkgh5g1+8E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684748328; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Vjtv8b0A5b1RB2CMeaqEEXriCuCByNPN7FUNiFJk0kE=; b=yQg8ss+O/3UXAlIc0tiHuAi26oua5V9m5fqweK+KMgcu9s8/sb95qzxmqyC7eeWpQNxrgv pCZtdBae31MjnaBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (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 imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0903313336 for ; Mon, 22 May 2023 09:38:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Wg0WASg4a2TndwAAMHmgww (envelope-from ) for ; Mon, 22 May 2023 09:38:48 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Factor out Term::_reset_attrs Date: Mon, 22 May 2023 11:38:49 +0200 Message-Id: <20230522093849.24249-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 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: Factor out new proc Term::_reset_attrs. Tested by re-running the TUI test-cases (gdb.tui/*.exp and gdb.python/tui*.exp) on x86_64-linux. --- gdb/testsuite/lib/tuiterm.exp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index 64a883e89a3..361fce83a79 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -547,6 +547,18 @@ namespace eval Term { } } + # Reset the attributes in attributes array UPVAR_NAME to the default values. + proc _reset_attrs { upvar_name } { + upvar $upvar_name var + array set var { + intensity normal + fg default + bg default + underline 0 + reverse 0 + } + } + # Select Graphic Rendition. # # https://vt100.net/docs/vt510-rm/SGR.html @@ -557,11 +569,7 @@ namespace eval Term { foreach item $args { switch -exact -- $item { "" - 0 { - set _attrs(intensity) normal - set _attrs(fg) default - set _attrs(bg) default - set _attrs(underline) 0 - set _attrs(reverse) 0 + _reset_attrs _attrs } 1 { set _attrs(intensity) bold @@ -666,13 +674,7 @@ namespace eval Term { set _cur_col 0 set _cur_row 0 set _resize_count 0 - array set _attrs { - intensity normal - fg default - bg default - underline 0 - reverse 0 - } + _reset_attrs _attrs _clear_lines 0 $_rows } base-commit: bc227f4ccb0778a56ca3d9f27652fd9e5e2747ea -- 2.35.3