OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove tui_gen_win_info::viewport_height 

tui_gen_win_info::viewport_height is only used in a couple of spots,
and is redundant with "height".  This patch removes viewport_height.

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

	* tui/tui-source.c (tui_source_window::maybe_update): Update.
	* tui/tui-regs.c (tui_data_window::display_registers_from):
	Update.
	* tui/tui-layout.c (tui_gen_win_info::resize): Update.
	* tui/tui-data.h (struct tui_gen_win_info) <viewport_height>:
	Remove.
	* tui/tui-command.c (tui_cmd_window::resize): Update.

Change-Id: I020e026fbe289adda8e2fdfebca91bdbdbc312e8
This commit is contained in:
Tom Tromey 2019-12-21 10:35:59 -07:00
parent f2810fe00a
commit 1630140dc6
6 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2019-12-27 Tom Tromey <tom@tromey.com>
* tui/tui-source.c (tui_source_window::maybe_update): Update.
* tui/tui-regs.c (tui_data_window::display_registers_from):
Update.
* tui/tui-layout.c (tui_gen_win_info::resize): Update.
* tui/tui-data.h (struct tui_gen_win_info) <viewport_height>:
Remove.
* tui/tui-command.c (tui_cmd_window::resize): Update.
2019-12-26 Christian Biesinger <cbiesinger@google.com>
* ada-lang.c (ada_decode_symbol): Update.

8
gdb/tui/tui-command.c
View File

@ -42,14 +42,6 @@ tui_cmd_window::resize (int height_, int width_, int origin_x, int origin_y)
{
width = width_;
height = height_;
if (height > 1)
{
/* Note this differs from the base class implementation, because
this window can't be boxed. */
viewport_height = height - 1;
}
else
viewport_height = 1;
x = origin_x;
y = origin_y;

2
gdb/tui/tui-data.h
View File

@ -110,8 +110,6 @@ public:
/* Origin of window. */
int x = 0;
int y = 0;
/* Viewport height. */
int viewport_height = 0;
};
/* Constant definitions. */

4
gdb/tui/tui-layout.c
View File

@ -373,10 +373,6 @@ tui_gen_win_info::resize (int height_, int width_,
width = width_;
height = height_;
if (height > 1)
viewport_height = height - 2;
else
viewport_height = 1;
x = origin_x_;
y = origin_y_;

3
gdb/tui/tui-regs.c
View File

@ -266,8 +266,7 @@ tui_data_window::display_registers_from (int start_element_no)
/* Now create each data "sub" window, and write the display into
it. */
cur_y = 1;
while (i < m_regs_content.size ()
&& cur_y <= viewport_height)
while (i < m_regs_content.size () && cur_y <= height - 2)
{
for (j = 0;
j < m_regs_column_count && i < m_regs_content.size ();

2
gdb/tui/tui-source.c
View File

@ -193,7 +193,7 @@ tui_source_window::line_is_displayed (int line) const
void
tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal)
{
int start_line = (sal.line - (viewport_height / 2)) + 1;
int start_line = (sal.line - ((height - 2) / 2)) + 1;
if (start_line <= 0)
start_line = 1;