thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1086: display wrong in Windows terminal after exiting Vim

Browse Source 
Problem:    Display wrong in Windows terminal after exiting Vim.
Solution:   Apply screen restore fix for Windows 11 also to Windows 10 builds.
            (Christopher Plewright, closes #11713, closes #11706)
This commit is contained in:
Christopher Plewright
2022-12-22 13:45:23 +00:00
committed by Bram Moolenaar
parent 9b8a365d01
commit c8b126d70d
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/os_win32.c
View File

@@ -256,7 +256,8 @@ static int suppress_winsize = 1; // don't fiddle with console
static char_u *exe_path = NULL; static char_u *exe_path = NULL;
static BOOL win8_or_later = FALSE; static BOOL win8_or_later = FALSE;
static BOOL win11_or_later = FALSE; static BOOL win10_22H2_or_later = FALSE;
static BOOL use_alternate_screen_buffer = FALSE;
/* /*
* Get version number including build number * Get version number including build number
@@ -919,9 +920,9 @@ PlatformId(void)
|| ovi.dwMajorVersion > 6) || ovi.dwMajorVersion > 6)
win8_or_later = TRUE; win8_or_later = TRUE;
if ((ovi.dwMajorVersion == 10 && ovi.dwBuildNumber >= 22000) if ((ovi.dwMajorVersion == 10 && ovi.dwBuildNumber >= 19045)
|| ovi.dwMajorVersion > 10) || ovi.dwMajorVersion > 10)
win11_or_later = TRUE; win10_22H2_or_later = TRUE;
#ifdef HAVE_ACL #ifdef HAVE_ACL
// Enable privilege for getting or setting SACLs. // Enable privilege for getting or setting SACLs.
@@ -3040,7 +3041,7 @@ SaveConsoleBuffer(
// VTP uses alternate screen buffer. // VTP uses alternate screen buffer.
// No need to save buffer contents for restoration. // No need to save buffer contents for restoration.
if (win11_or_later && vtp_working) if (use_alternate_screen_buffer)
return TRUE; return TRUE;
/* /*
@@ -3138,7 +3139,7 @@ RestoreConsoleBuffer(
// VTP uses alternate screen buffer. // VTP uses alternate screen buffer.
// No need to restore buffer contents. // No need to restore buffer contents.
if (win11_or_later && vtp_working) if (use_alternate_screen_buffer)
return TRUE; return TRUE;
if (cb == NULL || !cb->IsValid) if (cb == NULL || !cb->IsValid)
@@ -6106,7 +6107,8 @@ termcap_mode_start(void)
// VTP uses alternate screen buffer. // VTP uses alternate screen buffer.
// Switch to a new alternate screen buffer. // Switch to a new alternate screen buffer.
if (win11_or_later && p_rs && vtp_working) // But, not if running in a nested terminal
if (use_alternate_screen_buffer)
vtp_printf("\033[?1049h"); vtp_printf("\033[?1049h");
SaveConsoleBuffer(&g_cbNonTermcap); SaveConsoleBuffer(&g_cbNonTermcap);
@@ -6189,7 +6191,7 @@ termcap_mode_end(void)
// VTP uses alternate screen buffer. // VTP uses alternate screen buffer.
// Switch back to main screen buffer. // Switch back to main screen buffer.
if (exiting && win11_or_later && p_rs && vtp_working) if (exiting && use_alternate_screen_buffer)
vtp_printf("\033[?1049l"); vtp_printf("\033[?1049l");
if (!USE_WT && (p_rs || exiting)) if (!USE_WT && (p_rs || exiting))
@@ -8392,7 +8394,8 @@ vtp_init(void)
default_console_color_fg = fg; default_console_color_fg = fg;
} }
# endif # endif
use_alternate_screen_buffer = win10_22H2_or_later && p_rs && vtp_working
&& !mch_getenv("VIM_TERMINAL");
set_console_color_rgb(); set_console_color_rgb();
} }

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1086,
/**/ /**/
1085, 1085,
/**/ /**/