Changeset 53954 in vbox

Timestamp:

Jan 23, 2015 4:47:20 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: GuestSupportsGraphics is now possible without GuestAdditionsActive.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UIMultiScreenLayout.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

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

@@ -668 +668 @@
 
         /* Remind user if necessary, ignore text and VGA modes: */
+        /* This check (supports graphics) is not quite right due to past mistakes
+         * in the Guest Additions protocol, but in practice it should be fine. */
         if (   ulGuestBitsPerPixel != ulBitsPerPixel
             && ulGuestBitsPerPixel != 0
-            && m_pMachineView->uisession()->isGuestAdditionsActive())
+            && m_pMachineView->uisession()->isGuestSupportsGraphics())
             popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
                                                      ulGuestBitsPerPixel, ulBitsPerPixel);

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

@@ -245 +245 @@
     bool fSuccess = true;
     CMachine machine = m_pMachineLogic->session().GetMachine();
-    if (m_pMachineLogic->uisession()->isGuestAdditionsActive())
+    if (m_pMachineLogic->uisession()->isGuestSupportsGraphics())
     {
         quint64 availBits = machine.GetVRAMSize() * _1M * 8;

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

@@ -190 +190 @@
     /* Guest additions state getters: */
     bool isGuestAdditionsActive() const { return (m_ulGuestAdditionsRunLevel > AdditionsRunLevelType_None); }
-    bool isGuestSupportsGraphics() const { return isGuestAdditionsActive() && m_fIsGuestSupportsGraphics; }
+    bool isGuestSupportsGraphics() const { return m_fIsGuestSupportsGraphics; }
+    /* The double check below is correct, even though it is an implementation
+     * detail of the Additions which the GUI should not ideally have to know. */
     bool isGuestSupportsSeamless() const { return isGuestSupportsGraphics() && m_fIsGuestSupportsSeamless; }
 

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

@@ -68 +68 @@
 {
     /* Check if there is enough physical memory to enter fullscreen: */
-    if (uisession()->isGuestAdditionsActive())
+    if (uisession()->isGuestSupportsGraphics())
     {
         quint64 availBits = machine().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;

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

@@ -66 +66 @@
 {
     /* Check if there is enough physical memory to enter seamless: */
-    if (uisession()->isGuestAdditionsActive())
+    if (uisession()->isGuestSupportsSeamless())
     {
         quint64 availBits = machine().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;