From: Ron Yorston Date: Wed, 20 Mar 2019 11:00:28 +0000 (+0000) Subject: vi: allow manual screen update if SIGWINCH isn't supported X-Git-Tag: 1_31_0~148 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2fd1aaf86e2adc16101bdf95770a2783830727a;p=oweals%2Fbusybox.git vi: allow manual screen update if SIGWINCH isn't supported On platforms that don't support SIGWINCH vi can be configured with FEATURE_VI_USE_SIGNALS disabled and FEATURE_VI_WIN_RESIZE enabled. This allows the user to force an update with ^L when the screen is resized. However, because the SIGWINCH handler hasn't run the virtual screen buffer won't have been updated and the display becomes corrupted. Fix this by calling new_screen() if necessary. Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- diff --git a/editors/vi.c b/editors/vi.c index 5e5e13111..425d14c9c 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -3349,7 +3349,15 @@ static void refresh(int full_screen) if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) { unsigned c = columns, r = rows; query_screen_dimensions(); +#if ENABLE_FEATURE_VI_USE_SIGNALS full_screen |= (c - columns) | (r - rows); +#else + if (c != columns || r != rows) { + full_screen = TRUE; + /* update screen memory since SIGWINCH won't have done it */ + new_screen(rows, columns); + } +#endif } sync_cursor(dot, &crow, &ccol); // where cursor will be (on "dot") tp = screenbegin; // index into text[] of top line