Set TUI locator height to 1

The TUI has long had code to resize the locator, using 2 as the
height.  However the code has "1" in a comment, like:

    locator->resize (2 /* 1 */ ,

This patch fixes the resizing code to set the height to 1.  Doing this
revealed what was probably the reason for setting the height to 2 in
the first place: this caused the locator window to scroll.  However,
this is easily handled by calling scrollok on the locator window.

gdb/ChangeLog
2019-09-20  Tom Tromey  <tom@tromey.com>

	* tui/tui-win.c (tui_resize_all, tui_adjust_win_heights): Use 1 as
	height for locator.
	* tui/tui-stack.c (tui_locator_window::rerender): Call scrollok.
	* tui/tui-layout.c (show_source_disasm_command, show_data)
	(show_source_or_disasm_and_command): Use 1 as height for locator.
This commit is contained in:
Tom Tromey 2019-07-24 16:37:48 -06:00
parent 9abd8a65c1
commit 1b935acf7e
4 changed files with 19 additions and 17 deletions

View File

@ -1,3 +1,11 @@
2019-09-20 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_resize_all, tui_adjust_win_heights): Use 1 as
height for locator.
* tui/tui-stack.c (tui_locator_window::rerender): Call scrollok.
* tui/tui-layout.c (show_source_disasm_command, show_data)
(show_source_or_disasm_and_command): Use 1 as height for locator.
2019-09-20 Tom Tromey <tom@tromey.com> 2019-09-20 Tom Tromey <tom@tromey.com>
* tui/tui.c (tui_enable): Update. * tui/tui.c (tui_enable): Update.

View File

@ -511,10 +511,8 @@ show_source_disasm_command (void)
tui_term_width (), tui_term_width (),
0, 0,
src_height - 1); src_height - 1);
locator->resize (2 /* 1 */ , locator->resize (1, tui_term_width (),
tui_term_width (), 0, (src_height + asm_height) - 1);
0,
(src_height + asm_height) - 1);
if (TUI_CMD_WIN == NULL) if (TUI_CMD_WIN == NULL)
tui_win_list[CMD_WIN] = new tui_cmd_window (); tui_win_list[CMD_WIN] = new tui_cmd_window ();
@ -561,10 +559,8 @@ show_data (enum tui_layout_type new_layout)
tui_term_width (), tui_term_width (),
0, 0,
data_height - 1); data_height - 1);
locator->resize (2 /* 1 */ , locator->resize (1, tui_term_width (),
tui_term_width (), 0, total_height - 1);
0,
total_height - 1);
TUI_CMD_WIN->resize (TUI_CMD_WIN->height, tui_term_width (), TUI_CMD_WIN->resize (TUI_CMD_WIN->height, tui_term_width (),
0, total_height); 0, total_height);
@ -635,10 +631,8 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
win_info = TUI_DISASM_WIN; win_info = TUI_DISASM_WIN;
} }
locator->resize (2 /* 1 */ , locator->resize (1, tui_term_width (),
tui_term_width (), 0, src_height - 1);
0,
src_height - 1);
win_info->resize (src_height - 1, win_info->resize (src_height - 1,
tui_term_width (), tui_term_width (),
0, 0,

View File

@ -229,6 +229,7 @@ tui_locator_window::rerender ()
if (handle != NULL) if (handle != NULL)
{ {
std::string string = make_status_line (); std::string string = make_status_line ();
scrollok (handle, FALSE);
wmove (handle, 0, 0); wmove (handle, 0, 0);
/* We ignore the return value from wstandout and wstandend, casting /* We ignore the return value from wstandout and wstandend, casting
them to void in order to avoid a compiler warning. The warning them to void in order to avoid a compiler warning. The warning

View File

@ -580,8 +580,7 @@ tui_resize_all (void)
src_win->resize (new_height, screenwidth, 0, 0); src_win->resize (new_height, screenwidth, 0, 0);
locator->resize (2 /* 1 */, screenwidth, locator->resize (1, screenwidth, 0, new_height);
0, new_height);
new_height = screenheight - (new_height + 1); new_height = screenheight - (new_height + 1);
TUI_CMD_WIN->resize (new_height, screenwidth, TUI_CMD_WIN->resize (new_height, screenwidth,
@ -637,7 +636,7 @@ tui_resize_all (void)
second_win->resize (new_height, screenwidth, second_win->resize (new_height, screenwidth,
0, first_win->height - 1); 0, first_win->height - 1);
locator->resize (2 /* 1 */, screenwidth, locator->resize (1, screenwidth,
0, second_win->origin.y + new_height); 0, second_win->origin.y + new_height);
/* Change the command window's height/width. */ /* Change the command window's height/width. */
@ -1119,7 +1118,7 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
second_win->resize (second_win->height + second_split_diff, second_win->resize (second_win->height + second_split_diff,
width, width,
0, first_win->height - 1); 0, first_win->height - 1);
locator->resize (2 /* 1 */, width, locator->resize (1, width,
0, (second_win->origin.y 0, (second_win->origin.y
+ second_win->height + 1)); + second_win->height + 1));
@ -1155,7 +1154,7 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
else else
second_win->resize (second_win->height, width, second_win->resize (second_win->height, width,
0, first_win->height - 1); 0, first_win->height - 1);
locator->resize (2 /* 1 */, width, locator->resize (1, width,
0, (second_win->origin.y 0, (second_win->origin.y
+ second_win->height + 1)); + second_win->height + 1));
TUI_CMD_WIN->origin.y = locator->origin.y + 1; TUI_CMD_WIN->origin.y = locator->origin.y + 1;