/* Output generating routines for GDB CLI.
- Copyright (C) 1999-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2019 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
void
tui_ui_out::do_field_string (int fldno, int width, ui_align align,
- const char *fldname, const char *string)
+ const char *fldname, const char *string,
+ ui_out_style_kind style)
{
if (suppress_output ())
return;
+ m_start_of_line++;
+
if (fldname && m_line > 0 && strcmp (fldname, "fullname") == 0)
{
- m_start_of_line++;
- if (m_line > 0)
- {
- tui_show_source (string, m_line);
- }
+ tui_show_source (string, m_line);
return;
}
-
- m_start_of_line++;
- cli_ui_out::do_field_string (fldno, width, align, fldname, string);
+ cli_ui_out::do_field_string (fldno, width, align, fldname, string, style);
}
-/* This is the only field function that does not align. */
-
void
tui_ui_out::do_field_fmt (int fldno, int width, ui_align align,
const char *fldname, const char *format,
m_start_of_line++;
if (m_line > 0)
{
+ /* Printing a source line, so suppress regular output -- the
+ line was shown on the TUI's source window by tui_show_source
+ above instead. */
if (strchr (string, '\n') != 0)
- {
- m_line = -1;
- m_start_of_line = 0;
- }
+ {
+ /* We've reached the end of the line, so go back to letting
+ text output go to the console. */
+ m_line = 0;
+ m_start_of_line = 0;
+ }
return;
}
if (strchr (string, '\n'))
}
tui_ui_out::tui_ui_out (ui_file *stream)
-: cli_ui_out (stream, 0),
- m_line (0),
- m_start_of_line (-1)
+ : cli_ui_out (stream, 0)
{
}