AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-14 07:36:26 +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

9
lib/x11/WindowXlib.cpp
View File

@@ -1237,15 +1237,22 @@ public:
unsigned int state = event->xkey.state;
event->xkey.state &= ~ControlMask;
std::string utf8Frag = translateUTF8(&event->xkey, m_xIC);
ITextInputCallback* inputCb = m_callback->getTextInputCallback();
if (utf8Frag.size())
{
m_callback->utf8FragmentDown(utf8Frag);
if (inputCb)
inputCb->insertText(utf8Frag);
return;
}
char charCode = translateKeysym(&event->xkey, specialKey, modifierKey);
EModifierKey modifierMask = translateModifiers(state);
if (charCode)
{
if (inputCb &&
(modifierMask & (EModifierKey::Ctrl|EModifierKey::Command)) == EModifierKey::None)
inputCb->insertText(std::string(1, charCode));
m_callback->charKeyDown(charCode, modifierMask, false);
}
else if (specialKey != ESpecialKey::None)
m_callback->specialKeyDown(specialKey, modifierMask, false);
else if (modifierKey != EModifierKey::None)