ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert waiting for mapped window before reading dimensions.

Browse Source 
It causes issues on some systems.
This commit is contained in:
Deve 2019-03-06 21:05:48 +01:00
parent 0a4211af82
commit 3c7673ccfc
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -674,13 +674,6 @@ void CIrrDeviceLinux::grabPointer(bool grab)
#endif
}
#ifdef _IRR_COMPILE_WITH_X11_
Bool CIrrDeviceLinux::isWindowMapped(Display* display, XEvent* event, XPointer arg)
{
return event->type == MapNotify && event->xmap.window == *((Window*)arg);
}
#endif
bool CIrrDeviceLinux::createWindow()
{
#ifdef _IRR_COMPILE_WITH_X11_
@ -1168,9 +1161,6 @@ bool CIrrDeviceLinux::createWindow()
IrrPrintXGrabError(grabPointer, "XGrabPointer");
XWarpPointer(display, None, window, 0, 0, 0, 0, 0, 0);
}
XEvent event;
XPeekIfEvent(display, &event, &isWindowMapped, (XPointer)&window);
}
else
{

1
lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
View File

@ -166,7 +166,6 @@ namespace irr
int getNumlockMask(Display* display);
EKEY_CODE getKeyCode(XEvent &event);
void updateIMELocation();
static Bool isWindowMapped(Display* display, XEvent* event, XPointer arg);
#endif
//! Implementation of the linux cursor control