Changeset 6706

Timestamp:

05/20/07 15:42:41

Author:

robert

Message:

From Stephan Huber, "attached you'll find some modifications and enhancements to the carbon's
implementation of GraphicsWindow?:

- usage of WindowData?, you can specify an existing window to use via
osg::Traits
- implementation of setScreenResolution and setScreenRefreshRate
- implementation of setWindowDecoration when window is already created.

There seems to be a bug regarding multiple threads and closing windows,
see my other mail on osg-users.
"

Files:

• OpenSceneGraph/trunk/include/osgViewer/api/Carbon/GraphicsWindowCarbon (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/include/osgViewer/api/Carbon/GraphicsWindowCarbon

@@ -104 +104 @@
-
-        /** WindowData is used to pass in the Carbon window handle attached the GraphicsContext::Traits structure. */
-struct
+class
-        {
-
-
+
+
+
-                
-
+
+
+
+
+
+
+
+
-        };
+        
+        /// install the standard os-eventhandler
+        void installEventHandler();
-
-    protected:
@@ -119 +130 @@
-        
-        AGLContext& getAGLContext() { return _context; }
+        
+
-
-        bool            _valid;
@@ -130 +143 @@
-        AGLPixelFormat  _pixelFormat;
-        
-
+
+
+
+
-    
-private:    
+
-        bool _closeRequested;
-};

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -501 +501 @@
-        // osg::notify(osg::DEBUG_INFO) << "topleft of screen " << si.screenNum <<" " << bounds.origin.x << "/" << bounds.origin.y << std::endl;
-    }
+    
+    /** helper method to get a value out of a CFDictionary */
+    static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
+    {
+       double double_value;
+       CFNumberRef number_value = (CFNumberRef) CFDictionaryGetValue(refDict, key);
+       if (!number_value) // if can't get a number for the dictionary
+           return -1;  // fail
+       if (!CFNumberGetValue(number_value, kCFNumberDoubleType, &double_value)) // or if cant convert it
+            return -1; // fail
+        return double_value; // otherwise return the long value
+    }
+
+    
+    /** implementation of setScreenResolution */
+    virtual bool setScreenResolution(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int width, unsigned int height) 
+    { 
+        CGDirectDisplayID displayID = getDisplayID(screenIdentifier);
+        
+        // add next line and on following line replace hard coded depth and refresh rate
+        CGRefreshRate refresh =  getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate);  
+        CFDictionaryRef display_mode_values =
+            CGDisplayBestModeForParametersAndRefreshRate(
+                            displayID, 
+                            CGDisplayBitsPerPixel(displayID), 
+                            width, height,  
+                            refresh,  
+                            NULL);
+
+                                          
+        CGDisplaySwitchToMode(displayID, display_mode_values);    
+        return true; 
+    }
+    
+    /** implementation of setScreenRefreshRate */
+    virtual bool setScreenRefreshRate(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, double refreshRate) { 
+        
+        boolean_t  success(false);
+        unsigned width, height;
+        getScreenResolution(screenIdentifier, width, height);
+        
+        CGDirectDisplayID displayID = getDisplayID(screenIdentifier);
+        
+        // add next line and on following line replace hard coded depth and refresh rate
+        CFDictionaryRef display_mode_values =
+            CGDisplayBestModeForParametersAndRefreshRate(
+                            displayID, 
+                            CGDisplayBitsPerPixel(displayID), 
+                            width, height,  
+                            refreshRate,  
+                            &success);
+
+                                          
+        if (success)
+            CGDisplaySwitchToMode(displayID, display_mode_values);    
+            
+        return (success != 0);
+    }
+
-        
-    
@@ -532 +591 @@
-
-
-
-
-
-
+
-
-void GraphicsWindowCarbon::init()
@@ -541 +597 @@
-    _windowTitleHeight = 0;
-    _closeRequested = false;
+    _ownsWindow = false;
-    _context = NULL;
-    _window = NULL;
@@ -550 +607 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            attr = (kWindowStandardDocumentAttributes | kWindowStandardHandlerAttribute);
-        else
@@ -587 +641 @@
-    {
-        attr = kWindowNoTitleBarAttribute | kWindowNoShadowAttribute | kWindowStandardHandlerAttribute;
-_traits->
+
-            attr |= kWindowResizableAttribute;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    // register window event handler to receive resize-events
-    EventTypeSpec   windEventList[] = {
@@ -623 +668 @@
-    };
-    
+
-    InstallWindowEventHandler(_window, NewEventHandlerUPP(GraphicsWindowEventHandler),  GetEventTypeCount(windEventList), windEventList, this, NULL);
+}
+
+
+bool GraphicsWindowCarbon::realizeImplementation()
+{
+    
+    if (!_initialized) init();
+    if (!_initialized) return false;
+    if (!_traits) return false;
+    
+    setWindowDecoration(_traits->windowDecoration);
+    
+    // move the window to the right screen
+
+    OSXCarbonWindowingSystemInterface* wsi = dynamic_cast<OSXCarbonWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
+    int screenLeft(0), screenTop(0);
+    if (wsi) {
+        
+        wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
+        _traits->y += screenTop;
+        _traits->x += screenLeft;
+    }
+    
+    WindowData *windowData = _traits.get() ? dynamic_cast<WindowData*>(_traits->inheritedWindowData.get()) : 0;
+    _ownsWindow = (windowData) ? (windowData->getNativeWindowRef() == NULL) : true;
+    
+    if (_ownsWindow) {
+        
+        // create the window
+        Rect bounds = {_traits->y, _traits->x, _traits->y + _traits->height, _traits->x + _traits->width};
+        OSStatus err = 0;
+        WindowAttributes attr = computeWindowAttributes(_useWindowDecoration, _traits->supportsResize);
+        
+        err = CreateNewWindow(kDocumentWindowClass, attr, &bounds, &_window);
+
+        if (err) {
+            osg::notify(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation() failed creating a window: " << err << std::endl;
+            return false;
+        } else {
+            osg::notify(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation() - window created with bounds(" << bounds.top << ", " << bounds.left << ", " << bounds.bottom << ", " << bounds.right << ")" << std::endl;
+        }
+    }
+    else {
+        _window = windowData->getNativeWindowRef();
+    }
+    
+    Rect titleRect;
+    GetWindowBounds(_window, kWindowTitleBarRgn, &titleRect);
+    _windowTitleHeight = abs(titleRect.top);
+    
+    if ((_ownsWindow) || (windowData && windowData->installEventHandler()))
+        installEventHandler();
-    
-    // set the window title
@@ -721 +819 @@
-    }
-    
-
+ownsWindow && _
-    _window = NULL;
-}
@@ -1074 +1172 @@
-void GraphicsWindowCarbon::setWindowRectangle(int x, int y, int width, int height)
-{
-
-
+
+
+
+
+
-}
-