Changeset 98674 in vbox

Timestamp:

Feb 21, 2023 2:18:51 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155974

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Stuff related to actual machine state (opposing to cached one).

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineView.cpp (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (1 diff)

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

@@ -294 +294 @@
 {
     uisession()->forgetPreviousMachineState();
+}
+
+bool UIMachine::acquireLiveMachineState(KMachineState &enmState)
+{
+    return uisession()->acquireLiveMachineState(enmState);
 }
 

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

@@ -214 +214 @@
     /** @name Machine-state stuff.
      ** @{ */
-        /** Returns machine state. */
+        /** Returns cached machine state. */
         KMachineState machineState() const;
 
         /** Resets previous state to be the same as current one. */
         void forgetPreviousMachineState();
+
+        /** Acquire live machine state. */
+        bool acquireLiveMachineState(KMachineState &enmState);
 
         /** Returns whether VM is in one of turned off states. */

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

@@ -1056 +1056 @@
                 // We can't take pause pixmap if actual state is Saving, this produces
                 // a lock and GUI will be frozen until SaveState call is complete...
-                const KMachineState enmActualState = machine().GetState();
+                KMachineState enmActualState = KMachineState_Null;
+                uimachine()->acquireLiveMachineState(enmActualState);
                 if (enmActualState != KMachineState_Saving)
                 {
@@ -1266 +1267 @@
     {
 #ifdef VBOX_WS_X11
-        /* Processing pseudo resize-event to synchronize frame-buffer with stored framebuffer size.
-         * On X11 this will be additional done when the machine state was 'saved'. */
-        if (machine().GetState() == KMachineState_Saved || machine().GetState() == KMachineState_AbortedSaved)
+        // WORKAROUND:
+        // Processing pseudo resize-event to synchronize frame-buffer with stored framebuffer size.
+        // On X11 this have to be additionally done when the machine state was 'saved'.
+        KMachineState enmActualState = KMachineState_Null;
+        uimachine()->acquireLiveMachineState(enmActualState);
+        if (enmActualState == KMachineState_Saved || enmActualState == KMachineState_AbortedSaved)
             size = storedGuestScreenSizeHint();
 #endif /* VBOX_WS_X11 */

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

@@ -257 +257 @@
 {
     return mainMachineWindow() ? mainMachineWindow()->winId() : 0;
+}
+
+bool UISession::acquireLiveMachineState(KMachineState &enmState)
+{
+    CMachine comMachine = machine();
+    KMachineState enmMachineState = comMachine.GetState();
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+        enmState = enmMachineState;
+    return fSuccess;
 }
 

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

@@ -199 +199 @@
         /** Returns previous machine state. */
         KMachineState machineStatePrevious() const { return m_enmMachineStatePrevious; }
-        /** Returns machine state. */
+        /** Returns cached machine state. */
         KMachineState machineState() const { return m_enmMachineState; }
 
         /** Resets previous state to be the same as current one. */
         void forgetPreviousMachineState() { m_enmMachineStatePrevious = m_enmMachineState; }
+
+        /** Acquire live machine state. */
+        bool acquireLiveMachineState(KMachineState &enmState);
 
         /** Returns whether VM is in one of saved states. */

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

@@ -408 +408 @@
             UIDesktopWidgetWatchdog::setTopLevelGeometry(this, m_geometry);
 
-            /* If previous machine-state was NOT SAVED => normalize window to the optimal-size: */
-            if (machine().GetState() != KMachineState_Saved && machine().GetState() != KMachineState_AbortedSaved)
+            /* If actual machine-state is NOT saved => normalize window to the optimal-size: */
+            KMachineState enmActualState = KMachineState_Null;
+            uimachine()->acquireLiveMachineState(enmActualState);
+            if (enmActualState != KMachineState_Saved && enmActualState != KMachineState_AbortedSaved)
                 normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());