From 76d2be8e92a900558648eeba6b4ff95cba62801e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 1 Jul 2019 14:26:42 -0600 Subject: [PATCH] Remove make_command_window This unifies the creation and re-initialization cases for the command window. When this is done, it becomes clear that make_command_window isn't needed -- it can be replaced with a simple "new", so this is removed as well. gdb/ChangeLog 2019-07-17 Tom Tromey * tui/tui-layout.c (make_command_window): Remove. (show_source_disasm_command, show_source_or_disasm_and_command): Unify creation and re-initialization cases. --- gdb/ChangeLog | 6 ++++++ gdb/tui/tui-layout.c | 50 ++++++++++++++------------------------------ 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6d50df19d90..5d2c7ad1c7f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-07-17 Tom Tromey + + * tui/tui-layout.c (make_command_window): Remove. + (show_source_disasm_command, show_source_or_disasm_and_command): + Unify creation and re-initialization cases. + 2019-07-17 Tom Tromey * tui/tui-layout.c (show_source_or_disasm_and_command): Unify diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 83eb0dfeb46..3c263604e82 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -44,7 +44,6 @@ ********************************/ static void show_layout (enum tui_layout_type); static void show_source_or_disasm_and_command (enum tui_layout_type); -static struct tui_win_info *make_command_window (int, int); static struct tui_win_info *make_source_window (int, int); static struct tui_win_info *make_disasm_window (int, int); static void show_source_command (void); @@ -480,17 +479,6 @@ prev_layout (void) } - -static struct tui_win_info * -make_command_window (int height, int origin_y) -{ - struct tui_win_info *result = new tui_cmd_window (); - result->reset (height, tui_term_width (), 0, origin_y); - tui_make_window (result, DONT_BOX_WINDOW); - return result; -} - - /* make_source_window(). */ static struct tui_win_info * @@ -589,16 +577,14 @@ show_source_disasm_command (void) tui_show_source_content (TUI_DISASM_WIN); if (TUI_CMD_WIN == NULL) - tui_win_list[CMD_WIN] - = make_command_window (cmd_height, tui_term_height () - cmd_height); - else - { - TUI_CMD_WIN->reset (TUI_CMD_WIN->height, - TUI_CMD_WIN->width, - 0, - TUI_CMD_WIN->origin.y); - tui_make_visible (TUI_CMD_WIN); - } + tui_win_list[CMD_WIN] = new tui_cmd_window (); + TUI_CMD_WIN->reset (cmd_height, + tui_term_width (), + 0, + tui_term_height () - cmd_height); + /* FIXME tui_cmd_window won't recreate the handle on + make_visible, so we need this instead. */ + tui_make_window (TUI_CMD_WIN, DONT_BOX_WINDOW); tui_set_current_layout_to (SRC_DISASSEM_COMMAND); } } @@ -734,18 +720,14 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) tui_show_source_content (win_info); if (TUI_CMD_WIN == NULL) - { - tui_win_list[CMD_WIN] = make_command_window (cmd_height, - src_height); - } - else - { - TUI_CMD_WIN->reset (TUI_CMD_WIN->height, - TUI_CMD_WIN->width, - TUI_CMD_WIN->origin.x, - TUI_CMD_WIN->origin.y); - tui_make_visible (TUI_CMD_WIN); - } + tui_win_list[CMD_WIN] = new tui_cmd_window (); + TUI_CMD_WIN->reset (cmd_height, + tui_term_width (), + 0, + src_height); + /* FIXME tui_cmd_window won't recreate the handle on + make_visible, so we need this instead. */ + tui_make_window (TUI_CMD_WIN, DONT_BOX_WINDOW); tui_set_current_layout_to (layout_type); } } -- 2.30.2