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

Timestamp:

Mar 2, 2010 4:02:37 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: Check for sufficient memory; Fix for older Qt versions.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.h (modified) (1 diff)

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

@@ -289 +289 @@
     }
     else
-        /* Discard the temporary create new state: */
+        /* Discard the temporary created new state: */
         delete pNewVisualState;
 }

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

@@ -58 +58 @@
 bool UIMachineLogicFullscreen::checkAvailability()
 {
+    /* Temporary get a machine object */
+    const CMachine &machine = uisession()->session().GetMachine();
+    const CConsole &console = uisession()->session().GetConsole();
+
+#if (QT_VERSION >= 0x040600)
+    int cHostScreens = QApplication::desktop()->screenCount();
+#else /* (QT_VERSION >= 0x040600) */
     int cHostScreens = QApplication::desktop()->numScreens();
-    int cGuestScreens = uisession()->session().GetMachine().GetMonitorCount();
+#endif /* !(QT_VERSION >= 0x040600) */
+
+    int cGuestScreens = machine.GetMonitorCount();
     /* Check that there are enough physical screens are connected */
     if (cHostScreens < cGuestScreens)
     {
         vboxProblem().cannotEnterFullscreenMode();
-        setPreventAutoStart(true);
         return false;
     }
+
+    // TODO_NEW_CORE: this is how it looked in the old version
+    // bool VBoxConsoleView::isAutoresizeGuestActive() { return mGuestSupportsGraphics && mAutoresizeGuest; }
+//    if (uisession()->session().GetConsole().isAutoresizeGuestActive())
+    if (uisession()->isGuestAdditionsActive())
+    {
+        ULONG64 availBits = machine.GetVRAMSize() /* VRAM */
+                          * _1M /* MB to bytes */
+                          * 8; /* to bits */
+        ULONG guestBpp = console.GetDisplay().GetBitsPerPixel();
+        ULONG64 usedBits = 0;
+        for (int i = 0; i < cGuestScreens; ++i)
+        {
+            // TODO_NEW_CORE: really take the screen geometry into account the
+            // different fb will be displayed. */
+            QRect screen = QApplication::desktop()->screenGeometry(i);
+            usedBits += screen.width() /* display width */
+                      * screen.height() /* display height */
+                      * guestBpp
+                      + _1M * 8; /* current cache per screen - may be changed in future */
+        }
+        usedBits += 4096 * 8; /* adapter info */
+
+        if (availBits < usedBits)
+        {
+//            int result = vboxProblem().cannotEnterFullscreenMode(screen.width(), screen.height(), guestBpp,
+//                                                                 (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
+            int result = vboxProblem().cannotEnterFullscreenMode(0, 0, guestBpp,
+                                                                 (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
+            if (result == QIMessageBox::Cancel)
+                return false;
+        }
+    }
+
 
     return true;
@@ -136 +178 @@
 }
 
-void UIMachineLogicFullscreen::prepareRequiredFeatures()
-{
-    // TODO_NEW_CORE
-//    if (session().GetConsole().isAutoresizeGuestActive())
-//    {
-//        ULONG64 availBits = session().GetMachine().GetVRAMSize() /* VRAM */
-//            * _1M /* MB to bytes */
-//            * 8; /* to bits */
-//        for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)
-//        {
-//            QRect screen = QApplication::desktop()->screenGeometry(this);
-//            ULONG guestBpp = mConsole->console().GetDisplay().GetBitsPerPixel();
-//            ULONG64 usedBits = (screen.width() /* display width */
-//                                * screen.height() /* display height */
-//                                * guestBpp
-//                                + _1M * 8) /* current cache per screen - may be changed in future */
-//                * session().GetMachine().GetMonitorCount() /**< @todo fix assumption that all screens have same resolution */
-//                + 4096 * 8; /* adapter info */
-//        }
-//
-//        if (availBits < usedBits)
-//        {
-//            int result = vboxProblem().cannotEnterFullscreenMode(
-//                                                                 screen.width(), screen.height(), guestBpp,
-//                                                                 (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
-//            if (result == QIMessageBox::Cancel)
-//                sltClose();
-//        }
-//    }
-//
-    UIMachineLogic::prepareRequiredFeatures();
-}
-
 void UIMachineLogicFullscreen::prepareMachineWindows()
 {

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

@@ -57 +57 @@
     void prepareActionConnections();
     void prepareMachineWindows();
-    void prepareRequiredFeatures();
 
     /* Cleanup helpers: */