Changeset 10340 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

Timestamp:

06/12/09 12:00:08 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "here are some small fixes/enahncements for the cocoa backend to allow
proper functioning when running the osgViewer run-loop in a secondary
thread (e.g. when embedding GraphicsWindowCocoa?-windows in a full blown
cocoa application).

OS X is picky when you want to change the user-interface from another
thread than the main thread, not all UI stuff is thread-safe. So now
window closes and showing / hiding the menu bar is done in the main
thread via Cocoa's performSelectorOnMainThread-mechanism.

These changes don't affect the normal osgViewer usage pattern."

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -20 +20 @@
 #include "DarwinUtils.h"
 
-//#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl;
-
-#define DEBUG_OUT(s) ;
+#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl;
+
+//#define DEBUG_OUT(s) ;
 
 static bool s_quit_requested = false;
@@ -389 +389 @@
 - (void) mouseMoved:(NSEvent*)theEvent 
 {
-    DEBUG_OUT("Mouse moved");
     NSPoint converted_point = [self getLocalPoint: theEvent];
+    DEBUG_OUT("Mouse moved" << converted_point.x << "/" << converted_point.y);
     _win->getEventQueue()->mouseMotion(converted_point.x, converted_point.y);
 }
@@ -606 +606 @@
     if (!_win) return;
     
+    DEBUG_OUT("middleMouseDown ");
+    
     NSPoint converted_point = [self getLocalPoint: theEvent];
     
@@ -621 +623 @@
 {
     if (!_win) return;
+    
+    DEBUG_OUT("extraMouseDown btn: " << button_number);
     
     NSPoint converted_point = [self getLocalPoint: theEvent];
@@ -1037 +1041 @@
     if (mbc) mbc->detachWindow(this);
     
-    if (_window) {
-        [_window close];
-        [_window release];
-    }
-    
     if (_view) {
         [_view setGraphicsWindowCocoa: NULL];
     }
+        
+    if (_window) {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        
+        // we have to close + release the window in the main-thread
+        
+        [_window performSelectorOnMainThread: @selector(close) withObject:NULL waitUntilDone: YES];
+        [_window performSelectorOnMainThread: @selector(release) withObject:NULL waitUntilDone: YES];
+        [pool release];
+    }
     
     _window = NULL;
-    _view = NULL;
-    
+    _view = NULL;    
 }