nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Windows: fix terminal hang with resize forbidden.

Browse Source 
A server attempt to resize the window (for instance via DECCOLM) when
"When window is resized" was set to "Forbid resizing completely" would
cause all terminal output to be suspended, due to the resize attempt
never being acknowledged.

(There are other code paths like this, which I've fixed for
completeness, but I don't think they have any effect: the terminal
filters out resize attempts to the current size before this point, and
even if a server can get such a request through the SUPDUP protocol, the
test for that is wrong and will never fire -- this needs fixing
separately.)

(cherry picked from commit ebceb8bc94)
This commit is contained in:
Simon Tatham 2023-04-19 14:19:22 +01:00
parent 01b4fb746c
commit 5678b4c7cf
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
windows/window.c
View File

@ -1675,20 +1675,27 @@ static void wintw_request_resize(TermWin *tw, int w, int h)
{
const struct BackendVtable *vt;
int width, height;
int resize_action = conf_get_int(conf, CONF_resize_action);
bool deny_resize = false;
/* If the window is maximized suppress resizing attempts */
if (IsZoomed(wgs.term_hwnd)) {
if (conf_get_int(conf, CONF_resize_action) == RESIZE_TERM) {
term_resize_request_completed(term);
return;
}
/* Suppress server-originated resizing attempts if local resizing
* is disabled entirely, or if it's supposed to change
* rows/columns but the window is maximised. */
if (resize_action == RESIZE_DISABLED
|| (resize_action == RESIZE_TERM && IsZoomed(wgs.term_hwnd))) {
deny_resize = true;
}
if (conf_get_int(conf, CONF_resize_action) == RESIZE_DISABLED) return;
vt = backend_vt_from_proto(be_default_protocol);
if (vt && vt->flags & BACKEND_RESIZE_FORBIDDEN)
deny_resize = true;
if (h == term->rows && w == term->cols) deny_resize = true;
/* We still need to acknowledge a suppressed resize attempt. */
if (deny_resize) {
term_resize_request_completed(term);
return;
if (h == term->rows && w == term->cols) return;
}
/* Sanity checks ... */
{
@ -1709,8 +1716,7 @@ static void wintw_request_resize(TermWin *tw, int w, int h)
}
}
if (conf_get_int(conf, CONF_resize_action) != RESIZE_FONT &&
!IsZoomed(wgs.term_hwnd)) {
if (resize_action != RESIZE_FONT && !IsZoomed(wgs.term_hwnd)) {
width = extra_width + font_width * w;
height = extra_height + font_height * h;