Skip to content
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

Full Unicode Support #2541

Closed
wants to merge 8 commits into from
Closed

Full Unicode Support #2541

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2cba94a
Use windows API to convert UTF-16 for clipboard
cloudwu May 8, 2019
cf4c041
Use Windows API to convert UTF-16 for ImFileOpen
cloudwu May 8, 2019
fc2dff0
Add AddInputCharacterUTF16 for windows backend to handle WM_CHAR
cloudwu May 8, 2019
3bedb30
Fix ImTextCountUtf8BytesFromChar and ImTextCharToUtf8, these APIs ass…
cloudwu May 8, 2019
a9c741c
Full Unicode Support
cloudwu May 7, 2019
01c4d56
fix build for WideCharToMultiByte
cloudwu May 8, 2019
44eb8e6
Merge branch 'master' into unicode
cloudwu May 15, 2019
f524371
Merge branch 'master' into unicode
cloudwu May 30, 2019
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
Prev Previous commit
Next Next commit
Use Windows API to convert UTF-16 for ImFileOpen
  • Loading branch information
@cloudwu
cloudwu committed May 8, 2019
commit cf4c0414297241e7893a5a1694faa47204c42395
12 changes: 6 additions & 6 deletions imgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,13 +1556,13 @@ FILE* ImFileOpen(const char* filename, const char* mode)
{
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__GNUC__)
// We need a fopen() wrapper because MSVC/Windows fopen doesn't handle UTF-8 filenames. Converting both strings from UTF-8 to wchar format (using a single allocation, because we can)
const int filename_wsize = ImTextCountCharsFromUtf8(filename, NULL) + 1;
const int mode_wsize = ImTextCountCharsFromUtf8(mode, NULL) + 1;
ImVector<ImWchar> buf;
const int filename_wsize = ::MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0);
const int mode_wsize = ::MultiByteToWideChar(CP_UTF8, 0, mode, -1, NULL, 0);
ImVector<wchar_t> buf;
buf.resize(filename_wsize + mode_wsize);
ImTextStrFromUtf8(&buf[0], filename_wsize, filename, NULL);
ImTextStrFromUtf8(&buf[filename_wsize], mode_wsize, mode, NULL);
return _wfopen((wchar_t*)&buf[0], (wchar_t*)&buf[filename_wsize]);
::MultiByteToWideChar(CP_UTF8, 0, filename, -1, &buf[0], filename_wsize);
::MultiByteToWideChar(CP_UTF8, 0, mode, -1,&buf[filename_wsize], mode_wsize);
return _wfopen(&buf[0], &buf[filename_wsize]);
#else
return fopen(filename, mode);
#endif
Expand Down