/* Output generating routines for GDB CLI.
- Copyright (C) 1999-2018 Free Software Foundation, Inc.
+ Copyright (C) 1999-2021 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
#include "cli-out.h"
#include "completer.h"
#include "readline/readline.h"
+#include "cli/cli-style.h"
/* These are the CLI output functions */
if (m_suppress_output)
return;
- do_field_string (0, width, alignment, 0, col_hdr.c_str ());
+ do_field_string (0, width, alignment, 0, col_hdr.c_str (),
+ ui_file_style ());
}
/* Mark beginning of a list */
/* output an int field */
void
-cli_ui_out::do_field_int (int fldno, int width, ui_align alignment,
- const char *fldname, int value)
+cli_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
+ const char *fldname, LONGEST value)
{
if (m_suppress_output)
return;
- std::string str = string_printf ("%d", value);
+ do_field_string (fldno, width, alignment, fldname, plongest (value),
+ ui_file_style ());
+}
+
+/* output an unsigned field */
+
+void
+cli_ui_out::do_field_unsigned (int fldno, int width, ui_align alignment,
+ const char *fldname, ULONGEST value)
+{
+ if (m_suppress_output)
+ return;
- do_field_string (fldno, width, alignment, fldname, str.c_str ());
+ do_field_string (fldno, width, alignment, fldname, pulongest (value),
+ ui_file_style ());
}
/* used to omit a field */
if (m_suppress_output)
return;
- do_field_string (fldno, width, alignment, fldname, "");
+ do_field_string (fldno, width, alignment, fldname, "",
+ ui_file_style ());
}
/* other specific cli_field_* end up here so alignment and field
void
cli_ui_out::do_field_string (int fldno, int width, ui_align align,
- const char *fldname, const char *string)
+ const char *fldname, const char *string,
+ const ui_file_style &style)
{
int before = 0;
int after = 0;
spaces (before);
if (string)
- fputs_filtered (string, m_streams.back ());
+ {
+ if (test_flags (unfiltered_output))
+ fputs_styled_unfiltered (string, style, m_streams.back ());
+ else
+ fputs_styled (string, style, m_streams.back ());
+ }
if (after)
spaces (after);
void
cli_ui_out::do_field_fmt (int fldno, int width, ui_align align,
- const char *fldname, const char *format,
- va_list args)
+ const char *fldname, const ui_file_style &style,
+ const char *format, va_list args)
{
if (m_suppress_output)
return;
std::string str = string_vprintf (format, args);
- do_field_string (fldno, width, align, fldname, str.c_str ());
+ do_field_string (fldno, width, align, fldname, str.c_str (), style);
}
void
if (m_suppress_output)
return;
- print_spaces_filtered (numspaces, m_streams.back ());
+ if (test_flags (unfiltered_output))
+ print_spaces (numspaces, m_streams.back ());
+ else
+ print_spaces_filtered (numspaces, m_streams.back ());
}
void
if (m_suppress_output)
return;
- fputs_filtered (string, m_streams.back ());
+ if (test_flags (unfiltered_output))
+ fputs_unfiltered (string, m_streams.back ());
+ else
+ fputs_filtered (string, m_streams.back ());
}
void
-cli_ui_out::do_message (const char *format, va_list args)
+cli_ui_out::do_message (const ui_file_style &style,
+ const char *format, va_list args)
{
if (m_suppress_output)
return;
- vfprintf_unfiltered (m_streams.back (), format, args);
+ /* Use the "no_gdbfmt" variant here to avoid recursion.
+ vfprintf_styled calls into cli_ui_out::message to handle the
+ gdb-specific printf formats. */
+ vfprintf_styled_no_gdbfmt (m_streams.back (), style,
+ !test_flags (unfiltered_output), format, args);
}
void
m_streams.pop_back ();
}
+/* The cli_ui_out::do_progress_* functions result in the following:
+ - printed for tty, SHOULD_PRINT == true:
+ <NAME
+ [##### ]\r>
+ - printed for tty, SHOULD_PRINT == false:
+ <>
+ - printed for not-a-tty:
+ <NAME...
+ >
+*/
+
+void
+cli_ui_out::do_progress_start (const std::string &name, bool should_print)
+{
+ struct ui_file *stream = m_streams.back ();
+ cli_progress_info meter;
+
+ meter.last_value = 0;
+ meter.name = name;
+ if (!stream->isatty ())
+ {
+ fprintf_unfiltered (stream, "%s...", meter.name.c_str ());
+ gdb_flush (stream);
+ meter.printing = WORKING;
+ }
+ else
+ {
+ /* Don't actually emit anything until the first call notifies us
+ of progress. This makes it so a second progress message can
+ be started before the first one has been notified, without
+ messy output. */
+ meter.printing = should_print ? START : NO_PRINT;
+ }
+
+ m_meters.push_back (std::move (meter));
+}
+
+void
+cli_ui_out::do_progress_notify (double howmuch)
+{
+ struct ui_file *stream = m_streams.back ();
+ cli_progress_info &meter (m_meters.back ());
+
+ if (meter.printing == NO_PRINT)
+ return;
+
+ if (meter.printing == START)
+ {
+ fprintf_unfiltered (stream, "%s\n", meter.name.c_str ());
+ gdb_flush (stream);
+ meter.printing = WORKING;
+ }
+
+ if (meter.printing == WORKING && howmuch >= 1.0)
+ return;
+
+ if (!stream->isatty ())
+ return;
+
+ int chars_per_line = get_chars_per_line ();
+ if (chars_per_line > 0)
+ {
+ int i, max;
+ int width = chars_per_line - 3;
+
+ max = width * howmuch;
+ fprintf_unfiltered (stream, "\r[");
+ for (i = 0; i < width; ++i)
+ fprintf_unfiltered (stream, i < max ? "#" : " ");
+ fprintf_unfiltered (stream, "]");
+ gdb_flush (stream);
+ meter.printing = PROGRESS;
+ }
+}
+
+void
+cli_ui_out::do_progress_end ()
+{
+ struct ui_file *stream = m_streams.back ();
+ cli_progress_info &meter = m_meters.back ();
+
+ if (!stream->isatty ())
+ {
+ fprintf_unfiltered (stream, "\n");
+ gdb_flush (stream);
+ }
+ else if (meter.printing == PROGRESS)
+ {
+ int i;
+ int width = get_chars_per_line () - 3;
+
+ fprintf_unfiltered (stream, "\r");
+ for (i = 0; i < width + 2; ++i)
+ fprintf_unfiltered (stream, " ");
+ fprintf_unfiltered (stream, "\r");
+ gdb_flush (stream);
+ }
+
+ m_meters.pop_back ();
+}
+
/* local functions */
void
cli_ui_out::field_separator ()
{
- fputc_filtered (' ', m_streams.back ());
+ if (test_flags (unfiltered_output))
+ fputc_unfiltered (' ', m_streams.back ());
+ else
+ fputc_filtered (' ', m_streams.back ());
}
/* Constructor for cli_ui_out. */
return old;
}
+bool
+cli_ui_out::can_emit_style_escape () const
+{
+ return m_streams.back ()->can_emit_style_escape ();
+}
+
/* CLI interface to display tab-completion matches. */
/* CLI version of displayer.crlf. */
projects / deliverable / binutils-gdb.git / blobdiff