This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 02/19] Remove struct tui_layout_def
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Sat, 3 Aug 2019 07:29:08 -0600
- Subject: [PATCH 02/19] Remove struct tui_layout_def
- References: <20190803132925.25074-1-tom@tromey.com>
"layout_def" isn't actually used in the TUI, so remove it.
gdb/ChangeLog
2019-08-03 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (tui_set_layout): Update.
* tui/tui-data.h (struct tui_layout_def): Remove.
(tui_layout_def): Don't declare.
* tui/tui-data.c (layout_def): Remove.
(tui_layout_def): Remove.
---
gdb/ChangeLog | 8 ++++++++
gdb/tui/tui-data.c | 11 -----------
gdb/tui/tui-data.h | 7 -------
gdb/tui/tui-layout.c | 5 -----
4 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 2748230700c..af5e509ff0b 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -40,9 +40,6 @@ static int term_height, term_width;
static struct tui_locator_window _locator;
static std::vector<tui_source_window_base *> source_windows;
static struct tui_win_info *win_with_focus = NULL;
-static struct tui_layout_def layout_def = {
- SRC_WIN, /* DISPLAY_MODE */
-};
static int win_resized = FALSE;
@@ -77,14 +74,6 @@ tui_set_win_resized_to (int resized)
}
-/* Answer a pointer to the current layout definition. */
-struct tui_layout_def *
-tui_layout_def (void)
-{
- return &layout_def;
-}
-
-
/* Answer the window with the logical focus. */
struct tui_win_info *
tui_win_with_focus (void)
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 5a7c487def4..745181043aa 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -151,12 +151,6 @@ struct tui_line_or_address
} u;
};
-/* Current Layout definition. */
-struct tui_layout_def
-{
- enum tui_win_type display_mode;
-};
-
/* Flags to tell what kind of breakpoint is at current line. */
enum tui_bp_flag
{
@@ -400,7 +394,6 @@ extern void tui_clear_source_windows_detail (void);
extern void tui_add_to_source_windows (struct tui_source_window_base *);
extern struct tui_win_info *tui_win_with_focus (void);
extern void tui_set_win_with_focus (struct tui_win_info *);
-extern struct tui_layout_def *tui_layout_def (void);
extern int tui_win_resized (void);
extern void tui_set_win_resized_to (int);
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index a5709c595f3..93687f3bd99 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -118,7 +118,6 @@ tui_set_layout (enum tui_layout_type layout_type)
struct gdbarch *gdbarch;
CORE_ADDR addr;
struct tui_win_info *win_with_focus = tui_win_with_focus ();
- struct tui_layout_def *layout_def = tui_layout_def ();
extract_display_start_addr (&gdbarch, &addr);
@@ -135,7 +134,6 @@ tui_set_layout (enum tui_layout_type layout_type)
{
case SRC_COMMAND:
tui_set_win_focus_to (TUI_SRC_WIN);
- layout_def->display_mode = SRC_WIN;
break;
case DISASSEM_COMMAND:
/* The previous layout was not showing code.
@@ -148,7 +146,6 @@ tui_set_layout (enum tui_layout_type layout_type)
tui_get_begin_asm_address (&gdbarch, &addr);
tui_set_win_focus_to (TUI_DISASM_WIN);
- layout_def->display_mode = DISASSEM_WIN;
break;
case SRC_DISASSEM_COMMAND:
/* The previous layout was not showing code.
@@ -170,7 +167,6 @@ tui_set_layout (enum tui_layout_type layout_type)
tui_set_win_focus_to (TUI_SRC_WIN);
else
tui_set_win_focus_to (TUI_DATA_WIN);
- layout_def->display_mode = SRC_WIN;
break;
case DISASSEM_DATA_COMMAND:
/* The previous layout was not showing code.
@@ -186,7 +182,6 @@ tui_set_layout (enum tui_layout_type layout_type)
tui_set_win_focus_to (TUI_DISASM_WIN);
else
tui_set_win_focus_to (TUI_DATA_WIN);
- layout_def->display_mode = DISASSEM_WIN;
break;
default:
break;
--
2.17.2