Changeset 98450 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 2, 2023 2:46:36 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Pass guest-additions stuff through UIMachine to detach rest of Runtime UI from UISession.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UIMachine.cpp (modified) (2 diffs)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineView.cpp (modified) (5 diffs)
• UIMultiScreenLayout.cpp (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (3 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)

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

@@ -1871 +1871 @@
         if (   ulGuestBitsPerPixel != ulBitsPerPixel
             && ulGuestBitsPerPixel != 0
-            && m_pMachineView->uisession()->isGuestSupportsGraphics())
+            && m_pMachineView->uimachine()->isGuestSupportsGraphics())
             UINotificationMessage::remindAboutWrongColorDepth(ulGuestBitsPerPixel, ulBitsPerPixel);
         else

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

@@ -235 +235 @@
 {
     /* Make sure action-pool knows whether GA supports graphics: */
-    actionPool()->toRuntime()->setGuestSupportsGraphics(uisession()->isGuestSupportsGraphics());
+    actionPool()->toRuntime()->setGuestSupportsGraphics(isGuestSupportsGraphics());
     /* Enable/Disable Upgrade Additions action depending on feature status: */
     actionPool()->action(UIActionIndexRT_M_Devices_S_UpgradeGuestAdditions)->setEnabled(uisession()->guestAdditionsUpgradable());
@@ -421 +421 @@
     /* Remember last full-screen size: */
     m_monitorLastFullScreenSizeVector[(int)uScreenId] = size;
+}
+
+bool UIMachine::isGuestAdditionsActive() const
+{
+    return uisession()->isGuestAdditionsActive();
+}
+
+bool UIMachine::isGuestSupportsGraphics() const
+{
+    return uisession()->isGuestSupportsGraphics();
+}
+
+bool UIMachine::isGuestSupportsSeamless() const
+{
+    return uisession()->isGuestSupportsSeamless();
 }
 

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

@@ -272 +272 @@
     /** @} */
 
+    /** @name Guest additions stuff.
+     ** @{ */
+        /** Returns whether guest additions is active. */
+        bool isGuestAdditionsActive() const;
+        /** Returns whether guest additions supports graphics. */
+        bool isGuestSupportsGraphics() const;
+        /** Returns whether guest additions supports seamless. */
+        bool isGuestSupportsSeamless() const;
+    /** @} */
+
     /** @name Keyboard stuff.
      ** @{ */

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

@@ -586 +586 @@
     LogRel3(("GUI: UIMachineLogic::sltAdditionsStateChanged: Adjusting actions availability according to GA state.\n"));
     actionPool()->action(UIActionIndexRT_M_View_T_Seamless)->setEnabled(uimachine()->isVisualStateAllowed(UIVisualStateType_Seamless) &&
-                                                                        uisession()->isGuestSupportsSeamless());
+                                                                        uimachine()->isGuestSupportsSeamless());
 }
 
@@ -2285 +2285 @@
 {
     /* Do not process if additions are not loaded! */
-    if (!uisession()->isGuestAdditionsActive())
+    if (!uimachine()->isGuestAdditionsActive())
         UINotificationMessage::remindAboutGuestAdditionsAreNotActive();
 

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

@@ -681 +681 @@
      * ourselves.  Windows guests should use VBoxVGA controllers, not VMSVGA. */
     if (   !isFullscreenOrSeamless()
-        && uisession()->isGuestSupportsGraphics()
+        && uimachine()->isGuestSupportsGraphics()
         && (machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA))
         setStoredGuestScreenSizeHint(frameBufferSizeNew);
@@ -779 +779 @@
      * Do not send a hint if nothing has changed to prevent the guest being notified about its own changes. */
     if (   !isFullscreenOrSeamless()
-        && uisession()->isGuestSupportsGraphics()
+        && uimachine()->isGuestSupportsGraphics()
         && (   (int)frameBuffer()->width() != size.width()
             || (int)frameBuffer()->height() != size.height()
@@ -854 +854 @@
         }
         /* Do not send a hint if GA supports graphics and we have sent that hint already: */
-        if (fSendHint && uisession()->isGuestSupportsGraphics() && m_lastSizeHint == size)
+        if (fSendHint && uimachine()->isGuestSupportsGraphics() && m_lastSizeHint == size)
         {
             LogRel(("GUI: UIMachineView::sltPerformGuestResize: Omitting to send size-hint %dx%d to guest-screen %d "
@@ -914 +914 @@
          * Do not send a hint if nothing has changed to prevent the guest being notified about its own changes. */
         if (   !isFullscreenOrSeamless()
-            && uisession()->isGuestSupportsGraphics()
+            && uimachine()->isGuestSupportsGraphics()
             && (   frameBuffer()->width() != uWidth
                 || frameBuffer()->height() != uHeight
@@ -965 +965 @@
      * Do not send a hint if nothing has changed to prevent the guest being notified about its own changes. */
     if (   !isFullscreenOrSeamless()
-        && uisession()->isGuestSupportsGraphics()
+        && uimachine()->isGuestSupportsGraphics()
         && (   (int)frameBuffer()->width() != size.width()
             || (int)frameBuffer()->height() != size.height()

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

@@ -236 +236 @@
     /* Check the memory requirements first: */
     bool fSuccess = true;
-    if (m_pMachineLogic->uisession()->isGuestSupportsGraphics())
+    if (m_pMachineLogic->uimachine()->isGuestSupportsGraphics())
     {
         quint64 availBits = m_pMachineLogic->machine().GetGraphicsAdapter().GetVRAMSize() * _1M * 8;

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

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

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

@@ -128 +128 @@
         m_fGuestAutoresizeEnabled = fEnabled;
 
-        if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+        if (m_fGuestAutoresizeEnabled && uimachine()->isGuestSupportsGraphics())
             sltPerformGuestResize();
     }

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

@@ -90 +90 @@
         {
             /* And supported: */
-            if (uisession()->isGuestSupportsSeamless())
+            if (uimachine()->isGuestSupportsSeamless())
             {
                 LogRel(("GUI: UIMachineLogicNormal::sltCheckForRequestedVisualStateType: "

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

@@ -70 +70 @@
                 setMaximumGuestSize();
                 /* And resize guest to current window size: */
-                if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+                if (m_fGuestAutoresizeEnabled && uimachine()->isGuestSupportsGraphics())
                     QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
                 break;
@@ -142 +142 @@
         m_fGuestAutoresizeEnabled = fEnabled;
 
-        if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+        if (m_fGuestAutoresizeEnabled && uimachine()->isGuestSupportsGraphics())
             sltPerformGuestResize();
     }
@@ -205 +205 @@
      * or the guest-additions doesn't support graphics
      * we should take scroll-bars size-hints into account: */
-    if (!m_fGuestAutoresizeEnabled || !uisession()->isGuestSupportsGraphics())
+    if (!m_fGuestAutoresizeEnabled || !uimachine()->isGuestSupportsGraphics())
     {
         if (verticalScrollBar()->isVisible())

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

@@ -670 +670 @@
          * we should deduce widget's size-hint on visible scroll-bar's hint: */
         if (   !machineView()->isGuestAutoresizeEnabled()
-            || !uisession()->isGuestSupportsGraphics())
+            || !uimachine()->isGuestSupportsGraphics())
         {
             if (machineView()->verticalScrollBar()->isVisible())
@@ -694 +694 @@
     if (   frGeoNew != frGeo
         && (   !machineView()->isGuestAutoresizeEnabled()
-            || !uisession()->isGuestSupportsGraphics()))
+            || !uimachine()->isGuestSupportsGraphics()))
     {
         /* Determine whether we need additional space for one or both scroll-bars: */

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

@@ -80 +80 @@
 {
     /* Check if there is enough physical memory to enter seamless: */
-    if (uisession()->isGuestSupportsSeamless())
+    if (uimachine()->isGuestSupportsSeamless())
     {
         quint64 availBits = machine().GetGraphicsAdapter().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
@@ -129 +129 @@
 
     /* If 'seamless' visual-state type is no more supported: */
-    if (!uisession()->isGuestSupportsSeamless())
+    if (!uimachine()->isGuestSupportsSeamless())
     {
         LogRel(("GUI: UIMachineLogicSeamless::sltCheckForRequestedVisualStateType: "