forked from Imagelibrary/binutils-gdb
deb1ba4e38
With TERM=ansi, when resizing a TUI window from LINES/COLUMNS 31/118
(maximized) to 20/78 (de-maximized), I get a garbled screen (that ^L doesn't
fix) and a message:
...
@@ resize done 0, size = 77x20
...
with the resulting width being 77 instead of the expected 78.
[ The discrepancy also manifests in CLI, filed as PR30346. ]
The discrepancy comes from tui_resize_all, where we ask readline for the
screen size:
...
rl_get_screen_size (&screenheight, &screenwidth);
...
As it happens, when TERM is set to ansi, readline decides that the terminal
cannot auto-wrap lines, and reserves one column to deal with that, and as a
result reports back one less than the actual screen width:
...
$ echo $COLUMNS
78
$ TERM=xterm gdb -ex "show width" -ex q
Number of characters gdb thinks are in a line is 78.
$ TERM=ansi gdb -ex "show width" -ex q
Number of characters gdb thinks are in a line is 77.
...
In tui_resize_all, we need the actual screen width, and using a screenwidth of
one less than the actual value garbles the screen.
This is currently not causing trouble in testing because we have a workaround
in place in proc Term::resize. If we disable the workaround:
...
- stty columns [expr {$_cols + 1}] < $::gdb_tty_name
+ stty columns $_cols < $::gdb_tty_name
...
and dump the screen we get the same type of screen garbling:
...
0 +---------------------------------------+|
1 ||
2 ||
3 ||
...
Another way to reproduce the problem is using command "maint info screen".
After starting gdb with TERM=ansi, entering TUI, and issuing the command, we
get:
...
Number of characters curses thinks are in a line is 78.
...
and after maximizing and demaximizing the window we get:
...
Number of characters curses thinks are in a line is 77.
...
If we use TERM=xterm, we do get the expected 78.
Fix this by:
- detecting when readline will report back less than the actual screen width,
- accordingly setting a new variable readline_hidden_cols,
- using readline_hidden_cols in tui_resize_all to fix the resize problem, and
- removing the workaround in Term::resize.
The test-case gdb.tui/empty.exp serves as regression test.
I've applied the same fix in tui_async_resize_screen, the new test-case
gdb.tui/resize-2.exp serves as a regression test for that change. Without
that fix, we have:
...
FAIL: gdb.tui/resize-2.exp: again: gdb width 80
...
Tested on x86_64-linux.
PR tui/30337
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30337
90 lines
2.6 KiB
Plaintext
90 lines
2.6 KiB
Plaintext
# Copyright 2023 Free Software Foundation, Inc.
|
|
|
|
# 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/>.
|
|
|
|
# Test TUI resizing using maint screen info command.
|
|
|
|
require allow_tui_tests
|
|
|
|
tuiterm_env
|
|
|
|
Term::clean_restart 24 80
|
|
set screen_dim { 0 0 80 24 }
|
|
|
|
# Use a layout with just a command window.
|
|
gdb_test "tui new-layout command-layout cmd 1"
|
|
|
|
if {![Term::prepare_for_tui]} {
|
|
unsupported "TUI not supported"
|
|
return 0
|
|
}
|
|
|
|
# Enter TUI.
|
|
Term::command_no_prompt_prefix "layout command-layout"
|
|
|
|
proc check_width { what n } {
|
|
set re "Number of characters $what thinks are in a line is $n"
|
|
Term::check_region_contents "$what width $n" {*}$::screen_dim $re
|
|
}
|
|
|
|
# Check that curses has the correct notion of screen width.
|
|
Term::command "maint info screen"
|
|
check_width curses 80
|
|
check_width gdb 80
|
|
|
|
# Resize with TUI enabled, wait for the resize message.
|
|
Term::resize 40 90
|
|
set screen_dim { 0 0 90 40 }
|
|
|
|
# Check that curses has the correct notion of screen width after resize.
|
|
Term::command "maint info screen"
|
|
check_width curses 90
|
|
check_width gdb 90
|
|
|
|
# Temporarily disable TUI.
|
|
gdb_test_multiple "tui disable" "" {
|
|
-re "$gdb_prompt $" {
|
|
pass $gdb_test_name
|
|
}
|
|
}
|
|
|
|
# Resize with TUI disabled, so don't wait for the resize message.
|
|
Term::resize 24 80 0
|
|
set screen_dim { 0 0 80 24 }
|
|
gdb_test_multiple "" "two prompt redisplays after resize" {
|
|
-re "\r.*$gdb_prompt \r.*$gdb_prompt $" {
|
|
pass $gdb_test_name
|
|
}
|
|
}
|
|
|
|
# At this point, curses still thinks the width is 90. This doesn't look
|
|
# harmful because TUI is disabled.
|
|
gdb_test "maint info screen" \
|
|
"\r\nNumber of characters curses thinks are in a line is 90.\\r\n.*" \
|
|
"curses width after resize with TUI disabled"
|
|
|
|
# Re-enable TUI.
|
|
send_gdb "tui enable\n"
|
|
# The "tui enable" command is issued on the CLI screen, on the TUI we have the
|
|
# last command issued there: "tui disable".
|
|
Term::wait_for "tui disable"
|
|
|
|
# Check that curses has the correct notion of screen width after screen resize
|
|
# with TUI disabled.
|
|
Term::command "maint info screen"
|
|
with_test_prefix again {
|
|
check_width curses 80
|
|
check_width gdb 80
|
|
}
|