From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 06/14] Rearrange tui-regs.c some more
Date: Sun, 18 Aug 2019 17:27:00 -0000 [thread overview]
Message-ID: <20190818172735.17477-7-tom@tromey.com> (raw)
In-Reply-To: <20190818172735.17477-1-tom@tromey.com>
This moves tui_reg_layout later in tui-regs.c, closer to where it is
used.
It also changes tui_show_registers not to enable the TUI or change the
layout -- this is already done by this point by all the callers.
gdb/ChangeLog
2019-08-18 Tom Tromey <tom@tromey.com>
* tui/tui-regs.c (tui_reg_layout): Move later.
(tui_show_registers): Don't enable TUI mode or change layout.
---
gdb/ChangeLog | 5 +++++
gdb/tui/tui-regs.c | 38 +++++++++++++++-----------------------
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index a899b1df694..147f57a13a2 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -149,34 +149,11 @@ tui_data_window::first_reg_element_no_inline (int line_no) const
return (-1);
}
-/* A helper function to display the register window in the appropriate
- way. */
-
-static void
-tui_reg_layout ()
-{
- enum tui_layout_type cur_layout = tui_current_layout ();
- enum tui_layout_type new_layout;
- if (cur_layout == SRC_COMMAND || cur_layout == SRC_DATA_COMMAND)
- new_layout = SRC_DATA_COMMAND;
- else
- new_layout = DISASSEM_DATA_COMMAND;
- tui_set_layout (new_layout);
-}
-
/* Show the registers of the given group in the data window
and refresh the window. */
void
tui_show_registers (struct reggroup *group)
{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
-
- /* Make sure the register window is visible. If not, select an
- appropriate layout. */
- if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ())
- tui_reg_layout ();
-
if (group == 0)
group = general_reggroup;
@@ -676,6 +653,21 @@ tui_reg_prev (struct reggroup *current_group, struct gdbarch *gdbarch)
return group;
}
+/* A helper function to display the register window in the appropriate
+ way. */
+
+static void
+tui_reg_layout ()
+{
+ enum tui_layout_type cur_layout = tui_current_layout ();
+ enum tui_layout_type new_layout;
+ if (cur_layout == SRC_COMMAND || cur_layout == SRC_DATA_COMMAND)
+ new_layout = SRC_DATA_COMMAND;
+ else
+ new_layout = DISASSEM_DATA_COMMAND;
+ tui_set_layout (new_layout);
+}
+
/* Implement the 'tui reg' command. Changes the register group displayed
in the tui register window. Displays the tui register window if it is
not already on display. */
--
2.17.2
next prev parent reply other threads:[~2019-08-18 17:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-18 17:27 [PATCH 00/14] TUI refactoring round N Tom Tromey
2019-08-18 17:27 ` [PATCH 03/14] Minor rearrangement in tui-regs.c Tom Tromey
2019-08-18 17:27 ` [PATCH 08/14] Add two methods to tui_data_window Tom Tromey
2019-08-18 17:27 ` [PATCH 14/14] Change some tui_data_window methods to be private Tom Tromey
2019-08-18 17:27 ` [PATCH 13/14] Remove some defines from tui-data.h Tom Tromey
2019-08-18 17:27 ` [PATCH 11/14] Change tui_make_window to be a method Tom Tromey
2019-08-18 17:27 ` [PATCH 01/14] Some i18n fixes for the TUI Tom Tromey
2019-08-18 17:27 ` [PATCH 04/14] Remove tui_data_item_window::value Tom Tromey
2019-08-18 17:27 ` [PATCH 09/14] Remove indirection from tui_data_window::regs_content Tom Tromey
2019-08-18 17:27 ` [PATCH 10/14] Remove tui_data_window::display_regs Tom Tromey
2019-08-18 17:27 ` [PATCH 12/14] Move some defines to tui-stack.c Tom Tromey
2019-08-18 17:27 ` [PATCH 05/14] Change tui_data_item_window::content to be a unique_xmalloc_ptr Tom Tromey
2019-08-20 15:19 ` Pedro Alves
2019-08-20 22:34 ` Tom Tromey
2019-08-18 17:27 ` [PATCH 02/14] Remove NULL check from tui_reg_command Tom Tromey
2019-08-18 17:27 ` [PATCH 07/14] Change tui_check_register_values to be a method Tom Tromey
2019-08-18 17:27 ` Tom Tromey [this message]
2019-08-20 15:19 ` [PATCH 00/14] TUI refactoring round N Pedro Alves
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=20190818172735.17477-7-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).