AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-17 17:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xlib in sync with new text system

Browse Source
This commit is contained in:
Jack Andersen
2015-12-27 13:23:17 -10:00
parent 9f9ff269fe
commit 52692b0459
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/win/WindowWin32.cpp
View File

@@ -1170,10 +1170,23 @@ public:
}
return;
}
case WM_UNICHAR:
{
if (m_callback)
{
ITextInputCallback* inputCb = m_callback->getTextInputCallback();
uint8_t utf8ch[4];
size_t len = utf8proc_encode_char(e.wParam, utf8ch);
if (inputCb && len)
inputCb->insertText(std::string((char*)utf8ch, len));
}
return;
}
case WM_IME_COMPOSITION:
{
if (m_callback)
{
ITextInputCallback* inputCb = m_callback->getTextInputCallback();
if ((e.lParam & GCS_RESULTSTR) != 0)
{
wchar_t str[512];
@@ -1182,11 +1195,8 @@ public:
{
size_t szOut;
std::unique_ptr<uint8_t[]> out = MakeUnicodeLF(str, len/2, szOut);
if (szOut)
{
std::string strOut((char*)out.get(), szOut);
m_callback->utf8FragmentDown(strOut);
}
if (szOut && inputCb)
inputCb->insertText(std::string((char*)out.get(), szOut));
}
}
}