Changeset 9871

Timestamp:

03/09/09 10:58:45 (4 years ago)

Author:

shuber

Message:

Bugfix for GraphicsWindowCarbon? and multiple windows on multiple screens. The windows keep track to what screen they belong, and the window coords are now local to the screen they belong to.

Buildfix for CMake, added missing link to Cocoa framework

Location:

OpenSceneGraph/branches/osg-cocoa-dev

Files:

• include/osgViewer/api/Carbon/GraphicsWindowCarbon (modified) (2 diffs)
• src/osgViewer/CMakeLists.txt (modified) (1 diff)
• src/osgViewer/GraphicsWindowCarbon.cpp (modified) (7 diffs)

OpenSceneGraph/branches/osg-cocoa-dev/include/osgViewer/api/Carbon/GraphicsWindowCarbon

@@ -143 +143 @@
         // get the pixelformat
         AGLPixelFormat getAGLPixelFormat() { return _pixelFormat; }
+                
+                void adaptResize(int x, int y, int w, int h);
 
     protected:
@@ -148 +150 @@
         void init();
         
-        void transformMouseXY(float& x, float& y);
-        
-        
-        
+        void transformMouseXY(float& x, float& y);      
 
 

OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/CMakeLists.txt

@@ -100 +100 @@
                 PixelBufferCarbon.cpp
             )
+            SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
 
         ELSE(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon")

OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -70 +70 @@
                         GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof(Rect), NULL, &bounds );
                         
-                        w->resized(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top);
-                        w->getEventQueue()->windowResize(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top, w->getEventQueue()->getTime());
-                        w->requestRedraw();
+                        w->adaptResize(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top);
+                                                w->requestRedraw();
                         result = noErr;
                         break;
@@ -79 +78 @@
                         InvalWindowRect(window, GetWindowPortBounds(window, &bounds));
                         GetWindowBounds(window, kWindowContentRgn, &bounds);
-                        w->resized(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top);
-                        w->getEventQueue()->windowResize(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top, w->getEventQueue()->getTime());
+                        w->adaptResize(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top);
                         result = noErr;
                         break;
@@ -359 +357 @@
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     int screenLeft(0), screenTop(0);
-    if (wsi) {
-        
+    if (wsi) 
+        {
         wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
-        _traits->y += screenTop;
-        _traits->x += screenLeft;
-    }
+        }
     
     WindowData *windowData = ( _traits.get() && _traits->inheritedWindowData.get() ) ? static_cast<osgViewer::GraphicsWindowCarbon::WindowData*>(_traits->inheritedWindowData.get()) : 0; 
@@ -373 +369 @@
         
         // create the window
-        Rect bounds = {_traits->y, _traits->x, _traits->y + _traits->height, _traits->x + _traits->width};
+        Rect bounds = {_traits->y + screenTop, _traits->x + screenLeft, _traits->y + _traits->height + screenTop, _traits->x + _traits->width + screenLeft};
         OSStatus err = 0;
         WindowAttributes attr = computeWindowAttributes(_useWindowDecoration, _traits->supportsResize);
@@ -532 +528 @@
     aglUpdateContext(_context);
     MenubarController::instance()->update();
+        
+        getEventQueue()->windowResize(x,y,width, height, getEventQueue()->getTime());
 }
 
@@ -900 +898 @@
 bool GraphicsWindowCarbon::setWindowRectangleImplementation(int x, int y, int width, int height)
 {
-    Rect bounds = {y, x, y + height, x + width};
+        int screenLeft(0), screenTop(0);
+        DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
+   if (wsi) 
+        {
+        wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
+        }
+        
+        Rect bounds = {y + screenTop, x + screenLeft, y + height + screenTop, x + width + screenLeft};
     SetWindowBounds(getNativeWindowRef(), kWindowContentRgn, &bounds);
     aglUpdateContext(_context);
@@ -906 +911 @@
     return true;
 }
+
+
+
+void GraphicsWindowCarbon::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);
+}
+
+
 
 void GraphicsWindowCarbon::grabFocus()