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

From Stephan Huber, "attached you'll find a fix for the dead locks when closing a window

Browse Source 
under OS X."
This commit is contained in:
Robert Osfield
2007-07-27 16:48:31 +00:00
parent fc9efa2972
commit 2faf38f68f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -33,7 +33,6 @@ static pascal OSStatus GraphicsWindowEventHandler(EventHandlerCallRef nextHandle
OSStatus result = eventNotHandledErr; /* report failure by default */
result = CallNextEventHandler (nextHandler, event);
GraphicsWindowCarbon* w = (GraphicsWindowCarbon*)userData;
if (!w)
@@ -77,8 +76,9 @@ static pascal OSStatus GraphicsWindowEventHandler(EventHandlerCallRef nextHandle
result = noErr;
break;
case kEventWindowClosed:
case kEventWindowClose:
w->requestClose();
result = noErr;
break;
default:
@@ -88,6 +88,10 @@ static pascal OSStatus GraphicsWindowEventHandler(EventHandlerCallRef nextHandle
default:
break;
}
if (result == eventNotHandledErr)
result = CallNextEventHandler (nextHandler, event);
return result;
}
@@ -570,7 +574,7 @@ void GraphicsWindowCarbon::installEventHandler() {
// register window event handler to receive resize-events
EventTypeSpec windEventList[] = {
{ kEventClassWindow, kEventWindowBoundsChanged},
{ kEventClassWindow, kEventWindowClosed},
{ kEventClassWindow, kEventWindowClose},
{kEventClassMouse, kEventMouseDown},
{kEventClassMouse, kEventMouseUp},
@@ -730,6 +734,7 @@ bool GraphicsWindowCarbon::releaseContextImplementation()
void GraphicsWindowCarbon::closeImplementation()
{
// osg::notify(osg::INFO) << "GraphicsWindowCarbon::closeImplementation" << std::endl;
_valid = false;
_realized = false;
@@ -1090,7 +1095,7 @@ void GraphicsWindowCarbon::checkEvents()
ReleaseEvent(theEvent);
}
if (_closeRequested)
close(true);
getEventQueue()->closeWindow();
if (s_quit_requested) {
getEventQueue()->quitApplication();