[pushed] Consolidate setting of current_layout

Sourceware to Gerrit sync (Code Review)
2019-11-12T19:46:20Z

Sourceware to Gerrit sync has submitted this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/363
......................................................................

Consolidate setting of current_layout

Currently several functions in tui-layout.c set current_layout after
their work is done. This moves this assignment to show_layout,
instead.

gdb/ChangeLog
2019-11-12 Tom Tromey <tom@tromey.com>

* tui/tui-layout.c (show_layout): Set current_layout.
(show_source_disasm_command, show_data)
(show_source_or_disasm_and_command): Don't set current_layout.

Change-Id: Id8b23797d68e607f0fcd6d29b8801869d40d1869
---
M gdb/ChangeLog
M gdb/tui/tui-layout.c
2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f1a05e2..23095e0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2019-11-12 Tom Tromey <tom@tromey.com>

+ * tui/tui-layout.c (show_layout): Set current_layout.
+ (show_source_disasm_command, show_data)
+ (show_source_or_disasm_and_command): Don't set current_layout.
+
+2019-11-12 Tom Tromey <tom@tromey.com>
+
* tui/tui-layout.c (_initialize_tui_layout): Move to end.

2019-11-12 Tom Tromey <tom@tromey.com>
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index c7f6545..ba0b367 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -91,6 +91,7 @@
break;
}

+ current_layout = layout;
tui_delete_invisible_windows ();
}
}
@@ -418,7 +419,6 @@
tui_term_width (),
0,
tui_term_height () - cmd_height);
- current_layout = SRC_DISASSEM_COMMAND;
}

@@ -461,8 +461,6 @@
0, total_height - 1);
TUI_CMD_WIN->resize (TUI_CMD_WIN->height, tui_term_width (),
0, total_height);
-
- current_layout = new_layout;
}

void
@@ -541,7 +539,6 @@
tui_term_width (),
0,
src_height);
- current_layout = layout_type;
}

\f

--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: Id8b23797d68e607f0fcd6d29b8801869d40d1869
Gerrit-Change-Number: 363
Gerrit-PatchSet: 3
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Andrew Burgess <andrew.burgess@embecosm.com>
Gerrit-MessageType: merged