FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted part of revision r12294 that introduced threading related problems under X11 due to checking the _display

Browse Source 
Display member variable assigned to the graphics thread from the main thread.
This commit is contained in:
Robert Osfield
2011-05-27 16:04:18 +00:00
parent 9c7234ac2a
commit 40fd093fb1
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/osgViewer/GraphicsWindowX11.cpp
View File

@@ -1090,6 +1090,25 @@ void GraphicsWindowX11::swapBuffersImplementation()
#endif
glXSwapBuffers( _display, _window );
#endif
while( XPending(_display) )
{
XEvent ev;
XNextEvent( _display, &ev );
switch( ev.type )
{
case ClientMessage:
{
if (static_cast<Atom>(ev.xclient.data.l[0]) == _deleteWindow)
{
OSG_INFO<<"DeleteWindow event received"<<std::endl;
getEventQueue()->closeWindow();
}
}
}
}
}
void GraphicsWindowX11::checkEvents()
@@ -1461,29 +1480,6 @@ void GraphicsWindowX11::checkEvents()
}
}
//
// process events of _display
//
while( XPending(_display) )
{
XEvent ev;
XNextEvent( _display, &ev );
switch( ev.type )
{
case ClientMessage:
{
if (static_cast<Atom>(ev.xclient.data.l[0]) == _deleteWindow)
{
OSG_INFO<<"DeleteWindow event received"<<std::endl;
getEventQueue()->closeWindow();
}
break;
}
}
}
#if 0
if (destroyWindowRequested)
{