BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Avoid using XIWarpPointer on certain setups where it's broken

Browse Source 
fixes minetest/minetest#12697
This commit is contained in:
sfan5 2022-09-12 16:19:44 +02:00
parent d733e03430
commit e9f205f952
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -2118,7 +2118,17 @@ CIrrDeviceLinux::CCursorControl::CCursorControl(CIrrDeviceLinux* dev, bool null)
if (!Null) if (!Null)
{ {
#ifdef _IRR_LINUX_X11_XINPUT2_ #ifdef _IRR_LINUX_X11_XINPUT2_
XIGetClientPointer(Device->XDisplay, Device->XWindow, &DeviceId); // XIWarpPointer is entirely broken on multi-head setups (see also [1]),
// but behaves better in other cases so we can't just disable it outright.
// [1] https://developer.blender.org/rB165caafb99c6846e53d11c4e966990aaffc06cea
if (XScreenCount(Device->XDisplay) > 1)
{
os::Printer::log("Detected classic multi-head setup, not using XIWarpPointer");
}
else
{
XIGetClientPointer(Device->XDisplay, Device->XWindow, &DeviceId);
}
#endif #endif
XGCValues values; XGCValues values;