Changeset 28279 in vbox

Timestamp:

Apr 14, 2010 12:52:05 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60022

Message:

crOpenGl;FE/Qt4: added initial 3D support on OSX for the mutli-monitor case (the dock still needs some work)

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/darwin/UICocoaDockIconPreview.mm (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineLogic.h (modified) (2 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu.c (modified) (3 diffs)
• HostServices/SharedOpenGL/render/renderspu.h (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_agl.c (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_cocoa.c (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UICocoaDockIconPreview.mm

@@ -58 +58 @@
 }
 - (id)initWithParent:(UICocoaDockIconPreviewPrivate*)parent;
+- (void)destroy;
 - (NSView*)screenContent;
 - (void)cleanup;
@@ -82 +83 @@
     inline ~UICocoaDockIconPreviewPrivate()
     {
+
+        [mUIDockTile destroy];
         [mUIDockTile release];
     }
@@ -246 +249 @@
 }
 
+- (void)destroy
+{
+    /* Remove all content from the application dock tile. */
+    [mOverlay removeFromSuperview];
+    [mOverlay release];
+    mOverlay = nil;
+    NSDockTile *dock = [[NSApplication sharedApplication] dockTile];
+    [dock setContentView: nil];
+    /* Cleanup all other resources */
+    [self cleanup];
+}
+
 - (NSView*)screenContent
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -314 +314 @@
                 CGImageRelease(image);
             }
+}
+
+void UIMachineLogic::updateDockIconSize(int screenId, int width, int height)
+{
+    if (!isMachineWindowsCreated())
+        return;
+
+    if (   m_fIsDockIconEnabled
+        && m_pDockIconPreview
+        && m_DockIconPreviewMonitor == screenId)
+        m_pDockIconPreview->setOriginalSize(width, height);
 }
 #endif /* Q_WS_MAC */
@@ -344 +355 @@
     //dbgDestroy();
 #endif
-
-#ifdef Q_WS_MAC
-    if (m_pDockIconPreview)
-        delete m_pDockIconPreview;
-#endif /* Q_WS_MAC */
 }
 
@@ -608 +614 @@
 }
 
+void UIMachineLogic::cleanupMachineWindows()
+{
+#ifdef Q_WS_MAC
+    /* We need to clean up the dock stuff before the machine windows. */
+    cleanupDock();
+#endif /* Q_WS_MAC */
+}
+
+#ifdef Q_WS_MAC
+void UIMachineLogic::cleanupDock()
+{
+    if (m_pDockIconPreview)
+    {
+        delete m_pDockIconPreview;
+        m_pDockIconPreview = 0;
+    }
+}
+#endif /* Q_WS_MAC */
+
 void UIMachineLogic::sltMachineStateChanged()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -80 +80 @@
 #ifdef Q_WS_MAC
     void updateDockIcon();
+    void updateDockIconSize(int screenId, int width, int height);
 #endif /* Q_WS_MAC */
 
@@ -120 +121 @@
     /* Cleanup helpers: */
     //virtual void cleanupRequiredFeatures() {}
-#ifdef Q_WS_MAC
-    //virtual void cleanupDock() {}
+    virtual void cleanupMachineWindows();
+#ifdef Q_WS_MAC
+    virtual void cleanupDock();
 #endif /* Q_WS_MAC */
     //virtual void cleanupActionGroups() {}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -828 +828 @@
 
 #ifdef Q_WS_MAC
-            // TODO_NEW_CORE
-//            mDockIconPreview->setOriginalSize(pResizeEvent->width(), pResizeEvent->height());
+            machineLogic()->updateDockIconSize(screenId(), pResizeEvent->width(), pResizeEvent->height());
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -210 +210 @@
     if (!isMachineWindowsCreated())
         return;
+
+    /* Base class cleanup: */
+    UIMachineLogic::cleanupMachineWindows();
 
     /* Cleanup normal machine window: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -133 +133 @@
         return;
 
+    /* Base class cleanup: */
+    UIMachineLogic::cleanupMachineWindows();
+
 #ifdef Q_WS_MAC // TODO: Is that really need here?
     /* We have to make sure that we are getting the front most process.

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -199 +199 @@
         return;
 
+    /* Base class cleanup: */
+    UIMachineLogic::cleanupMachineWindows();
+
     /* Cleanup normal machine window: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -304 +304 @@
 {
     int cVal = mSlMonitors->value();
-    if (cVal > 1)
-    {
-#ifdef Q_WS_MAC
-        mCb3D->setChecked(false);
-#endif
-    }
 #ifdef VBOX_WITH_VIDEOHWACCEL
     mCb2DVideo->setEnabled(VBoxGlobal::isAcceleration2DVideoAvailable());
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-#ifdef Q_WS_MAC
-    mCb3D->setEnabled(cVal == 1 && vboxGlobal().virtualBox().GetHost().GetAcceleration3DAvailable());
-#else
     mCb3D->setEnabled(vboxGlobal().virtualBox().GetHost().GetAcceleration3DAvailable());
-#endif
 
     /* The memory requirements have changed too. */

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -347 +347 @@
     {
         renderspuMakeCurrent(0, 0, pCtx->id);
-    }    
+    }
 }
 
@@ -372 +372 @@
             if (pNewCtx!=pOldCtx)
             {
-                renderspuMakeCurrent(pOldCtx&&pOldCtx->currentWindow ? pOldCtx->currentWindow->id:0, 0, 
+                renderspuMakeCurrent(pOldCtx&&pOldCtx->currentWindow ? pOldCtx->currentWindow->id:0, 0,
                                      pOldCtx ? pOldCtx->id:0);
             }
@@ -1054 +1054 @@
     }
 
-#if defined(WINDOWS) || defined(GLX)
     renderspu_SystemReparentWindow(pWindow);
-#endif
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -311 +311 @@
 
 extern GLint RENDER_APIENTRY renderspuWindowCreate( const char *dpyName, GLint visBits );
+extern void RENDER_APIENTRY renderspu_SystemReparentWindow(WindowInfo *window);
 extern GLint RENDER_APIENTRY renderspuCreateContext( const char *dpyname, GLint visBits, GLint shareCtx );
 extern void RENDER_APIENTRY renderspuMakeCurrent(GLint crWindow, GLint nativeWindow, GLint ctx);
 extern void RENDER_APIENTRY renderspuSwapBuffers( GLint window, GLint flags );
-
-#if defined(WINDOWS) || defined(GLX)
-extern void renderspu_SystemReparentWindow(WindowInfo *window);
-#endif
 
 #ifdef __cplusplus

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_agl.c

@@ -428 +428 @@
 }
 
+void renderspu_SystemReparentWindow(WindowInfo *)
+{
+    /* stub only */
+}
+
 void
 renderspu_SystemDestroyWindow(WindowInfo *window)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa.c

@@ -96 +96 @@
 }
 
-void renderspu_SystemDestroyWindow(WindowInfo *pWinInfo)
-{
-    CRASSERT(pWinInfo);
-
-    cocoaViewDestroy(pWinInfo->window);
-}
-
-void renderspu_SystemWindowPosition(WindowInfo *pWinInfo, GLint x, GLint y)
-{
-    CRASSERT(pWinInfo);
-
+void renderspu_SystemReparentWindow(WindowInfo *pWinInfo)
+{
 #ifdef __LP64__
     NativeViewRef pParentWin = (NativeViewRef)render_spu_parent_window_id;
@@ -112 +103 @@
     NativeViewRef pParentWin = (NativeViewRef)(uint32_t)render_spu_parent_window_id;
 #endif /* __LP64__ */
+    cocoaViewReparent(pWinInfo->window, pParentWin);
+}
+
+void renderspu_SystemDestroyWindow(WindowInfo *pWinInfo)
+{
+    CRASSERT(pWinInfo);
+
+    cocoaViewDestroy(pWinInfo->window);
+}
+
+void renderspu_SystemWindowPosition(WindowInfo *pWinInfo, GLint x, GLint y)
+{
+    CRASSERT(pWinInfo);
+
+#ifdef __LP64__
+    NativeViewRef pParentWin = (NativeViewRef)render_spu_parent_window_id;
+#else /* __LP64__ */
+    NativeViewRef pParentWin = (NativeViewRef)(uint32_t)render_spu_parent_window_id;
+#endif /* __LP64__ */
 
     cocoaViewSetPosition(pWinInfo->window, pParentWin, x, y);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h

@@ -43 +43 @@
 /* View management */
 void cocoaViewCreate(NativeViewRef *ppView, NativeViewRef pParentView, GLbitfield fVisParams);
+void cocoaViewReparent(NativeViewRef pView, NativeViewRef pParentView);
 void cocoaViewDestroy(NativeViewRef pView);
 void cocoaViewDisplay(NativeViewRef pView);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -138 +138 @@
 @private
     NSView          *m_pParentView;
+    NSWindow        *m_pOverlayWin;
 
     NSOpenGLContext *m_pGLCtx;
@@ -172 +173 @@
 - (void)setGLCtx:(NSOpenGLContext*)pCtx;
 - (NSOpenGLContext*)glCtx;
+
+- (void)setParentView: (NSView*)view;
+- (NSView*)parentView;
+- (void)setOverlayWin: (NSWindow*)win;
+- (NSWindow*)overlayWin;
 
 - (void)setPos:(NSPoint)pos;
@@ -299 +305 @@
     [self cleanup];
 
-    /* Create a buffer for our thumbnail image. Its in the size of this view. */
-    m_ThumbBitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
-        pixelsWide:frame.size.width
-        pixelsHigh:frame.size.height
-        bitsPerSample:8
-        samplesPerPixel:4
-        hasAlpha:YES
-        isPlanar:NO
-        colorSpaceName:NSDeviceRGBColorSpace
-        bytesPerRow:frame.size.width * 4
-        bitsPerPixel:8 * 4];
-    m_ThumbImage = [[NSImage alloc] initWithSize:[m_ThumbBitmap size]];
-    [m_ThumbImage addRepresentation:m_ThumbBitmap];
+    if (   frame.size.width > 0
+        && frame.size.height > 0)
+    {
+        /* Create a buffer for our thumbnail image. Its in the size of this view. */
+        m_ThumbBitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
+            pixelsWide:frame.size.width
+            pixelsHigh:frame.size.height
+            bitsPerSample:8
+            samplesPerPixel:4
+            hasAlpha:YES
+            isPlanar:NO
+            colorSpaceName:NSDeviceRGBColorSpace
+            bytesPerRow:frame.size.width * 4
+            bitsPerPixel:8 * 4];
+        m_ThumbImage = [[NSImage alloc] initWithSize:[m_ThumbBitmap size]];
+        [m_ThumbImage addRepresentation:m_ThumbBitmap];
+    }
     [self unlock];
 }
@@ -447 +457 @@
         m_pOverlayView = pOverlayView;
         m_Thread = [NSThread currentThread];
+
+        [m_pOverlayView setOverlayWin: self];
 
         m_pOverlayHelperView = [[OverlayHelperView alloc] initWithOverlayWindow:self];
@@ -606 +618 @@
 }
 
+- (NSView*)parentView
+{
+    return m_pParentView;
+}
+
+- (void)setParentView: (NSView*)view
+{
+    m_pParentView = view;
+}
+
+- (void)setOverlayWin: (NSWindow*)win
+{
+    m_pOverlayWin = win;
+}
+
+- (NSWindow*)overlayWin
+{
+    return m_pOverlayWin;
+}
+
 - (void)setPos:(NSPoint)pos
 {
@@ -1026 +1058 @@
                 [m_DockTileView thumbBitmap] != nil)
             {
-                /* Only update after atleast 200 ms, cause glReadPixels is
+                /* Only update after at least 200 ms, cause glReadPixels is
                  * heavy performance wise. */
                 uint64_t uiNewTime = RTTimeMilliTS();
@@ -1306 +1338 @@
 }
 
+void cocoaViewReparent(NativeViewRef pView, NativeViewRef pParentView)
+{
+    NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
+
+    OverlayView* pOView = (OverlayView*)pView;
+
+    if (pOView)
+    {
+        /* Make sure the window is removed from any previous parent window. */
+        [[[pOView overlayWin] parentWindow] removeChildWindow:[pOView overlayWin]];
+        /* Set the new parent view */
+        [pOView setParentView: pParentView];
+        /* Add the overlay window as a child to the new parent window */
+        [[pParentView window] addChildWindow:[pOView overlayWin] ordered:NSWindowAbove];
+    }
+
+    [pPool release];
+}
+
 void cocoaViewDestroy(NativeViewRef pView)
 {