Changeset 98432 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2023 12:15:11 PM (23 months ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (2 diffs)
• UIKeyboardHandler.cpp (modified) (4 diffs)
• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (7 diffs)
• UIMachineView.cpp (modified) (3 diffs)
• UIMachineWindow.cpp (modified) (7 diffs)
• UIMouseHandler.cpp (modified) (7 diffs)
• UISession.cpp (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (5 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (3 diffs)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -522 +522 @@
     void sltHandleMachineStateChange()
     {
-        if (m_pSession->machineState() == KMachineState_Running)
+        if (m_pMachine->machineState() == KMachineState_Running)
         {
             /* Start auto-update timer otherwise: */
@@ -1068 +1068 @@
     void sltHandleMachineStateChange()
     {
-        if (m_pSession->machineState() == KMachineState_Running)
+        if (m_pMachine->machineState() == KMachineState_Running)
         {
             /* Start auto-update timer otherwise: */

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

@@ -911 +911 @@
 {
     /* Get machine state: */
-    KMachineState state = uisession()->machineState();
+    KMachineState state = uimachine()->machineState();
     /* Handle particular machine states: */
     switch (state)
@@ -1254 +1254 @@
                 {
                     /* Show a possible warning on key release which seems to be more expected by the end user: */
-                    if (uisession()->isPaused())
+                    if (uimachine()->isPaused())
                         UINotificationMessage::remindAboutPausedVMInput();
                 }
@@ -1745 +1745 @@
 
     /* If the VM is NOT paused: */
-    if (!uisession()->isPaused())
+    if (!uimachine()->isPaused())
     {
         /* If there are scan-codes to send: */
@@ -1971 +1971 @@
 bool UIKeyboardHandler::isSessionRunning()
 {
-    return uisession()->isRunning();
+    return uimachine()->isRunning();
 }
 
 bool UIKeyboardHandler::isSessionStuck()
 {
-    return uisession()->isStuck();
+    return uimachine()->isStuck();
 }
 

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

@@ -283 +283 @@
     actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->setChecked(comServer.GetEnabled());
     actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->blockSignals(false);
+}
+
+KMachineState UIMachine::machineState() const
+{
+    return uisession()->machineState();
+}
+
+void UIMachine::forgetPreviousMachineState()
+{
+    uisession()->forgetPreviousMachineState();
+}
+
+bool UIMachine::isTurnedOff() const
+{
+    return uisession()->isTurnedOff();
+}
+
+bool UIMachine::isPaused() const
+{
+    return uisession()->isPaused();
+}
+
+bool UIMachine::wasPaused() const
+{
+    return uisession()->wasPaused();
+}
+
+bool UIMachine::isRunning() const
+{
+    return uisession()->isRunning();
+}
+
+bool UIMachine::isStuck() const
+{
+    return uisession()->isStuck();
+}
+
+bool UIMachine::isGuestScreenUnDrawable() const
+{
+    return uisession()->isGuestScreenUnDrawable();
+}
+
+bool UIMachine::pause()
+{
+    return uisession()->pause();
+}
+
+bool UIMachine::unpause()
+{
+    return uisession()->unpause();
+}
+
+bool UIMachine::setPause(bool fPause)
+{
+    return uisession()->setPause(fPause);
 }
 

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

@@ -209 +209 @@
     /** @} */
 
+    /** @name Machine-state stuff.
+     ** @{ */
+        /** Returns machine state. */
+        KMachineState machineState() const;
+
+        /** Resets previous state to be the same as current one. */
+        void forgetPreviousMachineState();
+
+        /** Returns whether VM is in one of turned off states. */
+        bool isTurnedOff() const;
+        /** Returns whether VM is in one of paused states. */
+        bool isPaused() const;
+        /** Returns whether VM was in one of paused states. */
+        bool wasPaused() const;
+        /** Returns whether VM is in one of running states. */
+        bool isRunning() const;
+        /** Returns whether VM is in one of stuck states. */
+        bool isStuck() const;
+        /** Returns whether VM is one of states where guest-screen is undrawable. */
+        bool isGuestScreenUnDrawable() const;
+
+        /** Performes VM pausing. */
+        bool pause();
+        /** Performes VM resuming. */
+        bool unpause();
+        /** Performes VM pausing/resuming depending on @a fPause state. */
+        bool setPause(bool fPause);
+    /** @} */
+
     /** @name Host-screen stuff.
      ** @{ */

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

@@ -447 +447 @@
 {
     /* Get machine state: */
-    KMachineState state = uisession()->machineState();
+    KMachineState state = uimachine()->machineState();
 
     /* Update action groups: */
-    m_pRunningActions->setEnabled(uisession()->isRunning());
-    m_pRunningOrPausedActions->setEnabled(uisession()->isRunning() || uisession()->isPaused());
-    m_pRunningOrPausedOrStackedActions->setEnabled(uisession()->isRunning() || uisession()->isPaused() || uisession()->isStuck());
+    m_pRunningActions->setEnabled(uimachine()->isRunning());
+    m_pRunningOrPausedActions->setEnabled(uimachine()->isRunning() || uimachine()->isPaused());
+    m_pRunningOrPausedOrStackedActions->setEnabled(uimachine()->isRunning() || uimachine()->isPaused() || uimachine()->isStuck());
 
     switch (state)
@@ -851 +851 @@
      * & we are in an state where the framebuffer is likely valid. Otherwise to
      * the overlay stuff only. */
-    KMachineState state = uisession()->machineState();
+    KMachineState state = uimachine()->machineState();
     if (m_fIsDockIconEnabled &&
         (state == KMachineState_Running ||
@@ -1737 +1737 @@
 void UIMachineLogic::sltPause(bool fOn)
 {
-    uisession()->setPause(fOn);
+    uimachine()->setPause(fOn);
 }
 
@@ -1748 +1748 @@
 {
     /* Make sure machine is in one of the allowed states: */
-    if (!uisession()->isRunning() && !uisession()->isPaused())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused())
     {
         AssertMsgFailed(("Invalid machine-state. Action should be prohibited!"));
@@ -1761 +1761 @@
 {
     /* Make sure machine is in one of the allowed states: */
-    if (!uisession()->isRunning() && !uisession()->isPaused())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused())
     {
         AssertMsgFailed(("Invalid machine-state. Action should be prohibited!"));
@@ -1774 +1774 @@
 {
     /* Make sure machine is in one of the allowed states: */
-    if (!uisession()->isRunning())
+    if (!uimachine()->isRunning())
     {
         AssertMsgFailed(("Invalid machine-state. Action should be prohibited!"));
@@ -1787 +1787 @@
 {
     /* Make sure machine is in one of the allowed states: */
-    if (!uisession()->isRunning() && !uisession()->isPaused() && !uisession()->isStuck())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused() && !uimachine()->isStuck())
     {
         AssertMsgFailed(("Invalid machine-state. Action should be prohibited!"));

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

@@ -603 +603 @@
 
     /* In some situations especially in some VM states, guest-screen is not drawable: */
-    if (uisession()->isGuestScreenUnDrawable())
+    if (uimachine()->isGuestScreenUnDrawable())
         return;
 
@@ -1053 +1053 @@
 {
     /* Get machine state: */
-    KMachineState state = uisession()->machineState();
+    KMachineState state = uimachine()->machineState();
     switch (state)
     {
@@ -1990 +1990 @@
 #ifdef VBOX_WS_MAC
     /* Update the dock icon if we are in the running state: */
-    if (uisession()->isRunning())
+    if (uimachine()->isRunning())
         updateDockIcon();
 #endif /* VBOX_WS_MAC */

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

@@ -275 +275 @@
     {
         /* Make sure machine state is one of valid: */
-        const KMachineState enmState = uisession()->machineState();
+        const KMachineState enmState = uimachine()->machineState();
         if (enmState == KMachineState_Null)
             return;
@@ -381 +381 @@
 
     /* Make sure machine is in one of the allowed states: */
-    if (!uisession()->isRunning() && !uisession()->isPaused() && !uisession()->isStuck())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused() && !uimachine()->isStuck())
     {
 #if defined(VBOX_IS_QT6_OR_LATER) && defined(VBOX_WS_MAC) /** @todo qt6 ... */
@@ -390 +390 @@
         /** @todo qt6: This could easily be caused by something else, but needs to be
          * looked at by a proper GUI expert.  */
-        if (uisession()->isTurnedOff()) /** @todo qt6: Better state check here? */
+        if (uimachine()->isTurnedOff()) /** @todo qt6: Better state check here? */
             pCloseEvent->accept();
 #endif
@@ -421 +421 @@
             case MachineCloseAction_SaveState:
             case MachineCloseAction_Shutdown:
-                closeAction = uisession()->isStuck() ? MachineCloseAction_Invalid : defaultCloseAction;
+                closeAction = uimachine()->isStuck() ? MachineCloseAction_Invalid : defaultCloseAction;
                 break;
             /* Otherwise we just use what we have: */
@@ -448 +448 @@
             bool fShowCloseDialog = true;
             /* Check if VM is paused or stuck: */
-            const bool fWasPaused = uisession()->isPaused();
-            const bool fIsStuck = uisession()->isStuck();
+            const bool fWasPaused = uimachine()->isPaused();
+            const bool fIsStuck = uimachine()->isStuck();
             /* If VM is NOT paused and NOT stuck: */
             if (!fWasPaused && !fIsStuck)
             {
                 /* We should pause it first: */
-                const bool fIsPaused = uisession()->pause();
+                const bool fIsPaused = uimachine()->pause();
                 /* If we were unable to pause VM: */
                 if (!fIsPaused)
@@ -488 +488 @@
                 /* If VM was not paused before but paused now,
                  * we should resume it if user canceled dialog or chosen shutdown: */
-                if (!fWasPaused && uisession()->isPaused() &&
+                if (!fWasPaused && uimachine()->isPaused() &&
                     (closeAction == MachineCloseAction_Invalid ||
                      closeAction == MachineCloseAction_Detach ||
@@ -494 +494 @@
                 {
                     /* If we unable to resume VM, cancel closing: */
-                    if (!uisession()->unpause())
+                    if (!uimachine()->unpause())
                         closeAction = MachineCloseAction_Invalid;
                 }

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

@@ -373 +373 @@
 {
     /* Get machine state: */
-    KMachineState machineState = uisession()->machineState();
+    KMachineState machineState = uimachine()->machineState();
     /* Handle particular machine states: */
     switch (machineState)
@@ -447 +447 @@
     {
         /* Do not annoy user while restoring VM: */
-        if (uisession()->machineState() != KMachineState_Restoring)
+        if (uimachine()->machineState() != KMachineState_Restoring)
             UINotificationMessage::remindAboutMouseIntegration(uimachine()->isMouseSupportsAbsolute());
     }
@@ -463 +463 @@
      * 2. machine is NOT 'paused' and mouse is NOT 'captured' and 'integrated' and 'absolute' but host pointer is 'hidden' by the guest. */
     if (uimachine()->isMouseCaptured() ||
-        (!uisession()->isPaused() &&
+        (!uimachine()->isPaused() &&
          uimachine()->isMouseIntegrated() &&
          uimachine()->isMouseSupportsAbsolute() &&
@@ -477 +477 @@
     /* Otherwise we should show host pointer with guest shape assigned to it if:
      * machine is NOT 'paused', mouse is 'integrated' and 'absolute' and valid pointer shape is present. */
-    if (!uisession()->isPaused() &&
+    if (!uimachine()->isPaused() &&
         uimachine()->isMouseIntegrated() &&
         uimachine()->isMouseSupportsAbsolute() &&
@@ -927 +927 @@
 
     /* Check if machine is still running: */
-    if (!uisession()->isRunning())
+    if (!uimachine()->isRunning())
         return true;
 
@@ -1164 +1164 @@
             if (m_views[uScreenId]->hasFocus() && (iEventType == QEvent::MouseButtonRelease && mouseButtons == Qt::NoButton))
             {
-                if (uisession()->isPaused())
+                if (uimachine()->isPaused())
                     UINotificationMessage::remindAboutPausedVMInput();
-                else if (uisession()->isRunning())
+                else if (uimachine()->isRunning())
                 {
                     /* Temporarily disable auto capture that will take place after this dialog is dismissed because
@@ -1200 +1200 @@
 {
     /* Eat if machine isn't running: */
-    if (!uisession()->isRunning())
+    if (!uimachine()->isRunning())
         return true;
 

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

@@ -871 +871 @@
     if (sig == SIGUSR1)
         if (gpMachine)
-            gpMachine->uisession()->machineLogic()->keyboardHandler()->releaseAllPressedKeys();
+            gpMachine->machineLogic()->keyboardHandler()->releaseAllPressedKeys();
 }
 #endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */

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

@@ -342 +342 @@
 {
     LogRel(("GUI: UIMachineLogicFullscreen::sltCheckForRequestedVisualStateType: Requested-state=%d, Machine-state=%d\n",
-            uimachine()->requestedVisualState(), uisession()->machineState()));
+            uimachine()->requestedVisualState(), uimachine()->machineState()));
 
     /* Do not try to change visual-state type if machine was not started yet: */
-    if (!uisession()->isRunning() && !uisession()->isPaused())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused())
         return;
 
@@ -376 +376 @@
 
     /* If machine-state changed from 'paused' to 'running': */
-    if (uisession()->isRunning() && uisession()->wasPaused())
+    if (uimachine()->isRunning() && uimachine()->wasPaused())
     {
         LogRel(("GUI: UIMachineLogicFullscreen::sltMachineStateChanged:"
@@ -383 +383 @@
 
         /* Make sure further code will be called just once: */
-        uisession()->forgetPreviousMachineState();
+        uimachine()->forgetPreviousMachineState();
         /* Adjust machine-window geometry if necessary: */
         adjustMachineWindowsGeometry();

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

@@ -73 +73 @@
 {
     LogRel(("GUI: UIMachineLogicNormal::sltCheckForRequestedVisualStateType: Requested-state=%d, Machine-state=%d\n",
-            uimachine()->requestedVisualState(), uisession()->machineState()));
+            uimachine()->requestedVisualState(), uimachine()->machineState()));
 
     /* Do not try to change visual-state type if machine was not started yet: */
-    if (!uisession()->isRunning() && !uisession()->isPaused())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused())
         return;
 

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

@@ -203 +203 @@
     /* Update status-bar indicators-pool: */
     if (m_pIndicatorsPool)
-        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
+        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uimachine()->isRunning());
 
     /* Normalize geometry without moving: */
@@ -391 +391 @@
         statusBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());
         if (m_pIndicatorsPool)
-            m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
+            m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uimachine()->isRunning());
     }
 
@@ -731 +731 @@
     if (   m_pIndicatorsPool
         && iElement & UIVisualElement_IndicatorPoolStuff)
-        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
+        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uimachine()->isRunning());
     /* Update status-bar indicator-pool appearance only when status-bar is visible: */
     if (   m_pIndicatorsPool
@@ -737 +737 @@
     {
         /* If VM is running: */
-        if (uisession()->isRunning())
+        if (uimachine()->isRunning())
         {
             if (iElement & UIVisualElement_HDStuff)
@@ -759 +759 @@
         }
         /* If VM is running or paused: */
-        if (uisession()->isRunning() || uisession()->isPaused())
+        if (uimachine()->isRunning() || uimachine()->isPaused())
         {
             if (iElement & UIVisualElement_Recording)

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

@@ -118 +118 @@
 {
     LogRel(("GUI: UIMachineLogicSeamless::sltCheckForRequestedVisualStateType: Requested-state=%d, Machine-state=%d\n",
-            uimachine()->requestedVisualState(), uisession()->machineState()));
+            uimachine()->requestedVisualState(), uimachine()->machineState()));
 
     /* Do not try to change visual-state type if machine was not started yet: */
-    if (!uisession()->isRunning() && !uisession()->isPaused())
+    if (!uimachine()->isRunning() && !uimachine()->isPaused())
         return;
 
@@ -144 +144 @@
 
     /* If machine-state changed from 'paused' to 'running': */
-    if (uisession()->isRunning() && uisession()->wasPaused())
+    if (uimachine()->isRunning() && uimachine()->wasPaused())
     {
         LogRel(("GUI: UIMachineLogicSeamless::sltMachineStateChanged:"
@@ -151 +151 @@
 
         /* Make sure further code will be called just once: */
-        uisession()->forgetPreviousMachineState();
+        uimachine()->forgetPreviousMachineState();
         /* Adjust machine-window geometry if necessary: */
         adjustMachineWindowsGeometry();

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

@@ -142 +142 @@
 {
     /* Reset seamless feature flag if possible: */
-    if (uisession()->isRunning())
+    if (uimachine()->isRunning())
         display().SetSeamlessMode(false);
 }