From b4b49dcbff6b437fa8b4e2fc0c3f27b457f11310 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 13 Nov 2019 16:47:58 -0700 Subject: [PATCH] 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 * 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 --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-out.c | 5 +---- gdb/tui/tui.c | 12 ------------ gdb/tui/tui.h | 2 -- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fa179581183..0f35deff350 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-12-20 Tom Tromey + + * 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 * tui/tui-stack.h (tui_show_frame_info): Return bool. diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c index 95543ff06a2..22b4996a1bb 100644 --- a/gdb/tui/tui-out.c +++ b/gdb/tui/tui-out.c @@ -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); } diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index dbc890a9ade..f33ff441288 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -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) { diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h index 0ac1fb4a9c2..06f3ef1f01b 100644 --- a/gdb/tui/tui.h +++ b/gdb/tui/tui.h @@ -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 */ -- 2.30.2