Mercurial > vim
changeset 19983:8f2bc094acee v8.2.0547
patch 8.2.0547: Win32: restoring screen not always done right
Commit: https://github.com/vim/vim/commit/e7f234120f71a75f0c7c2a67e0b70c6450c50a02
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 11 22:38:34 2020 +0200
patch 8.2.0547: Win32: restoring screen not always done right
Problem: Win32: restoring screen not always done right.
Solution: Use a more appropriate method. (Nobuhiro Takasaki, closes https://github.com/vim/vim/issues/5909)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 11 Apr 2020 22:45:04 +0200 |
| parents | 30238b032e54 |
| children | f6ec09f04b0c |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -2612,8 +2612,12 @@ mch_init_c(void) create_conin(); g_hConOut = GetStdHandle(STD_OUTPUT_HANDLE); + vtp_flag_init(); + # ifdef FEAT_RESTORE_ORIG_SCREEN // Save the initial console buffer for later restoration + if (vtp_working && p_rs) + vtp_printf("\033[?1049h"); SaveConsoleBuffer(&g_cbOrig); g_attrCurrent = g_attrDefault = g_cbOrig.Info.wAttributes; # else @@ -2671,7 +2675,6 @@ mch_init_c(void) win_clip_init(); # endif - vtp_flag_init(); vtp_init(); } @@ -5431,9 +5434,6 @@ termcap_mode_start(void) if (g_fTermcapMode) return; - if (!p_rs && USE_VTP) - vtp_printf("\033[?1049h"); - SaveConsoleBuffer(&g_cbNonTermcap); if (g_cbTermcap.IsValid) @@ -5501,10 +5501,11 @@ termcap_mode_end(void) # ifdef FEAT_RESTORE_ORIG_SCREEN cb = exiting ? &g_cbOrig : &g_cbNonTermcap; + if (!(vtp_working && exiting)) # else cb = &g_cbNonTermcap; # endif - RestoreConsoleBuffer(cb, p_rs); + RestoreConsoleBuffer(cb, p_rs); restore_console_color_rgb(); SetConsoleCursorInfo(g_hConOut, &g_cci); @@ -5530,11 +5531,16 @@ termcap_mode_end(void) /* * Position the cursor at the leftmost column of the desired row. */ - SetConsoleCursorPosition(g_hConOut, coord); - } - - if (!p_rs && USE_VTP) +# ifdef FEAT_RESTORE_ORG_SCREEN + if (!(vtp_working && exiting)) +# endif + SetConsoleCursorPosition(g_hConOut, coord); + } + +# ifdef FEAT_RESTORE_ORIG_SCREEN + if (vtp_working && p_rs && exiting) vtp_printf("\033[?1049l"); +# endif g_fTermcapMode = FALSE; }