Don't call tui_show_source from tui_ui_out

This removes the call to tui_show_source from tui_ui_out.  This always
seemed like a hack, and now that the TUI is using the proper
observers, it seems not to be needed.

The rest of the logic remains, unfortunately, because it is needed to
suppress some gdb output in the TUI case.  We could probably find a
nicer way to do this (maybe a ui_out_flag), but I haven't attempted
this.

This was the last caller of tui_show_source, so this is removed as
well.

gdb/ChangeLog
2019-12-20  Tom Tromey  <tom@tromey.com>

	* tui/tui.c (tui_show_source): Remove.
	* tui/tui.h (tui_show_source): Don't declare.
	* tui/tui-out.c (tui_ui_out::do_field_string): Don't call
	tui_show_source.

Change-Id: Id71098e597ee4ebfef0429562baa45f537bd2c2b
This commit is contained in:
Tom Tromey 2019-11-13 16:47:58 -07:00
parent eb390f499b
commit b4b49dcbff
4 changed files with 8 additions and 18 deletions

View File

@ -1,3 +1,10 @@
2019-12-20 Tom Tromey <tom@tromey.com>
* tui/tui.c (tui_show_source): Remove.
* tui/tui.h (tui_show_source): Don't declare.
* tui/tui-out.c (tui_ui_out::do_field_string): Don't call
tui_show_source.
2019-12-20 Tom Tromey <tom@tromey.com>
* tui/tui-stack.h (tui_show_frame_info): Return bool.

View File

@ -60,10 +60,7 @@ tui_ui_out::do_field_string (int fldno, int width, ui_align align,
m_start_of_line++;
if (fldname && m_line > 0 && strcmp (fldname, "fullname") == 0)
{
tui_show_source ();
return;
}
return;
cli_ui_out::do_field_string (fldno, width, align, fldname, string, style);
}

View File

@ -628,18 +628,6 @@ tui_reset (void)
}
#endif
void
tui_show_source ()
{
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
/* Make sure that the source window is displayed. */
tui_add_win_to_layout (SRC_WIN);
tui_update_source_windows_with_line (cursal);
tui_update_locator_fullname (cursal.symtab);
}
void
tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr)
{

View File

@ -83,6 +83,4 @@ extern void tui_set_key_mode (enum tui_key_mode mode);
extern int tui_active;
extern void tui_show_source ();
#endif /* TUI_TUI_H */