From: Tom de Vries <tdevries@suse.de>
Date: Mon, 22 May 2023 09:38:08 +0000 (+0200)
Subject: [gdb/testsuite] Factor out Term::_reset_attrs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a01399ff21e35422868c3853a31811c301a73883;p=binutils-gdb.git

[gdb/testsuite] Factor out Term::_reset_attrs

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.
---

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
     }