tui/tui-io.c \
tui/tui-layout.c \
tui/tui-location.c \
- tui/tui-out.c \
tui/tui-regs.c \
tui/tui-source.c \
tui/tui-status.c \
tui/tui-io.h \
tui/tui-layout.h \
tui/tui-location.h \
- tui/tui-out.h \
tui/tui-regs.h \
tui/tui-source.h \
tui/tui-status.h \
styled_string (file_name_style.style (), filename),
safe_strerror (errcode));
}
- else
+ else if (uiout->is_mi_like_p () || uiout->test_flags (ui_source_list))
{
+ /* CLI expects only the "file" field. MI expects both
+ fields. ui_source_list is set only for CLI, not for
+ TUI. */
+
uiout->field_signed ("line", line);
uiout->text ("\tin ");
- /* CLI expects only the "file" field. TUI expects only the
- "fullname" field (and TUI does break if "file" is printed).
- MI expects both fields. ui_source_list is set only for CLI,
- not for TUI. */
- if (uiout->is_mi_like_p () || uiout->test_flags (ui_source_list))
- uiout->field_string ("file", symtab_to_filename_for_display (s),
- file_name_style.style ());
- if (uiout->is_mi_like_p () || !uiout->test_flags (ui_source_list))
+ uiout->field_string ("file", symtab_to_filename_for_display (s),
+ file_name_style.style ());
+ if (uiout->is_mi_like_p ())
{
const char *s_fullname = symtab_to_fullname (s);
- char *local_fullname;
-
- /* ui_out_field_string may free S_FULLNAME by calling
- open_source_file for it again. See e.g.,
- tui_field_string->tui_show_source. */
- local_fullname = (char *) alloca (strlen (s_fullname) + 1);
- strcpy (local_fullname, s_fullname);
-
- uiout->field_string ("fullname", local_fullname);
+ uiout->field_string ("fullname", s_fullname);
}
uiout->text ("\n");
Term::command "set pagination off"
Term::command "start"
Term::command "next"
+Term::check_contents "next does not show source line" \
+ "\\(gdb\\) next *\n\\(gdb\\)"
Term::command "step"
Term::check_contents "checking if inside f2 ()" "f2 \\(x=4\\)"
Term::check_box_contents "f2.c must be displayed in source window" \
#include "tui/tui-win.h"
#include "tui/tui-wingeneral.h"
#include "tui/tui-file.h"
-#include "tui/tui-out.h"
#include "ui-out.h"
#include "cli-out.h"
#include <fcntl.h>
tui_stdout = new pager_file (new tui_file (stdout, true));
tui_stderr = new tui_file (stderr, false);
tui_stdlog = new timestamped_file (tui_stderr);
- tui_out = new tui_ui_out (tui_stdout);
+ tui_out = new cli_ui_out (tui_stdout, 0);
/* Create the default UI. */
tui_old_uiout = new cli_ui_out (gdb_stdout);
+++ /dev/null
-/* Output generating routines for GDB CLI.
-
- Copyright (C) 1999-2024 Free Software Foundation, Inc.
-
- Contributed by Cygnus Solutions.
- Written by Fernando Nasser for Cygnus.
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "defs.h"
-#include "ui-out.h"
-#include "tui-out.h"
-#include "tui.h"
-
-/* Output an int field. */
-
-void
-tui_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
- const char *fldname, LONGEST value)
-{
- if (suppress_output ())
- return;
-
- /* Don't print line number, keep it for later. */
- if (m_start_of_line == 0 && strcmp (fldname, "line") == 0)
- {
- m_start_of_line++;
- m_line = value;
- return;
- }
- m_start_of_line++;
-
- cli_ui_out::do_field_signed (fldno, width, alignment, fldname, value);
-}
-
-/* Other cli_field_* end up here so alignment and field separators are
- both handled by tui_field_string. */
-
-void
-tui_ui_out::do_field_string (int fldno, int width, ui_align align,
- const char *fldname, const char *string,
- const ui_file_style &style)
-{
- if (suppress_output ())
- return;
-
- m_start_of_line++;
-
- if (fldname && m_line > 0 && strcmp (fldname, "fullname") == 0)
- return;
-
- cli_ui_out::do_field_string (fldno, width, align, fldname, string, style);
-}
-
-void
-tui_ui_out::do_field_fmt (int fldno, int width, ui_align align,
- const char *fldname, const ui_file_style &style,
- const char *format, va_list args)
-{
- if (suppress_output ())
- return;
-
- m_start_of_line++;
-
- cli_ui_out::do_field_fmt (fldno, width, align, fldname, style, format, args);
-}
-
-void
-tui_ui_out::do_text (const char *string)
-{
- if (suppress_output ())
- return;
-
- 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)
- {
- /* 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'))
- m_start_of_line = 0;
-
- cli_ui_out::do_text (string);
-}
-
-tui_ui_out::tui_ui_out (ui_file *stream)
- : cli_ui_out (stream, 0)
-{
-}
+++ /dev/null
-/* Copyright (C) 2016-2024 Free Software Foundation, Inc.
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef TUI_TUI_OUT_H
-#define TUI_TUI_OUT_H
-
-#include "cli-out.h"
-
-/* A ui_out class for the TUI. This is just like the CLI's ui_out,
- except that it overrides output methods to detect when a source
- line is being printed and show the source in the TUI's source
- window instead of printing the line in the console window. */
-class tui_ui_out : public cli_ui_out
-{
-public:
-
- explicit tui_ui_out (ui_file *stream);
-
-protected:
-
- void do_field_signed (int fldno, int width, ui_align align, const char *fldname,
- LONGEST value) override;
- void do_field_string (int fldno, int width, ui_align align, const char *fldname,
- const char *string, const ui_file_style &style) override;
- void do_field_fmt (int fldno, int width, ui_align align, const char *fldname,
- const ui_file_style &style,
- const char *format, va_list args) override
- ATTRIBUTE_PRINTF (7, 0);
- void do_text (const char *string) override;
-
-private:
-
- /* These fields are used to make print_source_lines show the source
- in the TUI's source window instead of in the console.
- M_START_OF_LINE is incremented whenever something is output to
- the ui_out. If an integer field named "line" is printed on the
- ui_out, and nothing else has been printed yet (both
- M_START_OF_LINE and M_LINE are still 0), we assume
- print_source_lines is starting to print a source line, and thus
- record the line number in M_LINE. Afterwards, when we see a
- string field named "fullname" being output, we take the fullname
- and the recorded line and show the source line in the TUI's
- source window. tui_ui_out::do_text() suppresses text output
- until it sees an endline being printed, at which point these
- variables are reset back to 0. */
- int m_line = 0;
- int m_start_of_line = 0;
-};
-
-#endif /* TUI_TUI_OUT_H */
projects / thirdparty / binutils-gdb.git / commitdiff
