diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-16 14:03:04 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-06-25 07:48:30 -0600 |
| commit | 238eb706f902da8afef1d5e3c9fdfeecf688bac3 (patch) | |
| tree | d36be41771293a95bd1489fc81ba0d205df0b303 /gdb/tui/tui-data.h | |
| parent | 81491aa0968e5bcab0388914f909ccb12e084e32 (diff) | |
| download | gdb-238eb706f902da8afef1d5e3c9fdfeecf688bac3.zip gdb-238eb706f902da8afef1d5e3c9fdfeecf688bac3.tar.gz gdb-238eb706f902da8afef1d5e3c9fdfeecf688bac3.tar.bz2 | |
Remove struct tui_data_info
Like the previous two patches, this removes struct tui_data_info in
favor of inlining its contents into tui_data_window. This was the
last member of the tui_win_info detail union, so that is removed.
gdb/ChangeLog
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-windata.c (tui_display_all_data)
(tui_display_data_from_line, tui_display_data_from)
(tui_check_data_values, tui_data_window::do_scroll_vertical):
Update.
* tui/tui-regs.c (tui_last_regs_line_no)
(tui_line_from_reg_element_no, tui_first_reg_element_no_inline)
(tui_show_registers, tui_show_register_group)
(tui_display_registers_from, tui_display_reg_element_at_line)
(tui_display_registers_from_line, tui_check_register_values)
(tui_reg_next, tui_reg_prev): Update.
* tui/tui-layout.c (tui_set_layout, show_data): Update.
* tui/tui-data.h (struct tui_data_info): Remove. Move contents to
tui_data_window.
(struct tui_win_info) <detail>: Remove. Add new fields from
tui_data_info.
(TUI_DATA_WIN): Add cast.
* tui/tui-data.c (tui_data_window::clear_detail, tui_data_window)
(~tui_data_window): Simplify.
Diffstat (limited to 'gdb/tui/tui-data.h')
| -rw-r--r-- | gdb/tui/tui-data.h | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 91d0c94..0acc5ab 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -224,20 +224,6 @@ struct tui_win_element union tui_which_element which_element; }; -/* This struct defines the specific information about a data display - window. */ -struct tui_data_info -{ - tui_win_content data_content; /* Start of data display content. */ - int data_content_count; - tui_win_content regs_content; /* Start of regs display content. */ - int regs_content_count; - int regs_column_count; - int display_regs; /* Should regs be displayed at all? */ - struct reggroup *current_group; -}; - - /* This defines information about each logical window. */ struct tui_win_info { @@ -278,11 +264,6 @@ public: void right_scroll (int num_to_scroll); struct tui_gen_win_info generic; /* General window information. */ - union - { - struct tui_data_info data_display_info; - } - detail; /* Can this window ever be highlighted? */ int can_highlight = 0; @@ -371,6 +352,14 @@ struct tui_data_window : public tui_win_info void clear_detail () override; + tui_win_content data_content; /* Start of data display content. */ + int data_content_count; + tui_win_content regs_content; /* Start of regs display content. */ + int regs_content_count; + int regs_column_count; + int display_regs; /* Should regs be displayed at all? */ + struct reggroup *current_group; + protected: void do_scroll_vertical (enum tui_scroll_direction, @@ -414,7 +403,7 @@ extern struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS]; #define TUI_SRC_WIN ((tui_source_window_base *) tui_win_list[SRC_WIN]) #define TUI_DISASM_WIN ((tui_source_window_base *) tui_win_list[DISASSEM_WIN]) -#define TUI_DATA_WIN tui_win_list[DATA_WIN] +#define TUI_DATA_WIN ((tui_data_window *) tui_win_list[DATA_WIN]) #define TUI_CMD_WIN ((tui_cmd_window *) tui_win_list[CMD_WIN]) /* Data Manipulation Functions. */ |