MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to make the OIS interfacing work under Linux. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1435 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-07-30 23:16:08 +00:00
parent b083e20be4
commit 9226383d37
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -496,6 +496,7 @@ bool CIrrDeviceLinux::createWindow()
InputOutput, visual->visual, InputOutput, visual->visual,
CWBorderPixel | CWColormap | CWEventMask | CWBorderPixel | CWColormap | CWEventMask |
CWOverrideRedirect, &attributes); CWOverrideRedirect, &attributes);
CreationParams.WindowId = (void*)window;
XWarpPointer(display, None, window, 0, 0, 0, 0, 0, 0); XWarpPointer(display, None, window, 0, 0, 0, 0, 0, 0);
XMapRaised(display, window); XMapRaised(display, window);
@ -517,6 +518,7 @@ bool CIrrDeviceLinux::createWindow()
InputOutput, visual->visual, InputOutput, visual->visual,
CWBorderPixel | CWColormap | CWEventMask, CWBorderPixel | CWColormap | CWEventMask,
&attributes); &attributes);
CreationParams.WindowId = (void*)window;
} }
else else
{ {

2
source/Irrlicht/COpenGLDriver.cpp
View File

@ -215,7 +215,7 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
#endif #endif
ExposedData.OpenGLLinux.X11Context = glXGetCurrentContext(); ExposedData.OpenGLLinux.X11Context = glXGetCurrentContext();
ExposedData.OpenGLLinux.X11Display = glXGetCurrentDisplay(); ExposedData.OpenGLLinux.X11Display = glXGetCurrentDisplay();
ExposedData.OpenGLLinux.X11Window = glXGetCurrentDrawable(); ExposedData.OpenGLLinux.X11Window = (unsigned long)params.WindowId;
genericDriverInit(params.WindowSize, params.Stencilbuffer); genericDriverInit(params.WindowSize, params.Stencilbuffer);