From 2042b506c85274b4c652fbc9291be65b2550104d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 16 Jun 2019 14:27:28 -0600 Subject: [PATCH] Introduce the refresh method This adds tui_win_info::refresh and updates tui_source_window_base to implement it as well. This lets us simplify tui_refresh_all, removing a check of the window type. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-wingeneral.c (tui_win_info::refresh) (tui_source_window_base::refresh): New methods. (tui_refresh_all): Call the refresh method. * tui/tui-data.h (struct tui_win_info) (struct tui_source_window_base) : New method. --- gdb/ChangeLog | 8 ++++++++ gdb/tui/tui-data.h | 4 ++++ gdb/tui/tui-wingeneral.c | 31 ++++++++++++++++++++----------- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b47b6cec5c2..1fea395ff8a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-06-25 Tom Tromey + + * tui/tui-wingeneral.c (tui_win_info::refresh) + (tui_source_window_base::refresh): New methods. + (tui_refresh_all): Call the refresh method. + * tui/tui-data.h (struct tui_win_info) + (struct tui_source_window_base) : New method. + 2019-06-25 Tom Tromey * tui/tui.h (tui_is_window_visible): Return bool. diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 3799ab48e57..e4a9b04f77b 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -258,6 +258,9 @@ public: /* Make this window visible or invisible. */ virtual void make_visible (bool visible); + /* Refresh this window and any associated windows. */ + virtual void refresh (); + /* Methods to scroll the contents of this window. Note that they are named with "_scroll" coming at the end because the more obvious "scroll_forward" is defined as a macro in term.h. */ @@ -299,6 +302,7 @@ public: } void make_visible (bool visible) override; + void refresh () override; /* Does the locator belong to this window? */ bool m_has_locator = false; diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index e802e52ca5b..4d168af0c09 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -256,6 +256,25 @@ tui_make_all_invisible (void) make_all_visible (false); } +/* See tui-data.h. */ + +void +tui_win_info::refresh () +{ + touchwin (generic.handle); + tui_refresh_win (&generic); +} + +/* See tui-data.h. */ + +void +tui_source_window_base::refresh () +{ + touchwin (execution_info->handle); + tui_refresh_win (execution_info); + tui_win_info::refresh (); +} + /* Function to refresh all the windows currently displayed. */ void @@ -267,17 +286,7 @@ tui_refresh_all (struct tui_win_info **list) for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++) { if (list[type] && list[type]->generic.is_visible) - { - if (type == SRC_WIN || type == DISASSEM_WIN) - { - tui_source_window_base *base - = (tui_source_window_base *) list[type]; - touchwin (base->execution_info->handle); - tui_refresh_win (base->execution_info); - } - touchwin (list[type]->generic.handle); - tui_refresh_win (&list[type]->generic); - } + list[type]->refresh (); } if (locator->is_visible) { -- 2.30.2