izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clipboard codepage conversion

Browse Source
This commit is contained in:
Yukino Song
2024-10-12 17:27:32 +08:00
parent 2aec3cb7ca
commit 0e50970bd5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/windows/misc.cpp
View File

@@ -98,7 +98,7 @@ namespace bp = boost::process;
static std::string ensureCrLf(const std::string& utf8Str); static std::string ensureCrLf(const std::string& utf8Str);
static std::wstring getClipboardData(); static std::wstring getClipboardData();
static int setClipboardData(const std::string& acpStr); static int setClipboardData(const std::wstring& utf16Str);
using namespace std::literals; using namespace std::literals;
namespace platf { namespace platf {
@@ -1955,14 +1955,14 @@ namespace platf {
bool bool
set_clipboard(const std::string& content) { set_clipboard(const std::string& content) {
std::string cpContent = convertUtf8ToCurrentCodepage(ensureCrLf(content)); std::wstring cpContent = from_utf8(ensureCrLf(content));
return !setClipboardData(cpContent); return !setClipboardData(cpContent);
} }
} // namespace platf } // namespace platf
static std::string ensureCrLf(const std::string& utf8Str) { static std::string ensureCrLf(const std::string& utf8Str) {
std::string result; std::string result;
result.reserve(utf8Str.size() + utf8Str.length() / 2); // Reserve extra space result.reserve(utf8Str.size() + utf8Str.size() / 2); // Reserve extra space
for (size_t i = 0; i < utf8Str.size(); ++i) { for (size_t i = 0; i < utf8Str.size(); ++i) {
if (utf8Str[i] == '\n' && (i == 0 || utf8Str[i - 1] != '\r')) { if (utf8Str[i] == '\n' && (i == 0 || utf8Str[i - 1] != '\r')) {
@@ -2002,7 +2002,7 @@ static std::wstring getClipboardData() {
return ret; return ret;
} }
static int setClipboardData(const std::string& acpStr) { static int setClipboardData(const std::wstring& utf16Str) {
if (!OpenClipboard(nullptr)) { if (!OpenClipboard(nullptr)) {
BOOST_LOG(warning) << "Failed to open clipboard."; BOOST_LOG(warning) << "Failed to open clipboard.";
return 1; return 1;
@@ -2015,7 +2015,7 @@ static int setClipboardData(const std::string& acpStr) {
} }
// Allocate global memory for the clipboard text // Allocate global memory for the clipboard text
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, acpStr.size() + 1); HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, utf16Str.size() * 2 + 2);
if (hGlobal == nullptr) { if (hGlobal == nullptr) {
BOOST_LOG(warning) << "Failed to allocate global memory."; BOOST_LOG(warning) << "Failed to allocate global memory.";
CloseClipboard(); CloseClipboard();
@@ -2031,11 +2031,11 @@ static int setClipboardData(const std::string& acpStr) {
return 1; return 1;
} }
memcpy(pGlobal, acpStr.c_str(), acpStr.size() + 1); memcpy(pGlobal, utf16Str.c_str(), utf16Str.size() * 2 + 2);
GlobalUnlock(hGlobal); GlobalUnlock(hGlobal);
// Set the clipboard data // Set the clipboard data
if (SetClipboardData(CF_TEXT, hGlobal) == nullptr) { if (SetClipboardData(CF_UNICODETEXT, hGlobal) == nullptr) {
BOOST_LOG(warning) << "Failed to set clipboard data."; BOOST_LOG(warning) << "Failed to set clipboard data.";
GlobalFree(hGlobal); GlobalFree(hGlobal);
CloseClipboard(); CloseClipboard();