Changeset 28342 in vbox

Timestamp:

Apr 14, 2010 11:33:05 PM (15 years ago)

Author:

vboxsync

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

60101

Message:

crOpenGl;FE/Qt4: more dock work for the 3D parts of the multi-monitor support on OSX (still not finished)

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/darwin/UIAbstractDockIconPreview.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/darwin/UIAbstractDockIconPreview.h (modified) (2 diffs)
• 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) (3 diffs)
• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UISession.h (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIAbstractDockIconPreview.cpp

@@ -22 +22 @@
 /* VBox includes */
 #include "UIAbstractDockIconPreview.h"
+#include "UIFrameBuffer.h"
+#include "UIMachineLogic.h"
+#include "UIMachineView.h"
 #include "UISession.h"
-#include "UIFrameBuffer.h"
 
 UIAbstractDockIconPreview::UIAbstractDockIconPreview(UISession * /* pSession */, const QPixmap& /* overlayImage */)
@@ -67 +69 @@
     m_stateRestoring = ::darwinToCGImageRef("state_restoring_16px.png");
     Assert(m_stateRestoring);
+}
+
+void* UIAbstractDockIconPreviewHelper::currentPreviewWindowId() const
+{
+    /* Get the MachineView which is currently previewed and return the win id
+       of the viewport. */
+    UIMachineView* pView = m_pSession->machineLogic()->dockPreviewView();
+    if (pView)
+        return (void*)pView->viewport()->winId();
+    return 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIAbstractDockIconPreview.h

@@ -31 +31 @@
 #include "VBoxUtils-darwin.h"
 
+class UIFrameBuffer;
 class UISession;
-class UIFrameBuffer;
 
 class QPixmap;
@@ -58 +58 @@
     void drawOverlayIcons(CGContextRef context);
 
+    void* currentPreviewWindowId() const;
+
     /* Flipping is necessary cause the drawing context in Carbon is flipped by 180 degree */
     inline CGRect flipRect(CGRect rect) const { return ::darwinFlipCGRect(rect, m_dockIconRect); }

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

@@ -53 +53 @@
 
     UIDockTileMonitor *mMonitor;
-    NSImageView     *mAppIcon;
+    NSImageView       *mAppIcon;
 
     UIDockTileOverlay *mOverlay;
@@ -59 +59 @@
 - (id)initWithParent:(UICocoaDockIconPreviewPrivate*)parent;
 - (void)destroy;
-- (NSView*)screenContent;
+- (NSView*)screenContentWithParentView:(NSView*)parentView;
 - (void)cleanup;
 - (void)restoreAppIcon;
@@ -261 +261 @@
 }
 
-- (NSView*)screenContent
-{
-    return [mMonitor screenContent];
+- (NSView*)screenContentWithParentView:(NSView*)parentView
+{
+    if (mMonitor != nil)
+    {
+        void *pId = p->currentPreviewWindowId();
+        if (parentView == pId)
+            return [mMonitor screenContent];
+    }
+    return nil;
 }
 

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

@@ -268 +268 @@
 }
 
-UIMachineWindow* UIMachineLogic::mainMachineWindow()
+UIMachineWindow* UIMachineLogic::mainMachineWindow() const
 {
     /* Return null if windows are not created yet: */
@@ -277 +277 @@
 }
 
-UIMachineWindow* UIMachineLogic::defaultMachineWindow()
+UIMachineWindow* UIMachineLogic::defaultMachineWindow() const
 {
     /* Return null if windows are not created yet: */
@@ -325 +325 @@
         && m_DockIconPreviewMonitor == screenId)
         m_pDockIconPreview->setOriginalSize(width, height);
+}
+
+UIMachineView* UIMachineLogic::dockPreviewView() const
+{
+    if (   m_fIsDockIconEnabled
+        && m_pDockIconPreview)
+        return machineWindows().at(m_DockIconPreviewMonitor)->machineView();
+    return 0;
 }
 #endif /* Q_WS_MAC */

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

@@ -44 +44 @@
 class UIActionsPool;
 class UIMachineWindow;
+class UIMachineView;
 class UIDockIconPreview;
 class VBoxChangeDockIconUpdateEvent;
@@ -70 +71 @@
     UIActionsPool* actionsPool() const { return m_pActionsPool; }
     UIVisualStateType visualStateType() const { return m_visualStateType; }
-    QList<UIMachineWindow*>& machineWindows() { return m_machineWindowsList; }
-    UIMachineWindow* mainMachineWindow();
-    UIMachineWindow* defaultMachineWindow();
+    const QList<UIMachineWindow*>& machineWindows() const { return m_machineWindowsList; }
+    UIMachineWindow* mainMachineWindow() const;
+    UIMachineWindow* defaultMachineWindow() const;
 
     /* Maintenance getters/setters: */
@@ -81 +82 @@
     void updateDockIcon();
     void updateDockIconSize(int screenId, int width, int height);
+    UIMachineView* dockPreviewView() const;
 #endif /* Q_WS_MAC */
 

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

@@ -755 +755 @@
 }
 
+UIMachineLogic* UISession::machineLogic() const
+{
+    return uimachine()->machineLogic();
+}
+
 QMenu* UISession::newMenu(UIMainMenuType fOptions /* = UIMainMenuType_ALL */)
 {

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

@@ -41 +41 @@
 class UIFrameBuffer;
 class UIMachine;
+class UIMachineLogic;
 class UIMachineMenuBar;
 
@@ -86 +87 @@
     UIActionsPool* actionsPool() const;
     QWidget* mainMachineWindow() const;
+    UIMachineLogic* machineLogic() const;
     QMenu* newMenu(UIMainMenuType fOptions = UIMainMenuType_All);
     QMenuBar* newMenuBar(UIMainMenuType fOptions = UIMainMenuType_All);

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

@@ -1200 +1200 @@
     NSView *contentView = [[[NSApplication sharedApplication] dockTile] contentView];
     NSView *screenContent = nil;
-    if ([contentView respondsToSelector:@selector(screenContent)])
+    /* First try the new variant which checks if this window is within the
+       screen which is previewed in the dock. */
+    if ([contentView respondsToSelector:@selector(screenContentWithParentView:)])
+         screenContent = [contentView performSelector:@selector(screenContentWithParentView:) withObject:(id)m_pParentView];
+    /* If it fails, fall back to the old variant (VBox...) */
+    else if ([contentView respondsToSelector:@selector(screenContent)])
          screenContent = [contentView performSelector:@selector(screenContent)];
     return screenContent;
@@ -1207 +1212 @@
 - (void)reshapeDockTile
 {
-    NSRect dockFrame = [[self dockTileScreen] frame];
-    NSRect parentFrame = [m_pParentView frame];
-
-    m_FBOThumbScaleX = (float)dockFrame.size.width / parentFrame.size.width;
-    m_FBOThumbScaleY = (float)dockFrame.size.height / parentFrame.size.height;
-    NSRect newFrame = NSMakeRect ((int)(m_Pos.x * m_FBOThumbScaleX), (int)(dockFrame.size.height - (m_Pos.y + m_Size.height - m_RootShift.y) * m_FBOThumbScaleY), (int)(m_Size.width * m_FBOThumbScaleX), (int)(m_Size.height * m_FBOThumbScaleY));
+    NSView *pView = [self dockTileScreen];
+    if (pView != nil)
+    {
+        NSRect dockFrame = [pView frame];
+        NSRect parentFrame = [m_pParentView frame];
+
+        m_FBOThumbScaleX = (float)dockFrame.size.width / parentFrame.size.width;
+        m_FBOThumbScaleY = (float)dockFrame.size.height / parentFrame.size.height;
+        NSRect newFrame = NSMakeRect ((int)(m_Pos.x * m_FBOThumbScaleX), (int)(dockFrame.size.height - (m_Pos.y + m_Size.height - m_RootShift.y) * m_FBOThumbScaleY), (int)(m_Size.width * m_FBOThumbScaleX), (int)(m_Size.height * m_FBOThumbScaleY));
 //    NSRect newFrame = NSMakeRect ((int)roundf(m_Pos.x * m_FBOThumbScaleX), (int)roundf(dockFrame.size.height - (m_Pos.y + m_Size.height) * m_FBOThumbScaleY), (int)roundf(m_Size.width * m_FBOThumbScaleX), (int)roundf(m_Size.height * m_FBOThumbScaleY));
 //      NSRect newFrame = NSMakeRect ((m_Pos.x * m_FBOThumbScaleX), (dockFrame.size.height - (m_Pos.y + m_Size.height) * m_FBOThumbScaleY), (m_Size.width * m_FBOThumbScaleX), (m_Size.height * m_FBOThumbScaleY));
 //    printf ("%f %f %f %f - %f %f\n", newFrame.origin.x, newFrame.origin.y, newFrame.size.width, newFrame.size.height, m_Size.height, m_FBOThumbScaleY);
-    [m_DockTileView setFrame: newFrame];
+        [m_DockTileView setFrame: newFrame];
+    }
 }
 
@@ -1352 +1361 @@
         /* Add the overlay window as a child to the new parent window */
         [[pParentView window] addChildWindow:[pOView overlayWin] ordered:NSWindowAbove];
+        [pOView createFBO];
     }