rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

checkpoint. more UTF8 clipboard stuff.

This commit is contained in:
crs 2002-07-22 18:46:57 +00:00
parent c4f21ce29b
commit fcd99c9510
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/CUnicode.cpp
View File

@ -54,7 +54,7 @@ CUnicode::UTF8ToUCS2(const CString& src)
const UInt8* data = reinterpret_cast<const UInt8*>(src.c_str()); const UInt8* data = reinterpret_cast<const UInt8*>(src.c_str());
while (n > 0) { while (n > 0) {
UInt32 c = fromUTF8(data, n); UInt32 c = fromUTF8(data, n);
if (c != s_invalid && c < 0x0000ffff) { if (c != s_invalid && c < 0x00010000) {
UInt16 ucs2 = static_cast<UInt16>(c); UInt16 ucs2 = static_cast<UInt16>(c);
dst.append(reinterpret_cast<const char*>(&ucs2), 2); dst.append(reinterpret_cast<const char*>(&ucs2), 2);
} }
@ -223,7 +223,7 @@ CUnicode::UTF8ToWideChar(const CString& src)
// copy to a wchar_t array // copy to a wchar_t array
wchar_t* dst = new wchar_t[size]; wchar_t* dst = new wchar_t[size];
::memcpy(dst, src.data(), sizeof(wchar_t) * size); ::memcpy(dst, tmp.data(), sizeof(wchar_t) * size);
return dst; return dst;
} }

2
platform/CXWindowsClipboard.cpp
View File

@ -164,6 +164,8 @@ log((CLOG_INFO "added"));
type = converter->getAtom(); type = converter->getAtom();
format = converter->getDataSize(); format = converter->getDataSize();
data = converter->fromIClipboard(m_data[clipboardFormat]); data = converter->fromIClipboard(m_data[clipboardFormat]);
log((CLOG_INFO " src: (%d) %s", m_data[clipboardFormat].size(), m_data[clipboardFormat].c_str()));
log((CLOG_INFO " dst: (%d) %s", data.size(), data.c_str()));
} }
} }
} }