diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-16 16:35:31 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-06-25 07:48:38 -0600 |
| commit | 152f3f4b3342ae16df5ae0640896b8cea008c893 (patch) | |
| tree | b057f41be67f8879cf0c2664098a2192e543925b /gdb/tui/tui-data.h | |
| parent | be4da58857ee4a26b7e58893211ea4f54922e8fd (diff) | |
| download | fsf-binutils-gdb-152f3f4b3342ae16df5ae0640896b8cea008c893.zip fsf-binutils-gdb-152f3f4b3342ae16df5ae0640896b8cea008c893.tar.gz fsf-binutils-gdb-152f3f4b3342ae16df5ae0640896b8cea008c893.tar.bz2 | |
Introduce tui_gen_win_info::name method
This removes tui_win_name and replaces it with a method on
tui_gen_win_info, removing another spot that switched on window type.
gdb/ChangeLog
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (window_name_completer, tui_set_focus)
(tui_all_windows_info): Use name method.
* tui/tui-data.h (struct tui_gen_win_info)
(struct tui_source_window, struct tui_disasm_window)
(struct tui_data_window, struct tui_cmd_window) <name>: New
method.
(tui_win_name): Don't declare.
* tui/tui-data.c (tui_partial_win_by_name): Use name method.
(tui_win_name): Remove.
Diffstat (limited to 'gdb/tui/tui-data.h')
| -rw-r--r-- | gdb/tui/tui-data.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 8f77c9d..d977c57 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -51,6 +51,12 @@ struct tui_gen_win_info /* Call to refresh this window. */ virtual void refresh_window (); + /* Return the name of this type of window. */ + virtual const char *name () const + { + return ""; + } + /* Window handle. */ WINDOW *handle = nullptr; /* Type of window. */ @@ -383,6 +389,11 @@ struct tui_source_window : public tui_source_window_base DISABLE_COPY_AND_ASSIGN (tui_source_window); + const char *name () const override + { + return SRC_NAME; + } + protected: void do_scroll_vertical (enum tui_scroll_direction, @@ -400,6 +411,11 @@ struct tui_disasm_window : public tui_source_window_base DISABLE_COPY_AND_ASSIGN (tui_disasm_window); + const char *name () const override + { + return DISASSEM_NAME; + } + protected: void do_scroll_vertical (enum tui_scroll_direction, @@ -423,6 +439,11 @@ struct tui_data_window : public tui_win_info void refresh_window () override; + const char *name () const override + { + return DATA_NAME; + } + /* Start of data display content. */ tui_win_content data_content = NULL; int data_content_count = 0; @@ -465,6 +486,11 @@ struct tui_cmd_window : public tui_win_info { } + const char *name () const override + { + return CMD_NAME; + } + int start_line = 0; protected: @@ -502,7 +528,6 @@ extern void tui_free_win_content (struct tui_gen_win_info *); extern void tui_free_data_content (tui_win_content, int); extern void tui_free_all_source_wins_content (void); extern struct tui_win_info *tui_partial_win_by_name (const char *); -extern const char *tui_win_name (const struct tui_gen_win_info *); extern enum tui_layout_type tui_current_layout (void); extern void tui_set_current_layout_to (enum tui_layout_type); extern int tui_term_height (void); |