From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 08/14] Remove the TUI register window rerender overload
Date: Sun, 17 Dec 2023 12:50:33 -0700 [thread overview]
Message-ID: <20231217-tui-regs-cleanup-v1-8-67bd0ea1e8be@tromey.com> (raw)
In-Reply-To: <20231217-tui-regs-cleanup-v1-0-67bd0ea1e8be@tromey.com>
After these restructurings, it should be clear that the rerender
overload can be removed from the TUI register window. This is done by
moving a bit more logic from show_registers into update_register_data.
After this, update_register_data simply updates the internal state,
and rerender will write to the screen. All the actual rendering work
is done, ultimately, by display_registers_from. This split between
updating the mode and rendering makes it clear that the recursive case
can't happen any longer.
---
gdb/tui/tui-regs.c | 55 ++++++++++++++++++++++++------------------------------
gdb/tui/tui-regs.h | 14 ++++++--------
2 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 7b6b669fe51..5726dc3fea8 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -165,31 +165,33 @@ tui_data_window::first_reg_element_no_inline (int line_no) const
and refresh the window. */
void
tui_data_window::show_registers (const reggroup *group)
+{
+ update_register_data (group);
+ rerender ();
+}
+
+/* Set the data window to display the registers of the register group
+ using the given frame. Values are refreshed only when
+ refresh_values_only is true. */
+
+void
+tui_data_window::update_register_data (const reggroup *group)
{
if (group == nullptr)
group = general_reggroup;
- if (target_has_registers () && target_has_stack () && target_has_memory ())
- update_register_data (group, get_selected_frame (nullptr));
- else
+ if (!target_has_registers ()
+ || !target_has_stack ()
+ || !target_has_memory ())
{
- set_title (_("Registers"));
+ set_title ("");
m_current_group = nullptr;
m_regs_content.clear ();
+ return;
}
- rerender (false);
-}
-
-
-/* Set the data window to display the registers of the register group
- using the given frame. Values are refreshed only when
- refresh_values_only is true. */
+ frame_info_ptr frame = get_selected_frame (nullptr);
-void
-tui_data_window::update_register_data (const reggroup *group,
- frame_info_ptr frame)
-{
m_current_group = group;
/* Make a new title showing which group we display. */
@@ -222,6 +224,9 @@ tui_data_window::update_register_data (const reggroup *group,
void
tui_data_window::display_registers_from (int start_element_no)
{
+ werase (handle.get ());
+ check_and_display_highlight_if_needed ();
+
/* In case the regs window is not boxed, we'll write the last char in the
last line here, causing a scroll, so prevent that. */
scrollok (handle.get (), FALSE);
@@ -358,29 +363,18 @@ tui_data_window::erase_data_content (const char *prompt)
x_pos = half_width - strlen (prompt);
display_string (height / 2, x_pos, prompt);
}
- tui_wrefresh (handle.get ());
}
/* See tui-regs.h. */
void
-tui_data_window::rerender (bool toplevel)
+tui_data_window::rerender ()
{
if (m_regs_content.empty ())
- {
- if (toplevel && has_stack_frames ())
- {
- frame_info_ptr fi = get_selected_frame (NULL);
- check_register_values (fi);
- }
- else
- erase_data_content (_("[ Register Values Unavailable ]"));
- }
+ erase_data_content (_("[ Register Values Unavailable ]"));
else
- {
- erase_data_content (NULL);
- display_registers_from (0);
- }
+ display_registers_from (0);
+ tui_wrefresh (handle.get ());
}
@@ -402,7 +396,6 @@ tui_data_window::do_scroll_vertical (int num_to_scroll)
if (first_line >= 0)
{
first_line += num_to_scroll;
- erase_data_content (NULL);
display_registers_from_line (first_line);
}
}
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 701b8707947..b31a5a3e5b8 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -56,7 +56,10 @@ struct tui_register_info
/* The TUI registers window. */
struct tui_data_window : public tui_win_info
{
- tui_data_window () = default;
+ tui_data_window ()
+ {
+ update_register_data (nullptr);
+ }
DISABLE_COPY_AND_ASSIGN (tui_data_window);
@@ -81,11 +84,7 @@ struct tui_data_window : public tui_win_info
{
}
- void rerender (bool toplevel);
- void rerender () override
- {
- rerender (true);
- }
+ void rerender () override;
private:
@@ -110,8 +109,7 @@ struct tui_data_window : public tui_win_info
display off the end of the register display. */
void display_reg_element_at_line (int start_element_no, int start_line_no);
- void update_register_data (const reggroup *group,
- frame_info_ptr frame);
+ void update_register_data (const reggroup *group);
/* Answer the number of the last line in the regs display. If there
are no registers (-1) is returned. */
--
2.43.0
next prev parent reply other threads:[~2023-12-17 19:50 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-17 19:50 [PATCH 00/14] Cleanups for the TUi register window Tom Tromey
2023-12-17 19:50 ` [PATCH 01/14] Use pop_back in tui_register_format Tom Tromey
2023-12-17 19:50 ` [PATCH 02/14] Minor C++ cleanups in tui-regs.c Tom Tromey
2023-12-17 19:50 ` [PATCH 03/14] Simplify tui_data_window::show_register_group Tom Tromey
2023-12-18 15:42 ` Andrew Burgess
2024-01-20 17:11 ` Tom Tromey
2023-12-17 19:50 ` [PATCH 04/14] Rename tui_data_item_window -> tui_register_info Tom Tromey
2023-12-17 19:50 ` [PATCH 05/14] Remove tui_register_info::visible Tom Tromey
2023-12-18 17:29 ` Hannes Domani
2024-01-20 17:02 ` Tom Tromey
2023-12-18 19:00 ` Andrew Burgess
2024-01-20 17:05 ` Tom Tromey
2023-12-17 19:50 ` [PATCH 06/14] Move scrollok call in register window Tom Tromey
2023-12-18 19:28 ` Andrew Burgess
2023-12-18 23:33 ` Tom Tromey
2023-12-17 19:50 ` [PATCH 07/14] Simplify update_register_data Tom Tromey
2023-12-18 19:48 ` Andrew Burgess
2024-01-20 17:06 ` Tom Tromey
2023-12-17 19:50 ` Tom Tromey [this message]
2023-12-18 19:54 ` [PATCH 08/14] Remove the TUI register window rerender overload Andrew Burgess
2024-01-20 17:17 ` Tom Tromey
2023-12-17 19:50 ` [PATCH 09/14] Simplify tui_data_win::erase_data_content Tom Tromey
2023-12-17 19:50 ` [PATCH 10/14] Remove tui_refreshing_registers Tom Tromey
2023-12-17 19:50 ` [PATCH 11/14] Remove redundant check from tui_refresh_frame_and_register_information Tom Tromey
2023-12-18 17:32 ` Hannes Domani
2023-12-18 23:35 ` Tom Tromey
2023-12-19 10:26 ` Andrew Burgess
2024-01-20 18:21 ` Tom Tromey
2023-12-17 19:50 ` [PATCH 12/14] Return void from tui_show_frame_info Tom Tromey
2023-12-17 19:50 ` [PATCH 13/14] Rename show_registers -> set_register_group Tom Tromey
2023-12-17 19:50 ` [PATCH 14/14] Update TUI register window when the inferior exits Tom Tromey
2023-12-18 14:07 ` [PATCH 00/14] Cleanups for the TUi register window Tom de Vries
2023-12-19 10:31 ` Andrew Burgess
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231217-tui-regs-cleanup-v1-8-67bd0ea1e8be@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).