[PATCH 02/24] Simplify tui_add_win_to_layout

Tom Tromey
2020-01-04T18:34:17Z

tui_add_win_to_layout is only ever called for the source or assembly
windows. This simplifies the function by removing the DATA_WIN case.

gdb/ChangeLog
2020-01-04 Tom Tromey <tom@tromey.com>

* tui/tui-layout.h (tui_add_win_to_layout): Add comment.
* tui/tui-layout.c (tui_add_win_to_layout): Add assert. Remove
DATA_WIN case.

Change-Id: Idfca902c6c90153acc5d19af4c33aa74bc3caf31
---
gdb/ChangeLog | 6 ++++++
gdb/tui/tui-layout.c | 19 ++++---------------
gdb/tui/tui-layout.h | 5 +++++
3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 1e9c5c53e3f..8be98e9ba48 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -185,12 +185,13 @@ tui_set_layout (enum tui_layout_type layout_type)
}
}

-/* Add the specified window to the layout in a logical way. This
- means setting up the most logical layout given the window to be
- added. */
+/* See tui-layout.h. */
+
void
tui_add_win_to_layout (enum tui_win_type type)
{
+ gdb_assert (type == SRC_WIN || type == DISASSEM_WIN);
+
enum tui_layout_type cur_layout = tui_current_layout ();

switch (type)
@@ -217,18 +218,6 @@ tui_add_win_to_layout (enum tui_win_type type)
show_layout (DISASSEM_COMMAND);
}
break;
- case DATA_WIN:
- if (cur_layout != SRC_DATA_COMMAND
- && cur_layout != DISASSEM_DATA_COMMAND)
- {
- if (cur_layout == DISASSEM_COMMAND)
- show_layout (DISASSEM_DATA_COMMAND);
- else
- show_layout (SRC_DATA_COMMAND);
- }
- break;
- default:
- break;
}
}

diff --git a/gdb/tui/tui-layout.h b/gdb/tui/tui-layout.h
index c2380b3c0a7..37f07c24e4f 100644
--- a/gdb/tui/tui-layout.h
+++ b/gdb/tui/tui-layout.h
@@ -173,7 +173,12 @@ private:
bool m_applied = false;
};

+/* Add the specified window to the layout in a logical way. This
+ means setting up the most logical layout given the window to be
+ added. Only the source or disassembly window can be added this
+ way. */
extern void tui_add_win_to_layout (enum tui_win_type);
+
extern void tui_set_layout (enum tui_layout_type);

/* Apply the current layout. */
--
2.17.2