6697fa28bb
When starting TUI in a terminal with 2 lines (likewise with 1 line): ... $ echo $LINES 2 $ gdb -q -tui ... we run into this assert in tui_apply_current_layout: ... /* This should always be made visible by a layout. */ gdb_assert (TUI_CMD_WIN != nullptr); ... The problem is that for the command window: - the minimum height is 3 (the default), but - the maximum height is only 2 because there are only 2 lines. This discrepancy eventually leads to a call to newwin in make_window with: ... (gdb) p height $1 = 3 (gdb) p width $2 = 66 (gdb) p y $3 = -1 (gdb) p x $4 = 0 (gdb) ... which results in a nullptr, which eventually triggers the assert. The easiest way to fix this is to change the minimum height of the command window to 1. However, that would also change behaviour for the case that the screen size is 3 lines or more. For instance, in gdb.tui/winheight.exp the number of lines in the terminal is 24, and the test-case checks that the user cannot increase the source window height to the point that the command window height would be less than 3. Fix this by calculating the minimum height of the command window as follows: - the default (3) if max_height () allows it, and - max_height () otherwise. Tested on x86_64-linux. Approved-By: Tom Tromey <tom@tromey.com> PR tui/31044 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31044
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/* Specific command window processing.
|
|
|
|
Copyright (C) 1998-2023 Free Software Foundation, Inc.
|
|
|
|
Contributed by Hewlett-Packard Company.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef TUI_TUI_COMMAND_H
|
|
#define TUI_TUI_COMMAND_H
|
|
|
|
#include "tui/tui-data.h"
|
|
|
|
/* The TUI command window. */
|
|
struct tui_cmd_window
|
|
: public tui_noscroll_window, tui_nobox_window, tui_norefresh_window,
|
|
tui_always_visible_window
|
|
{
|
|
tui_cmd_window () = default;
|
|
|
|
DISABLE_COPY_AND_ASSIGN (tui_cmd_window);
|
|
|
|
const char *name () const override
|
|
{
|
|
return CMD_NAME;
|
|
}
|
|
|
|
void resize (int height, int width, int origin_x, int origin_y) override;
|
|
|
|
/* Compute the minimum height of this window. */
|
|
virtual int min_height () const override
|
|
{
|
|
int preferred_min = tui_win_info::min_height ();
|
|
int max = max_height ();
|
|
/* If there is enough space to accommodate the preferred minimum height,
|
|
use it. Otherwise, use as much as possible. */
|
|
return (preferred_min <= max
|
|
? preferred_min
|
|
: max);
|
|
}
|
|
|
|
int start_line = 0;
|
|
};
|
|
|
|
/* Refresh the command window. */
|
|
extern void tui_refresh_cmd_win (void);
|
|
|
|
#endif /* TUI_TUI_COMMAND_H */
|