[review] Consolidate setting of current

Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed

* [review] Consolidate setting of current_layout
@ 2019-10-27 21:50 Tom Tromey (Code Review)
  2019-11-06 14:27 ` [review v2] " Tom Tromey (Code Review)
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Tom Tromey (Code Review) @ 2019-10-27 21:50 UTC (permalink / raw)
  To: gdb-patches

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-10-27  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 9c79569..fe85d31 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-27  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-10-27  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-layout.c (_initialize_tui_layout): Move to end.
 
 2019-10-27  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: 1
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newchange


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [review v2] Consolidate setting of current_layout
  2019-10-27 21:50 [review] Consolidate setting of current_layout Tom Tromey (Code Review)
@ 2019-11-06 14:27 ` Tom Tromey (Code Review)
  2019-11-12 17:00 ` Andrew Burgess (Code Review)
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Tom Tromey (Code Review) @ 2019-11-06 14:27 UTC (permalink / raw)
  To: gdb-patches

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-06  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 e66b957..3939d43 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2019-11-06  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-06  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-layout.c (_initialize_tui_layout): Move to end.
 
 2019-11-06  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: 2
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newpatchset


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [review v2] Consolidate setting of current_layout
  2019-10-27 21:50 [review] Consolidate setting of current_layout Tom Tromey (Code Review)
  2019-11-06 14:27 ` [review v2] " Tom Tromey (Code Review)
@ 2019-11-12 17:00 ` Andrew Burgess (Code Review)
  2019-11-12 19:40 ` [pushed] " Sourceware to Gerrit sync (Code Review)
  2019-11-12 19:46 ` Sourceware to Gerrit sync (Code Review)
  3 siblings, 0 replies; 5+ messages in thread
From: Andrew Burgess (Code Review) @ 2019-11-12 17:00 UTC (permalink / raw)
  To: Tom Tromey, gdb-patches

Andrew Burgess has posted comments on this change.

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


Patch Set 2: Code-Review+2

LGTM


-- 
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: Id8b23797d68e607f0fcd6d29b8801869d40d1869
Gerrit-Change-Number: 363
Gerrit-PatchSet: 2
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Andrew Burgess <andrew.burgess@embecosm.com>
Gerrit-Comment-Date: Tue, 12 Nov 2019 17:00:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [pushed] Consolidate setting of current_layout
  2019-10-27 21:50 [review] Consolidate setting of current_layout Tom Tromey (Code Review)
  2019-11-06 14:27 ` [review v2] " Tom Tromey (Code Review)
  2019-11-12 17:00 ` Andrew Burgess (Code Review)
@ 2019-11-12 19:40 ` Sourceware to Gerrit sync (Code Review)
  2019-11-12 19:46 ` Sourceware to Gerrit sync (Code Review)
  3 siblings, 0 replies; 5+ messages in thread
From: Sourceware to Gerrit sync (Code Review) @ 2019-11-12 19:40 UTC (permalink / raw)
  To: Tom Tromey, Andrew Burgess, gdb-patches

The original change was created by Tom Tromey.

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [pushed] Consolidate setting of current_layout
  2019-10-27 21:50 [review] Consolidate setting of current_layout Tom Tromey (Code Review)
                   ` (2 preceding siblings ...)
  2019-11-12 19:40 ` [pushed] " Sourceware to Gerrit sync (Code Review)
@ 2019-11-12 19:46 ` Sourceware to Gerrit sync (Code Review)
  3 siblings, 0 replies; 5+ messages in thread
From: Sourceware to Gerrit sync (Code Review) @ 2019-11-12 19:46 UTC (permalink / raw)
  To: Tom Tromey, gdb-patches; +Cc: Andrew Burgess

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-11-12 19:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-27 21:50 [review] Consolidate setting of current_layout Tom Tromey (Code Review)
2019-11-06 14:27 ` [review v2] " Tom Tromey (Code Review)
2019-11-12 17:00 ` Andrew Burgess (Code Review)
2019-11-12 19:40 ` [pushed] " Sourceware to Gerrit sync (Code Review)
2019-11-12 19:46 ` Sourceware to Gerrit sync (Code Review)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox