aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui/tui-data.h
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-06-16 13:55:51 -0600
committerTom Tromey <tom@tromey.com>2019-06-25 07:48:30 -0600
commit81491aa0968e5bcab0388914f909ccb12e084e32 (patch)
treef7842a0373f0f8a55549761358f9611d6cb2cb0b /gdb/tui/tui-data.h
parente6e4150110bcee66adfadb9f126eb3bb1fd7c054 (diff)
downloadgdb-81491aa0968e5bcab0388914f909ccb12e084e32.zip
gdb-81491aa0968e5bcab0388914f909ccb12e084e32.tar.gz
gdb-81491aa0968e5bcab0388914f909ccb12e084e32.tar.bz2
Remove struct tui_command_info
Like the previous patch, this removes tui_command_info in favor of putting it elements directly into tui_cmd_window. gdb/ChangeLog 2019-06-25 Tom Tromey <tom@tromey.com> * tui/tui-layout.c (show_source_disasm_command) (show_source_or_disasm_and_command): Update. * tui/tui-io.c (update_cmdwin_start_line) (tui_redisplay_readline): Update. * tui/tui-data.h (struct tui_command_info): Remove. (struct tui_win_info) <detail>: Remove command_info member. (struct tui_data_window) <start_line>: New member, from tui_command_info. (TUI_CMD_WIN): Add casts.
Diffstat (limited to 'gdb/tui/tui-data.h')
-rw-r--r--gdb/tui/tui-data.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 4aef2f5..91d0c94 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -238,12 +238,6 @@ struct tui_data_info
};
-struct tui_command_info
-{
- int start_line;
-};
-
-
/* This defines information about each logical window. */
struct tui_win_info
{
@@ -287,7 +281,6 @@ public:
union
{
struct tui_data_info data_display_info;
- struct tui_command_info command_info;
}
detail;
@@ -395,6 +388,8 @@ struct tui_cmd_window : public tui_win_info
void clear_detail () override;
+ int start_line;
+
protected:
void do_scroll_vertical (enum tui_scroll_direction,
@@ -420,7 +415,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_CMD_WIN tui_win_list[CMD_WIN]
+#define TUI_CMD_WIN ((tui_cmd_window *) tui_win_list[CMD_WIN])
/* Data Manipulation Functions. */
extern void tui_initialize_static_data (void);