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

From Jan Peciva, "please find attached proposed fix for ON_DEMAND rendering. The biggest issue was

Browse Source 
that the windows did not act on repaint request (WM_PAINT, EXPOSE,...)

Detailed explanation:
- I implemented requestRedraw using the push approach (not using
GraphicsWindow::_requestRedraw flag that I was considering) as there may be
multiple viewers reading the flag and fighting to reset it after the paint
request, while some viewers may not spot the request to redraw
- I made windows call GraphicsWindow::requestRedraw when they receive
appropriate message (WM_PAINT, EXPOSE, RESIZE,...)
- There were issues on Linux that windows did not want to close using x
button. Resolved by moving the test for DeleteWindow event from
swapBuffersImplementation() to GraphicsWindowX11::checkEvents(). The difficulty
was that DeleteWindow event is not coming using _eventDisplay, but through
_display.
- The last difficulty was that it is necessary to call
ViewerBase::checkWindowStatus() to set _done to true when all windows are
closed. This did not happened recently in ON_DEMAND run scheme. I put the call
to checkWindowStatus() to eventTraversal.
"
This commit is contained in:
Robert Osfield
2011-04-19 12:01:38 +00:00
parent efec8a13a1
commit c13b7d26b7
9 changed files with 133 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/osgViewer/GraphicsWindowX11.cpp
View File

@@ -1090,25 +1090,6 @@ 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()
@@ -1154,6 +1135,7 @@ void GraphicsWindowX11::checkEvents()
}
case Expose :
OSG_INFO<<"Expose x="<<ev.xexpose.x<<" y="<<ev.xexpose.y<<" width="<<ev.xexpose.width<<", height="<<ev.xexpose.height<<std::endl;
requestRedraw();
break;
case GravityNotify :
@@ -1461,6 +1443,7 @@ void GraphicsWindowX11::checkEvents()
_lastEventType = ev.type;
}
// send window resize event if window position or size was changed
if (windowX != _traits->x ||
windowY != _traits->y ||
windowWidth != _traits->width ||
@@ -1468,6 +1451,35 @@ void GraphicsWindowX11::checkEvents()
{
resized(windowX, windowY, windowWidth, windowHeight);
getEventQueue()->windowResize(windowX, windowY, windowWidth, windowHeight, resizeTime);
// request window repaint if window size was changed
if (windowWidth != _traits->width ||
windowHeight != _traits->height)
{
requestRedraw();
}
}
//
// 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();
}
}
}
}
#if 0