FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reset terminal styles

Browse source 
This adds a function that can be used to reset terminal styles,
regardless of what style the low-level output routines currently think
is applied.

This is used to make "echo" and "printf" work properly when emitting
ANSI terminal escapes -- now gdb will reset the style at the end of
the command.

gdb/ChangeLog
2018-12-28  Tom Tromey  <tom@tromey.com>

	* utils.h (reset_terminal_style): Declare.
	* utils.c (can_emit_style_escape): New function.
	(set_output_style): Use it.
	(reset_terminal_style): New function.
	* printcmd.c (printf_command): Call reset_terminal_style.
	* cli/cli-cmds.c (echo_command): Call reset_terminal_style.
This commit is contained in:
Tom Tromey 2018-11-17 11:49:25 -07:00
parent cbe5657196
commit ef1dfa3644
5 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

39
gdb/utils.c
View file

@ -1444,25 +1444,50 @@ emit_style_escape (const ui_file_style &style)
wrap_buffer.append (style.to_ansi ());
}
/* Return true if ANSI escapes can be used on STREAM. */
static bool
can_emit_style_escape (struct ui_file *stream)
{
if (stream != gdb_stdout
|| !cli_styling
|| !ui_file_isatty (stream))
return false;
const char *term = getenv ("TERM");
if (term == nullptr || !strcmp (term, "dumb"))
return false;
return true;
}
/* Set the current output style. This will affect future uses of the
_filtered output functions. */
static void
set_output_style (struct ui_file *stream, const ui_file_style &style)
{
if (stream != gdb_stdout
|| !cli_styling
|| style == desired_style
|| !ui_file_isatty (stream))
return;
const char *term = getenv ("TERM");
if (term == nullptr || !strcmp (term, "dumb"))
if (!can_emit_style_escape (stream)
|| style == desired_style)
return;
desired_style = style;
emit_style_escape (style);
}
/* See utils.h. */
void
reset_terminal_style (struct ui_file *stream)
{
if (can_emit_style_escape (stream))
{
/* Force the setting, regardless of what we think the setting
might already be. */
desired_style = ui_file_style ();
applied_style = desired_style;
wrap_buffer.append (desired_style.to_ansi ());
}
}
/* Wait, so the user can read what's on the screen. Prompt the user
to continue by pressing RETURN. 'q' is also provided because
telling users what to do in the prompt is more user-friendly than