asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #28470 from Calinou/fix-windows-clipboard-line-endings

Browse source 
Convert line endings to CRLF in `OS.set_clipboard()` on Windows
This commit is contained in:
Rémi Verschelde 2019-04-29 16:24:10 +02:00 committed by GitHub
commit 0eaf32bb29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/windows/os_windows.cpp
View file

@ -1411,26 +1411,29 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
void OS_Windows::set_clipboard(const String &p_text) { void OS_Windows::set_clipboard(const String &p_text) {
// Convert LF line endings to CRLF in clipboard content
// Otherwise, line endings won't be visible when pasted in other software
String text = p_text.replace("\n", "\r\n");
if (!OpenClipboard(hWnd)) { if (!OpenClipboard(hWnd)) {
ERR_EXPLAIN("Unable to open clipboard."); ERR_EXPLAIN("Unable to open clipboard.");
ERR_FAIL(); ERR_FAIL();
}; };
EmptyClipboard(); EmptyClipboard();
HGLOBAL mem = GlobalAlloc(GMEM_MOVEABLE, (p_text.length() + 1) * sizeof(CharType)); HGLOBAL mem = GlobalAlloc(GMEM_MOVEABLE, (text.length() + 1) * sizeof(CharType));
if (mem == NULL) { if (mem == NULL) {
ERR_EXPLAIN("Unable to allocate memory for clipboard contents."); ERR_EXPLAIN("Unable to allocate memory for clipboard contents.");
ERR_FAIL(); ERR_FAIL();
}; };
LPWSTR lptstrCopy = (LPWSTR)GlobalLock(mem); LPWSTR lptstrCopy = (LPWSTR)GlobalLock(mem);
memcpy(lptstrCopy, p_text.c_str(), (p_text.length() + 1) * sizeof(CharType)); memcpy(lptstrCopy, text.c_str(), (text.length() + 1) * sizeof(CharType));
//memset((lptstrCopy + p_text.length()), 0, sizeof(CharType));
GlobalUnlock(mem); GlobalUnlock(mem);
SetClipboardData(CF_UNICODETEXT, mem); SetClipboardData(CF_UNICODETEXT, mem);
// set the CF_TEXT version (not needed?) // set the CF_TEXT version (not needed?)
CharString utf8 = p_text.utf8(); CharString utf8 = text.utf8();
mem = GlobalAlloc(GMEM_MOVEABLE, utf8.length() + 1); mem = GlobalAlloc(GMEM_MOVEABLE, utf8.length() + 1);
if (mem == NULL) { if (mem == NULL) {
ERR_EXPLAIN("Unable to allocate memory for clipboard contents."); ERR_EXPLAIN("Unable to allocate memory for clipboard contents.");