Changeset 9870

Timestamp:

03/09/09 10:39:55 (4 years ago)

Author:

shuber

Message:

Fix for multiple windows on different screens. the coords of windows are now local to the screen, as in other implementations.

Location:

OpenSceneGraph/branches/osg-cocoa-dev

Files:

• include/osgViewer/api/Cocoa/GraphicsWindowCocoa (modified) (1 diff)
• src/osgViewer/DarwinUtils.h (modified) (1 diff)
• src/osgViewer/DarwinUtils.mm (modified) (1 diff)
• src/osgViewer/GraphicsWindowCocoa.mm (modified) (5 diffs)

OpenSceneGraph/branches/osg-cocoa-dev/include/osgViewer/api/Cocoa/GraphicsWindowCocoa

@@ -139 +139 @@
                 
         void setVSync(bool f);
+                
+                /** adapts a resize / move of the window, coords in global screen space */
+                void adaptResize(int x, int y, int w, int h);
         
     protected:

OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/DarwinUtils.h

@@ -89 +89 @@
         virtual bool setScreenRefreshRate(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, double refreshRate);
         
+        
+        /** returns screen-ndx containing rect x,y,w,h */
+        unsigned int getScreenContaining(int x, int y, int w, int h);
+        
         protected:
         

OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/DarwinUtils.mm

@@ -295 +295 @@
 }
 
-        
-
-
-
-
-
-
-}
+
+unsigned int DarwinWindowingSystemInterface::getScreenContaining(int x, int y, int w, int h)
+{
+        CGRect rect = CGRectMake(x,y,w,h);
+        for(unsigned int i = 0; i < _displayCount; ++i) {
+                CGRect bounds = CGDisplayBounds( getDisplayID(i) );
+                if (CGRectIntersectsRect(bounds, rect)) {
+                        return i;
+                }
+        }
+        
+        return 0;
+}
+
+
+
+
+
+
+}

OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/GraphicsWindowCocoa.mm

@@ -731 +731 @@
     // std::cout << "windowdidmove: " << bounds.origin.x << " " << bounds.origin.y << " " << bounds.size.width << " " << bounds.size.height << std::endl;
    
-    _win->resized(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
-    _win->getEventQueue()->windowResize(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height, _win->getEventQueue()->getTime());
+    _win->adaptResize(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
+    //_win->getEventQueue()->windowResize(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height, _win->getEventQueue()->getTime());
     _win->requestRedraw();
     _inDidMove = false;
@@ -840 +840 @@
     int screenLeft(0), screenTop(0);
     if (wsi) {
-        
         wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
-        _traits->y += screenTop;
-        _traits->x += screenLeft;
-    }
-    
-        NSRect rect = NSMakeRect(_traits->x, _traits->y, _traits->width, _traits->height);
+    }
+    
+        NSRect rect = NSMakeRect(_traits->x + screenLeft, _traits->y + screenTop, _traits->width, _traits->height);
     
         _window = [[GraphicsWindowCocoaWindow alloc] initWithContentRect: rect styleMask: style backing: NSBackingStoreBuffered defer: NO];
@@ -1093 +1090 @@
 void GraphicsWindowCocoa::resizedImplementation(int x, int y, int width, int height)
 {
+        std::cout << "resized implementation" << x << " " << y << " " << width << " " << height << std::endl; 
         GraphicsContext::resizedImplementation(x, y, width, height);
-    
+   
     [_context update];
     MenubarController::instance()->update();
-}
+        getEventQueue()->windowResize(x,y,width, height, getEventQueue()->getTime());
+}
+
+
 
 
@@ -1105 +1106 @@
 bool GraphicsWindowCocoa::setWindowRectangleImplementation(int x, int y, int width, int height)
 {
-   
-    NSRect rect = NSMakeRect(x,y,width, height);
+        DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
+    int screenLeft(0), screenTop(0);
+    if (wsi) {
+        wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
+    }
+
+
+    NSRect rect = NSMakeRect(x+screenLeft,y+screenTop,width, height);
     rect = convertFromQuartzCoordinates(rect);
     
@@ -1116 +1123 @@
 }
 
+
+// ----------------------------------------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------------------------------------
+
+void GraphicsWindowCocoa::adaptResize(int x, int y, int w, int h)
+{
+
+        DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
+    int screenLeft(0), screenTop(0);
+    if (wsi) {
+                
+                // get the screen containing the window
+                unsigned int screenNdx = wsi->getScreenContaining(x,y,w,h);
+                
+                // update traits
+                _traits->screenNum = screenNdx;
+                
+                // get top left of screen
+        wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
+    }
+        
+        resized(x-screenLeft,y-screenTop,w,h);
+}