Changeset 59079 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 10, 2015 4:07:16 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8149: Runtime UI: Machine View: UI Session: Machine Logic: Multi Screen Layout: Caching screen visibility for host-desires and using them to make an opinion to update guest-screen status when GA state-change event arrives. It is only done when auto-mount of guest-screens enabled.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMultiScreenLayout.cpp (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.h (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (2 diffs)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• scale/UIMachineViewScale.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.h (modified) (1 diff)

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

@@ -307 +307 @@
             "Sending guest size-hint to screen %d as %dx%d\n",
             (int)screenId(), size.width(), size.height()));
-    display().SetVideoModeHint(screenId(),
-                               uisession()->isScreenVisible(screenId()),
-                               false, 0, 0, size.width(), size.height(), 0);
+
+    /* If auto-mount of guest-screens (auto-pilot) enabled: */
+    if (gEDataManager->autoMountGuestScreensEnabled(vboxGlobal().managedVMUuid()))
+    {
+        /* If host and guest have same opinion about guest-screen visibility: */
+        if (uisession()->isScreenVisible(screenId()) == uisession()->isScreenVisibleHostDesires(screenId()))
+            display().SetVideoModeHint(screenId(),
+                                       uisession()->isScreenVisible(screenId()),
+                                       false, 0, 0, size.width(), size.height(), 0);
+        /* If host desires to have guest-screen disabled and guest-screen is enabled, retrying: */
+        else if (!uisession()->isScreenVisibleHostDesires(screenId()))
+            display().SetVideoModeHint(screenId(), false, false, 0, 0, 0, 0, 0);
+        /* If host desires to have guest-screen enabled and guest-screen is disabled, retrying: */
+        else if (uisession()->isScreenVisibleHostDesires(screenId()))
+            display().SetVideoModeHint(screenId(), true, false, 0, 0, size.width(), size.height(), 0);
+    }
+    /* If auto-mount of guest-screens (auto-pilot) disabled: */
+    else
+    {
+        display().SetVideoModeHint(screenId(),
+                                   uisession()->isScreenVisible(screenId()),
+                                   false, 0, 0, size.width(), size.height(), 0);
+    }
 }
 

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

@@ -130 +130 @@
             LogRel(("GUI: UIMultiScreenLayout::update: Disabling excessive guest-screen %d\n", iGuestScreen));
             display.SetVideoModeHint(iGuestScreen, false, false, 0, 0, 0, 0, 0);
+            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, false);
         }
     }
@@ -163 +164 @@
                     iGuestScreen, uWidth, uHeight));
             display.SetVideoModeHint(iGuestScreen, true, false, 0, 0, uWidth, uHeight, 32);
+            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, true);
         }
     }

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

@@ -1212 +1212 @@
             m_monitorVisibilityVector[0] = true;
     }
+
+    /* Prepare initial screen visibility status of host-desires.
+     * This is mostly dummy initialization as host-desires should get updated later in multi-screen layout.
+     * By default making host-desires same as facts. */
+    m_monitorVisibilityVectorHostDesires.resize(machine().GetMonitorCount());
+    for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
+        m_monitorVisibilityVectorHostDesires[iScreenIndex] = m_monitorVisibilityVector[iScreenIndex];
 }
 
@@ -1867 +1874 @@
 }
 
+bool UISession::isScreenVisibleHostDesires(ulong uScreenId) const
+{
+    /* Make sure index feats the bounds: */
+    AssertReturn(uScreenId < (ulong)m_monitorVisibilityVectorHostDesires.size(), false);
+
+    /* Return 'actual' (host-desire) visibility status: */
+    return m_monitorVisibilityVectorHostDesires.value((int)uScreenId);
+}
+
+void UISession::setScreenVisibleHostDesires(ulong uScreenId, bool fIsMonitorVisible)
+{
+    /* Make sure index feats the bounds: */
+    AssertReturnVoid(uScreenId < (ulong)m_monitorVisibilityVectorHostDesires.size());
+
+    /* Remember 'actual' (host-desire) visibility status: */
+    m_monitorVisibilityVectorHostDesires[(int)uScreenId] = fIsMonitorVisible;
+}
+
 bool UISession::isScreenVisible(ulong uScreenId) const
 {

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

@@ -222 +222 @@
     void setMouseCaptured(bool fIsMouseCaptured) { m_fIsMouseCaptured = fIsMouseCaptured; }
     void setMouseIntegrated(bool fIsMouseIntegrated) { m_fIsMouseIntegrated = fIsMouseIntegrated; }
+
+    /* Screen visibility status for host-desires: */
+    bool isScreenVisibleHostDesires(ulong uScreenId) const;
+    void setScreenVisibleHostDesires(ulong uScreenId, bool fIsMonitorVisible);
 
     /* Screen visibility status: */
@@ -423 +427 @@
     QVector<bool> m_monitorVisibilityVector;
 
+    /* Screen visibility vector for host-desires: */
+    QVector<bool> m_monitorVisibilityVectorHostDesires;
+
     /* Screen last full-screen size vector: */
     QVector<QSize> m_monitorLastFullScreenSizeVector;

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

@@ -454 +454 @@
 {
     LogRel2(("GUI: UIMachineLogicFullscreen: Host-screen available-area change ignored\n"));
+}
+
+void UIMachineLogicFullscreen::sltAdditionsStateChanged()
+{
+    /* Call to base-class: */
+    UIMachineLogic::sltAdditionsStateChanged();
+
+    LogRel(("GUI: UIMachineLogicFullscreen: Additions-state actual-change event, rebuild multi-screen layout\n"));
+    /* Rebuild multi-screen layout: */
+    m_pScreenLayout->rebuild();
 }
 

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

@@ -110 +110 @@
     /** Handles host-screen available-area change. */
     virtual void sltHostScreenAvailableAreaChange();
+    /** Handles additions-state change. */
+    virtual void sltAdditionsStateChanged();
 
 private:

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

@@ -228 +228 @@
     display().GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY, monitorStatus);
     if (!fEnabled)
+    {
         display().SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);
+        uisession()->setScreenVisibleHostDesires(iIndex, false);
+    }
     else
     {
@@ -237 +240 @@
             uHeight = 600;
         display().SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32);
+        uisession()->setScreenVisibleHostDesires(iIndex, true);
     }
 }

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

@@ -156 +156 @@
                                guestScreenVisibilityStatus(),
                                false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -164 +164 @@
                                guestScreenVisibilityStatus(),
                                false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
 }
 

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

@@ -207 +207 @@
 }
 
+void UIMachineLogicSeamless::sltAdditionsStateChanged()
+{
+    /* Call to base-class: */
+    UIMachineLogic::sltAdditionsStateChanged();
+
+    LogRel(("GUI: UIMachineLogicSeamless: Additions-state actual-change event, rebuild multi-screen layout\n"));
+    /* Rebuild multi-screen layout: */
+    m_pScreenLayout->rebuild();
+}
+
 void UIMachineLogicSeamless::prepareActionGroups()
 {

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

@@ -67 +67 @@
     /** Handles host-screen count change. */
     virtual void sltHostScreenCountChange();
+    /** Handles additions-state change. */
+    virtual void sltAdditionsStateChanged();
 
 #ifndef RT_OS_DARWIN