From: Tom Tromey <tom@tromey.com>
Date: Wed, 9 Oct 2019 02:06:09 +0000 (-0600)
Subject: Consolidate setting of current_layout
X-Git-Tag: binutils-2_34~791
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed2c82c364043cf4726541cc7e8011197185b3f8;p=thirdparty%2Fbinutils-gdb.git

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
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f1a05e276db..23095e0200f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index c7f6545b3ec..ba0b367e16d 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -91,6 +91,7 @@ show_layout (enum tui_layout_type layout)
 	  break;
 	}
 
+      current_layout = layout;
       tui_delete_invisible_windows ();
     }
 }
@@ -418,7 +419,6 @@ show_source_disasm_command (void)
 		       tui_term_width (),
 		       0,
 		       tui_term_height () - cmd_height);
-  current_layout = SRC_DISASSEM_COMMAND;
 }
 
 
@@ -461,8 +461,6 @@ show_data (enum tui_layout_type new_layout)
 		   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 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
 		       tui_term_width (),
 		       0,
 		       src_height);
-  current_layout = layout_type;
 }