diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-13 16:08:33 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-08-20 16:45:50 -0600 |
| commit | 42cc14a753e6edbcd43cdaa2dc2ee614a27aeeb2 (patch) | |
| tree | cd8b99142d9fffd3d2bf7bf180593b9f959964b5 | |
| parent | b9ad36868f46d5270347ef50fd62fde94d68328b (diff) | |
| download | gdb-42cc14a753e6edbcd43cdaa2dc2ee614a27aeeb2.zip gdb-42cc14a753e6edbcd43cdaa2dc2ee614a27aeeb2.tar.gz gdb-42cc14a753e6edbcd43cdaa2dc2ee614a27aeeb2.tar.bz2 | |
Rearrange tui-regs.c some more
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.
2019-08-20 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.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-regs.c | 38 |
2 files changed, 20 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fd3c848..27fcb35 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-08-20 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. + +2019-08-20 Tom Tromey <tom@tromey.com> + * tui/tui-regs.h (struct tui_data_item_window) <~tui_data_item_window>: Remove. <content>: Now a unique_xmalloc_ptr. diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index a899b1d..147f57a 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. */ |