minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-15 15:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix misbehaving input after IME changes (Linux)

Browse Source
This commit is contained in:
yw05 2021-04-18 21:27:15 +02:00 committed by sfan5
parent 4719f3c114
commit 21cb990e75
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -829,7 +829,7 @@ bool CIrrDeviceLinux::run()
{ {
XEvent event; XEvent event;
XNextEvent(XDisplay, &event); XNextEvent(XDisplay, &event);
if (acceptsIME() && XFilterEvent(&event, None)) if (XFilterEvent(&event, None))
continue; continue;
switch (event.type) switch (event.type)
@ -1156,23 +1156,27 @@ bool CIrrDeviceLinux::run()
break; break;
} // end switch } // end switch
// Update IME information
if (XInputContext && GUIEnvironment)
{
gui::IGUIElement *elem = GUIEnvironment->getFocus();
if (elem && elem->acceptsIME())
{
core::rect<s32> r = elem->getAbsolutePosition();
XPoint p;
p.x = (short)r.UpperLeftCorner.X;
p.y = (short)r.LowerRightCorner.Y;
XSetICFocus(XInputContext);
XVaNestedList l = XVaCreateNestedList(0, XNSpotLocation, &p, NULL);
XSetICValues(XInputContext, XNPreeditAttributes, l, NULL);
XFree(l);
} else {
XUnsetICFocus(XInputContext);
}
}
} // end while } // end while
// Update IME information
if (XInputContext && GUIEnvironment)
{
gui::IGUIElement *elem = GUIEnvironment->getFocus();
if (elem && elem->acceptsIME())
{
core::rect<s32> r = elem->getAbsolutePosition();
XPoint p;
p.x = (short)r.UpperLeftCorner.X;
p.y = (short)r.LowerRightCorner.Y;
XVaNestedList l = XVaCreateNestedList(0, XNSpotLocation, &p, NULL);
XSetICValues(XInputContext, XNPreeditAttributes, l, NULL);
XFree(l);
}
}
} }
#endif //_IRR_COMPILE_WITH_X11_ #endif //_IRR_COMPILE_WITH_X11_