Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Support printing unicode characters on windows #449

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Support printing unicode characters on windows #449

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
776c769
Remove wstr allocation per review comment
andrjohns Sep 28, 2024
cfa1c93
Separate js_print for win32
andrjohns Sep 30, 2024
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
30 changes: 29 additions & 1 deletion quickjs-libc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3875,15 +3875,42 @@ JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name)

/**********************************************************/

#ifdef _WIN32
static JSValue js_print(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv)
{
int i;
const char *str;
size_t len;

DWORD written;
HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
if (hConsole == INVALID_HANDLE_VALUE)
return JS_EXCEPTION;
for(i = 0; i < argc; i++) {
if (i != 0)
WriteConsoleW(hConsole, L" ", 1, &written, NULL);
str = JS_ToCStringLen(ctx, &len, argv[i]);
if (!str)
return JS_EXCEPTION;
DWORD prev = GetConsoleOutputCP();
SetConsoleOutputCP(CP_UTF8);
WriteConsoleA(hConsole, str, len, &written, NULL);
SetConsoleOutputCP(prev);
JS_FreeCString(ctx, str);
}
WriteConsoleW(hConsole, L"\n", 1, &written, NULL);
FlushFileBuffers(hConsole);
return JS_UNDEFINED;
}
#else
static JSValue js_print(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv)
{
int i;
const char *str;
size_t len;
for(i = 0; i < argc; i++) {
if (i != 0)
putchar(' ');
str = JS_ToCStringLen(ctx, &len, argv[i]);
if (!str)
Expand All @@ -3895,6 +3922,7 @@ static JSValue js_print(JSContext *ctx, JSValue this_val,
fflush(stdout);
return JS_UNDEFINED;
}
#endif

void js_std_add_helpers(JSContext *ctx, int argc, char **argv)
{
Expand Down
Loading