Commit 9226383d authored by hybrid's avatar hybrid

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
parent b083e20b
...@@ -496,6 +496,7 @@ bool CIrrDeviceLinux::createWindow() ...@@ -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() ...@@ -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
{ {
......
...@@ -215,7 +215,7 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params, ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment