aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-06-16 14:52:08 -0600
committerTom Tromey <tom@tromey.com>2019-06-25 07:48:34 -0600
commit1825f487ae903438eb2a9b6f461337d8ec1b06c0 (patch)
treead8848b326dff919ab0ae05d62a9e9e9a62d4515 /gdb
parentad54d15bdb71b05010ece1ef32ab22ab46794166 (diff)
downloadgdb-1825f487ae903438eb2a9b6f461337d8ec1b06c0.zip
gdb-1825f487ae903438eb2a9b6f461337d8ec1b06c0.tar.gz
gdb-1825f487ae903438eb2a9b6f461337d8ec1b06c0.tar.bz2
Introduce the refresh_all method
This introduces the tui_win_info::refresh_all method and implements it as needed in subclasses. The name and comment are a bit of a guess on my part. The main benefit of this patch is removing another switch on the type of the window. gdb/ChangeLog 2019-06-25 Tom Tromey <tom@tromey.com> * tui/tui.c (tui_rl_other_window): Call the refresh_all method. * tui/tui-windata.c (tui_data_window::refresh_all): Rename from tui_refresh_data_win. * tui/tui-win.c (tui_source_window_base::refresh_all): New method. (tui_refresh_all_win): Call the refresh_all method. (tui_set_focus): Likewise. * tui/tui-data.h (struct tui_win_info) <refresh_all>: New method. (struct tui_source_window_base, struct tui_data_window) <refresh>: Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog13
-rw-r--r--gdb/tui/tui-data.h8
-rw-r--r--gdb/tui/tui-win.c34
-rw-r--r--gdb/tui/tui-windata.c4
-rw-r--r--gdb/tui/tui.c2
5 files changed, 38 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a60375..595a76a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,18 @@
2019-06-25 Tom Tromey <tom@tromey.com>
+ * tui/tui.c (tui_rl_other_window): Call the refresh_all method.
+ * tui/tui-windata.c (tui_data_window::refresh_all): Rename from
+ tui_refresh_data_win.
+ * tui/tui-win.c (tui_source_window_base::refresh_all): New
+ method.
+ (tui_refresh_all_win): Call the refresh_all method.
+ (tui_set_focus): Likewise.
+ * tui/tui-data.h (struct tui_win_info) <refresh_all>: New method.
+ (struct tui_source_window_base, struct tui_data_window) <refresh>:
+ Likewise.
+
+2019-06-25 Tom Tromey <tom@tromey.com>
+
* tui/tui-winsource.h (tui_refill_source_window)
(tui_set_is_exec_point_at): Don't declare.
* tui/tui-winsource.c (tui_update_source_windows_with_addr)
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 183efb1..e45c9fa 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -261,6 +261,12 @@ public:
/* Refresh this window and any associated windows. */
virtual void refresh ();
+ /* Called after all the TUI windows are refreshed, to let this
+ window have a chance to update itself further. */
+ virtual void refresh_all ()
+ {
+ }
+
/* 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. */
@@ -303,6 +309,7 @@ public:
void make_visible (bool visible) override;
void refresh () override;
+ void refresh_all () override;
/* Refill the source window's source cache and update it. If this
is a disassembly window, then just update it. */
@@ -371,6 +378,7 @@ struct tui_data_window : public tui_win_info
DISABLE_COPY_AND_ASSIGN (tui_data_window);
void clear_detail () override;
+ void refresh_all () override;
/* Start of data display content. */
tui_win_content data_content = NULL;
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 9c4f9ad..383487e 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -508,6 +508,17 @@ tui_win_info::right_scroll (int num_to_scroll)
}
+/* See tui-data.h. */
+
+void
+tui_source_window_base::refresh_all ()
+{
+ tui_show_source_content (this);
+ tui_check_and_display_highlight_if_needed (this);
+ tui_erase_exec_info_content (this);
+ tui_update_exec_info (this);
+}
+
void
tui_refresh_all_win (void)
{
@@ -517,25 +528,8 @@ tui_refresh_all_win (void)
tui_refresh_all (tui_win_list);
for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; type++)
{
- if (tui_win_list[type]
- && tui_win_list[type]->generic.is_visible)
- {
- switch (type)
- {
- case SRC_WIN:
- case DISASSEM_WIN:
- tui_show_source_content (tui_win_list[type]);
- tui_check_and_display_highlight_if_needed (tui_win_list[type]);
- tui_erase_exec_info_content (tui_win_list[type]);
- tui_update_exec_info (tui_win_list[type]);
- break;
- case DATA_WIN:
- tui_refresh_data_win ();
- break;
- default:
- break;
- }
- }
+ if (tui_win_list[type] && tui_win_list[type]->generic.is_visible)
+ tui_win_list[type]->refresh_all ();
}
tui_show_locator_content ();
}
@@ -872,7 +866,7 @@ The window name specified must be valid and visible.\n"));
}
if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible)
- tui_refresh_data_win ();
+ TUI_DATA_WIN->refresh_all ();
xfree (buf_ptr);
printf_filtered (_("Focus set to %s window.\n"),
tui_win_name (&tui_win_with_focus ()->generic));
diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index 67228a6..770baf8 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -193,10 +193,10 @@ tui_display_data_from (int element_no, int reuse_windows)
/* Function to redisplay the contents of the data window. */
void
-tui_refresh_data_win (void)
+tui_data_window::refresh_all ()
{
tui_erase_data_content (NULL);
- if (TUI_DATA_WIN->generic.content_size > 0)
+ if (generic.content_size > 0)
{
int first_element = tui_first_data_item_displayed ();
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index d720199..55a44e8 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -237,7 +237,7 @@ tui_rl_other_window (int count, int key)
{
tui_set_win_focus_to (win_info);
if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible)
- tui_refresh_data_win ();
+ TUI_DATA_WIN->refresh_all ();
keypad (TUI_CMD_WIN->generic.handle, (win_info != TUI_CMD_WIN));
}
return 0;