From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 16/61] Introduce tui_data_window::display_reg_element_at_line method
Date: Thu, 04 Jul 2019 17:03:00 -0000 [thread overview]
Message-ID: <20190704170311.15982-17-tom@tromey.com> (raw)
In-Reply-To: <20190704170311.15982-1-tom@tromey.com>
This changes tui_display_reg_element_at_line to be a method on
tui_data_window, allowing for the removal of some uses of the
TUI_DATA_WIN global.
2019-07-04 Tom Tromey <tom@tromey.com>
* tui/tui-regs.c (tui_data_window::display_reg_element_at_line):
Rename from tui_display_reg_element_at_line.
(tui_data_window::display_registers_from_line): Update.
* tui/tui-data.h (struct tui_data_window)
<display_reg_element_at_line>: New method.
---
gdb/ChangeLog | 8 ++++++++
gdb/tui/tui-data.h | 7 +++++++
gdb/tui/tui-regs.c | 21 +++++++++------------
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index e5b4b0f6aa0..b3592e39133 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -535,6 +535,13 @@ protected:
/* Return the index of the first element displayed. If none are
displayed, then return -1. */
int first_data_item_displayed ();
+
+ /* Function to display the registers in the content from
+ 'start_element_no' on 'start_line_no' until the end of the
+ register content or the end of the display height. This function
+ checks that we won't display off the end of the register
+ display. */
+ void display_reg_element_at_line (int start_element_no, int start_line_no);
};
struct tui_cmd_window : public tui_win_info
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 042563f0495..eea8cf45acf 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -333,11 +333,11 @@ tui_data_window::display_registers_from (int start_element_no)
'start_element_no' on 'start_line_no' until the end of the register
content or the end of the display height. This function checks
that we won't display off the end of the register display. */
-static void
-tui_display_reg_element_at_line (int start_element_no,
- int start_line_no)
+void
+tui_data_window::display_reg_element_at_line (int start_element_no,
+ int start_line_no)
{
- if (!TUI_DATA_WIN->regs_content.empty ())
+ if (!regs_content.empty ())
{
int element_no = start_element_no;
@@ -345,9 +345,8 @@ tui_display_reg_element_at_line (int start_element_no,
{
int last_line_no, first_line_on_last_page;
- last_line_no = TUI_DATA_WIN->last_regs_line_no ();
- first_line_on_last_page
- = last_line_no - (TUI_DATA_WIN->height - 2);
+ last_line_no = last_regs_line_no ();
+ first_line_on_last_page = last_line_no - (height - 2);
if (first_line_on_last_page < 0)
first_line_on_last_page = 0;
@@ -355,11 +354,9 @@ tui_display_reg_element_at_line (int start_element_no,
registers, adjust what element to really start the
display at. */
if (start_line_no > first_line_on_last_page)
- element_no
- = (TUI_DATA_WIN->first_reg_element_no_inline
- (first_line_on_last_page));
+ element_no = first_reg_element_no_inline (first_line_on_last_page);
}
- TUI_DATA_WIN->display_registers_from (element_no);
+ display_registers_from (element_no);
}
}
@@ -392,7 +389,7 @@ tui_data_window::display_registers_from_line (int line_no)
element_no = first_reg_element_no_inline (line_no);
if (element_no < regs_content.size ())
- tui_display_reg_element_at_line (element_no, line_no);
+ display_reg_element_at_line (element_no, line_no);
else
line_no = (-1);
--
2.17.2
next prev parent reply other threads:[~2019-07-04 17:03 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 17:03 [PATCH 00/61] More TUI refactorings Tom Tromey
2019-07-04 17:03 ` [PATCH 33/61] Remove tui_set_focus Tom Tromey
2019-07-04 17:03 ` [PATCH 07/61] Introduce tui_data_window::line_from_reg_element_no method Tom Tromey
2019-07-04 17:03 ` [PATCH 28/61] Remove unused TUI defines Tom Tromey
2019-07-04 17:03 ` [PATCH 14/61] Introduce tui_data_window::erase_data_content method Tom Tromey
2019-07-04 17:03 ` [PATCH 25/61] Move content_in_use to tui_source_window class Tom Tromey
2019-07-04 17:03 ` [PATCH 13/61] Introduce tui_data_window::delete_data_content_windows method Tom Tromey
2019-07-17 12:36 ` Pedro Alves
2019-07-17 18:26 ` Tom Tromey
2019-07-04 17:03 ` [PATCH 21/61] Fix comment typos Tom Tromey
2019-07-04 17:03 ` [PATCH 29/61] Remove UNDEFINED_ITEM define from TUI Tom Tromey
2019-07-04 17:03 ` [PATCH 34/61] Remove TUI data window special case Tom Tromey
2019-07-04 17:03 ` [PATCH 32/61] Merge refresh and refresh_window methods Tom Tromey
2019-07-04 17:03 ` [PATCH 17/61] Parameterize tui_show_register_group with window Tom Tromey
2019-07-04 17:03 ` [PATCH 11/61] Introduce tui_data_window::display_all_data method Tom Tromey
2019-07-04 17:03 ` [PATCH 36/61] Always create an execution info window for a source window Tom Tromey
2019-07-04 17:03 ` [PATCH 08/61] Introduce tui_data_window::first_reg_element_no_inline Tom Tromey
2019-07-04 17:03 ` [PATCH 18/61] Simplify tui_show_registers Tom Tromey
2019-07-04 17:03 ` Tom Tromey [this message]
2019-07-04 17:03 ` [PATCH 31/61] Remove tui_source_window::content_in_use Tom Tromey
2019-07-04 17:03 ` [PATCH 20/61] Introduce TUI window iterator Tom Tromey
2019-07-04 17:03 ` [PATCH 01/61] Introduce can_scroll method Tom Tromey
2019-07-04 17:03 ` [PATCH 09/61] Remove tui_display_data_from_line Tom Tromey
2019-07-04 17:03 ` [PATCH 04/61] Consolidate "if"s in tui_show_frame_info Tom Tromey
2019-07-04 17:03 ` [PATCH 15/61] Introduce two more tui_data_window methods Tom Tromey
2019-07-04 17:03 ` [PATCH 12/61] Don't declare unimplemented functions Tom Tromey
2019-07-04 17:03 ` [PATCH 02/61] Check can_highlight in tui_check_and_display_highlight_if_needed Tom Tromey
2019-07-04 17:03 ` [PATCH 24/61] Introduce tui_source_window_base::location_matches_p method Tom Tromey
2019-07-17 12:37 ` Pedro Alves
2019-07-04 17:03 ` [PATCH 22/61] Make source windows be self-updating Tom Tromey
2019-07-04 17:03 ` [PATCH 27/61] Remove unused parameter from two TUI functions Tom Tromey
2019-07-04 17:03 ` [PATCH 06/61] Introduce tui_data_window::last_regs_line_no method Tom Tromey
2019-07-04 17:03 ` [PATCH 37/61] Introduce reset_locator function in tui-layout.c Tom Tromey
2019-07-04 17:03 ` [PATCH 23/61] Remove tui_set_win_height Tom Tromey
2019-07-04 17:03 ` [PATCH 03/61] Remove some uses of TUI_WIN_SRC Tom Tromey
2019-07-04 17:03 ` [PATCH 40/61] Change tui_set_layout to return void Tom Tromey
2019-07-04 17:04 ` [PATCH 41/61] Clean up tui_layout_command Tom Tromey
2019-07-04 17:04 ` [PATCH 57/61] Move tui_source_window to tui-source.h Tom Tromey
2019-07-04 17:04 ` [PATCH 54/61] Move TUI command window code Tom Tromey
2019-07-04 17:04 ` [PATCH 38/61] Remove the win_type parameter from tui_gen_win_info::reset Tom Tromey
2019-07-04 17:04 ` [PATCH 53/61] Move tui_dispatch_ctrl_char to tui-io.c Tom Tromey
2019-07-04 17:04 ` [PATCH 52/61] Rearrange TUI data window code Tom Tromey
2019-07-04 17:04 ` [PATCH 58/61] Change make_invisible_and_set_new_height to be a method Tom Tromey
2019-07-22 11:57 ` clang build-regression [Re: [PATCH 58/61] Change make_invisible_and_set_new_height to be a method] Jan Kratochvil
2019-07-04 17:04 ` [PATCH 49/61] Remove tui_make_visible and tui_make_invisible Tom Tromey
2019-07-04 17:04 ` [PATCH 05/61] Remove deleted breakpoint from TUI display Tom Tromey
2019-07-04 17:04 ` [PATCH 56/61] Move tui_disasm_window to tui-disasm.h Tom Tromey
2019-07-04 17:04 ` [PATCH 10/61] Remove tui_display_data_from Tom Tromey
2019-07-04 17:04 ` [PATCH 60/61] Fix an error in parse_scrolling_args Tom Tromey
2019-07-04 17:04 ` [PATCH 55/61] Move TUI data item window to tui-regs.h Tom Tromey
2019-07-04 17:04 ` [PATCH 42/61] Simplify show_source_disasm_command Tom Tromey
2019-07-04 17:04 ` [PATCH 26/61] Add win_info parameter to tui_set_disassem_content Tom Tromey
2019-07-04 17:04 ` [PATCH 51/61] Fix flushing bug in tui_puts_internal Tom Tromey
2019-07-17 12:37 ` Pedro Alves
2019-07-04 17:04 ` [PATCH 19/61] Minor tui_reg_next / tui_reg_prev cleanup Tom Tromey
2019-07-04 17:04 ` [PATCH 44/61] Change tui_get_register to return void Tom Tromey
2019-07-04 17:04 ` [PATCH 43/61] Simplify tui_gen_win_info::make_visible Tom Tromey
2019-07-04 17:04 ` [PATCH 48/61] Remove make_data_window Tom Tromey
2019-07-04 17:04 ` [PATCH 59/61] Move source window common to code to tui-winsource.[ch] Tom Tromey
2019-07-04 17:04 ` [PATCH 46/61] Remove make_command_window Tom Tromey
2019-07-04 17:04 ` [PATCH 61/61] Remove unnecessary "return"s Tom Tromey
2019-07-17 12:37 ` Pedro Alves
2019-07-04 17:04 ` [PATCH 45/61] Simplify show_source_or_disasm_and_command Tom Tromey
2019-07-04 17:04 ` [PATCH 39/61] Remove reset_locator Tom Tromey
2019-07-04 17:04 ` [PATCH 30/61] Simplify source window clearing Tom Tromey
2019-07-04 17:04 ` [PATCH 35/61] Remove some dead code from tui_set_layout Tom Tromey
2019-07-04 17:26 ` [PATCH 47/61] Remove make_source_window and make_disasm_window Tom Tromey
2019-07-04 17:26 ` [PATCH 50/61] Remove has_locator method Tom Tromey
2019-07-17 12:41 ` [PATCH 00/61] More TUI refactorings Pedro Alves
2019-07-17 18:35 ` Tom Tromey
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=20190704170311.15982-17-tom@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).