Skip to content

Use UTF-8 code page when using native ANSI sequence processing #4968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2024
Merged

Use UTF-8 code page when using native ANSI sequence processing #4968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions compat/winansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,11 +595,15 @@ static void detect_msys_tty(int fd)
#endif

static HANDLE std_console_handle;
static DWORD std_console_mode;
static DWORD std_console_mode = ENABLE_VIRTUAL_TERMINAL_PROCESSING;
static UINT std_console_code_page = CP_UTF8;

static void reset_std_console_mode(void)
static void reset_std_console(void)
{
SetConsoleMode(std_console_handle, std_console_mode);
if (std_console_mode != ENABLE_VIRTUAL_TERMINAL_PROCESSING)
SetConsoleMode(std_console_handle, std_console_mode);
if (std_console_code_page != CP_UTF8)
SetConsoleOutputCP(std_console_code_page);
}

static int enable_virtual_processing(void)
Expand All @@ -613,6 +617,14 @@ static int enable_virtual_processing(void)
return 0;
}

std_console_code_page = GetConsoleOutputCP();
if (std_console_code_page != CP_UTF8)
SetConsoleOutputCP(CP_UTF8);
if (!std_console_code_page)
std_console_code_page = CP_UTF8;

atexit(reset_std_console);

if (std_console_mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING)
return 1;

Expand All @@ -622,7 +634,6 @@ static int enable_virtual_processing(void)
ENABLE_VIRTUAL_TERMINAL_PROCESSING))
return 0;

atexit(reset_std_console_mode);
return 1;
}

Expand Down