Changeset 76169 in vbox

Timestamp:

Dec 11, 2018 7:19:41 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: save size and visibility hints to extra data before not after sending.
bugref:5329: Implement VMWare SVGA compatible video device
Since the previous change we save size and visibility hints sent to the guest
in extra data. However, for non-VMSVGA guests we also save sizes and screen
visibility set by the guest. This change makes sure that we always save the
ones we send before the ones set by the guest, so that if the guest chooses
to adjust the mode we request we will save the guest choice, not our request.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMultiScreenLayout.cpp (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (2 diffs)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• scale/UIMachineViewScale.cpp (modified) (1 diff)

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

@@ -320 +320 @@
 
     /* Record the hint to extra data, needed for guests using VMSVGA: */
+    /* This should be done before the actual hint is sent in case the guest overrides it. */
     storeGuestSizeHint(size);
 

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

@@ -134 +134 @@
             /* Then we have to disable excessive guest-screen: */
             LogRel(("GUI: UIMultiScreenLayout::update: Disabling excessive guest-screen %d\n", iGuestScreen));
+            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, false);
             m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, false, false, 0, 0, 0, 0, 0);
-            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, false);
         }
     }
@@ -168 +168 @@
             LogRel(("GUI: UIMultiScreenLayout::update: Enabling guest-screen %d with following resolution: %dx%d\n",
                     iGuestScreen, uWidth, uHeight));
+            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, true);
             m_pMachineLogic->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

@@ -2063 +2063 @@
 
     /* And remember the request in extra data for guests with VMSVGA: */
+    /* This should be done before the actual hint is sent in case the guest overrides it. */
     gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, vboxGlobal().managedVMUuid());
 }

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

@@ -230 +230 @@
     if (!fEnabled)
     {
+        uisession()->setScreenVisibleHostDesires(iIndex, false);
         display().SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);
-        uisession()->setScreenVisibleHostDesires(iIndex, false);
     }
     else
@@ -240 +240 @@
         if (!uHeight)
             uHeight = 600;
+        uisession()->setScreenVisibleHostDesires(iIndex, true);
         display().SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32);
-        uisession()->setScreenVisibleHostDesires(iIndex, true);
     }
 }

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

@@ -175 +175 @@
     /// @todo What if not m_bIsGuestAutoresizeEnabled?
     ///       Just let the guest start at the default 800x600?
+    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
     display().SetVideoModeHint(screenId(),
                                guestScreenVisibilityStatus(),
                                false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
-    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
 }
 

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

@@ -180 +180 @@
 
     /* Send saved size-hint to the guest: */
+    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
     display().SetVideoModeHint(screenId(),
                                guestScreenVisibilityStatus(),
                                false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
-    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
 }