Changeset 45402 in vbox

Timestamp:

Apr 8, 2013 12:32:55 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Multi-screen support: Seamless/Fullscreen: Auto mounting/unmounting guest-screens when necessary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMultiScreenLayout.cpp (modified) (4 diffs)
• runtime/UIMultiScreenLayout.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp

@@ -61 +61 @@
 const char* UIDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen";
 const char* UIDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
+const char* UIDefs::GUI_AutomountGuestScreens = "GUI/AutomountGuestScreens";
 const char* UIDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
 const char* UIDefs::GUI_PassCAD = "GUI/PassCAD";

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -138 +138 @@
     extern const char* GUI_VirtualScreenToHostScreen;
     extern const char* GUI_AutoresizeGuest;
+    extern const char* GUI_AutomountGuestScreens;
     extern const char* GUI_SaveMountedAtRuntime;
     extern const char* GUI_PassCAD;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3735 +3735 @@
     /* 'true' if hiding is not approved by the extra-data: */
     return !isApprovedByExtraData(machine, GUI_HideDetails);
+}
+
+/* static */
+bool VBoxGlobal::shouldWeAutoMountGuestScreens(CMachine &machine,
+                                               bool fIncludingSanityCheck /*= true*/)
+{
+    if (fIncludingSanityCheck)
+    {
+        /* 'false' for null machines,
+         * there is nothing to start anyway: */
+        if (machine.isNull())
+            return false;
+
+        /* 'false' for inaccessible machines,
+         * we can't start them anyway: */
+        if (!machine.GetAccessible())
+            return false;
+    }
+
+    /* 'true' if guest-screen auto-mounting approved by the extra-data: */
+    return isApprovedByExtraData(machine, GUI_AutomountGuestScreens);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -379 +379 @@
     static bool shouldWeShowDetails(CMachine &machine,
                                     bool fIncludingMachineGeneralCheck = false);
+    static bool shouldWeAutoMountGuestScreens(CMachine &machine, bool fIncludingSanityCheck = true);
 
 #ifdef RT_OS_LINUX

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

@@ -30 +30 @@
 #include "UISession.h"
 #include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
@@ -75 +76 @@
      * and all guests screens need there own host screen. */
     CMachine machine = m_pMachineLogic->session().GetMachine();
+    CDisplay display = m_pMachineLogic->session().GetConsole().GetDisplay();
+    bool fShouldWeAutoMountGuestScreens = VBoxGlobal::shouldWeAutoMountGuestScreens(machine, false);
     QDesktopWidget *pDW = QApplication::desktop();
     foreach (int iGuestScreen, m_guestScreens)
@@ -135 +138 @@
             availableScreens.removeOne(iHostScreen);
         }
+        /* Do we have opinion about what to do with excessive guest-screen? */
+        else if (fShouldWeAutoMountGuestScreens)
+        {
+            /* Then we have to disable excessive guest-screen: */
+            display.SetVideoModeHint(iGuestScreen, false, false, 0, 0, 0, 0, 0);
+        }
+    }
+
+    /* Are we still have available host-screens
+     * and have opinion about what to do with disabled guest-screens? */
+    if (!availableScreens.isEmpty() && fShouldWeAutoMountGuestScreens)
+    {
+        /* How many excessive host-screens do we have? */
+        int cExcessiveHostScreens = availableScreens.size();
+        /* How many disabled guest-screens do we have? */
+        int cDisabledGuestScreens = m_disabledGuestScreens.size();
+        /* We have to try to enable disabled guest-screens if any: */
+        int cGuestScreensToEnable = qMin(cExcessiveHostScreens, cDisabledGuestScreens);
+        for (int iGuestScreenIndex = 0; iGuestScreenIndex < cGuestScreensToEnable; ++iGuestScreenIndex)
+        {
+            /* Get corresponding guest-screen: */
+            int iGuestScreen = m_disabledGuestScreens[iGuestScreenIndex];
+            /* Re-enable guest-screen with the old arguments: */
+            ULONG iWidth, iHeight, iBpp;
+            display.GetScreenResolution(iGuestScreen, iWidth, iHeight, iBpp);
+            display.SetVideoModeHint(iGuestScreen, true, false, 0, 0, iWidth, iHeight, iBpp);
+        }
     }
 
@@ -254 +284 @@
     /* Get machine: */
     CMachine machine = m_pMachineLogic->session().GetMachine();
-    /* Enumerate all the visible guest screens: */
+    /* Enumerate all the guest screens: */
     m_guestScreens.clear();
+    m_disabledGuestScreens.clear();
     for (uint iGuestScreen = 0; iGuestScreen < machine.GetMonitorCount(); ++iGuestScreen)
         if (m_pMachineLogic->uisession()->isScreenVisible(iGuestScreen))
             m_guestScreens << iGuestScreen;
+        else
+            m_disabledGuestScreens << iGuestScreen;
 }
 

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

@@ -82 +82 @@
     UIMachineLogic *m_pMachineLogic;
     QList<int> m_guestScreens;
+    QList<int> m_disabledGuestScreens;
     int m_cHostScreens;
     QMap<int, int> m_screenMap;