Changeset 27300 in vbox for trunk/src

Timestamp:

Mar 11, 2010 7:20:32 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: support for pre-loading extended modes, seamless pre-loading support.

Location:

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

Files:

• UIMachine.cpp (modified) (2 diffs)
• UIMachineLogic.cpp (modified) (6 diffs)
• UIMachineLogic.h (modified) (4 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (3 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

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

@@ -390 +390 @@
     /* Load extra-data settings: */
     {
-        /* Get 'fullscreen' attributes: */
-        QString strFullscreenSettings = machine.GetExtraData(VBoxDefs::GUI_Fullscreen);
-        if (strFullscreenSettings == "yes")
-            initialStateType = UIVisualStateType_Fullscreen;
+        /* Machine while saving own settings will save "yes" only for current
+         * visual representation mode if its differs from normal mode of course.
+         * But user can alter extra data manually in machine xml file and set there
+         * more than one visual representation mode flags. Shame on such user!
+         * There is no reason to enter in more than one visual representation mode
+         * at machine start, so we are chosing first of requested modes: */
+        bool fIsSomeExtendedModeChosen = false;
+
+        if (!fIsSomeExtendedModeChosen)
+        {
+            /* Test 'seamless' flag: */
+            QString strSeamlessSettings = machine.GetExtraData(VBoxDefs::GUI_Seamless);
+            if (strSeamlessSettings == "yes")
+            {
+                fIsSomeExtendedModeChosen = true;
+                /* We can't enter seamless mode initially,
+                 * so we should ask ui-session for that: */
+                uisession()->setSeamlessModeRequested(true);
+            }
+        }
+
+        if (!fIsSomeExtendedModeChosen)
+        {
+            /* Test 'fullscreen' flag: */
+            QString strFullscreenSettings = machine.GetExtraData(VBoxDefs::GUI_Fullscreen);
+            if (strFullscreenSettings == "yes")
+            {
+                fIsSomeExtendedModeChosen = true;
+                /* We can enter fullscreen mode initially: */
+                initialStateType = UIVisualStateType_Fullscreen;
+            }
+        }
     }
 }
@@ -404 +432 @@
     /* Save extra-data settings: */
     {
-        /* Set 'fullscreen' attributes: */
+        /* Set 'seamless' flag: */
+        machine.SetExtraData(VBoxDefs::GUI_Seamless, m_pVisualState &&
+                             m_pVisualState->visualStateType() == UIVisualStateType_Seamless ? "yes" : QString());
+
+        /* Set 'fullscreen' flag: */
         machine.SetExtraData(VBoxDefs::GUI_Fullscreen, m_pVisualState &&
                              m_pVisualState->visualStateType() == UIVisualStateType_Fullscreen ? "yes" : QString());

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

@@ -424 +424 @@
     , m_pRunningOrPausedActions(0)
     , m_fIsWindowsCreated(false)
+    , m_fIsMachineStarted(false)
     , m_fIsPreventAutoStart(false)
     , m_fIsPreventAutoClose(false)
@@ -476 +477 @@
 {
     /* If we are started already => just return: */
-    if (uisession()->isRunning() || uisession()->isPaused())
+    if (m_fIsMachineStarted || uisession()->isRunning() || uisession()->isPaused())
         return;
 
@@ -556 +557 @@
     vboxGlobal().showUpdateDialog(false /* force request? */);
 #endif
+
+    /* Remember what machine was started already: */
+    m_fIsMachineStarted = true;
 
     /* Warn listeners about machine was started: */
@@ -582 +586 @@
 }
 #endif /* Q_WS_MAC */
+
+void UIMachineLogic::prepareConnections()
+{
+    /* Connect common handlers: */
+    connect(this, SIGNAL(sigMachineStarted()), this, SLOT(sltCheckRequestedModes()));
+}
 
 void UIMachineLogic::prepareConsoleConnections()
@@ -951 +961 @@
     actionsPool()->action(UIActionIndex_Toggle_Seamless)->setEnabled(fIsSupportsSeamless);
 
+    /* Check if we should enter some extended mode: */
+    sltCheckRequestedModes();
+
     /* Check the GA version only in case of additions are active: */
     if (!fIsAdditionsActive)
@@ -1005 +1018 @@
 {
     vboxProblem().showRuntimeError(session().GetConsole(), fIsFatal, strErrorId, strMessage);
+}
+
+void UIMachineLogic::sltCheckRequestedModes()
+{
+    /* Do not try to enter extended mode if machine was not started yet: */
+    if (!m_fIsMachineStarted)
+        return;
+
+    /* If seamless mode is requested, supported and we are NOT currently in seamless mode: */
+    if (uisession()->isSeamlessModeRequested() &&
+        uisession()->isGuestSupportsSeamless() &&
+        visualStateType() != UIVisualStateType_Seamless)
+    {
+        uisession()->setSeamlessModeRequested(false);
+        QAction *pSeamlessModeAction = actionsPool()->action(UIActionIndex_Toggle_Seamless);
+        AssertMsg(!pSeamlessModeAction->isChecked(), ("Seamless action should not be triggered before us!\n"));
+        QTimer::singleShot(0, pSeamlessModeAction, SLOT(trigger()));
+    }
+    /* If seamless mode is NOT requested, NOT supported and we are currently in seamless mode: */
+    else if (!uisession()->isSeamlessModeRequested() &&
+             !uisession()->isGuestSupportsSeamless() &&
+             visualStateType() == UIVisualStateType_Seamless)
+    {
+        uisession()->setSeamlessModeRequested(true);
+        QAction *pSeamlessModeAction = actionsPool()->action(UIActionIndex_Toggle_Seamless);
+        AssertMsg(pSeamlessModeAction->isChecked(), ("Seamless action should not be triggered before us!\n"));
+        QTimer::singleShot(0, pSeamlessModeAction, SLOT(trigger()));
+    }
 }
 

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

@@ -114 +114 @@
 
     /* Prepare helpers: */
+    virtual void prepareConnections();
     virtual void prepareConsoleConnections();
     virtual void prepareActionGroups();
@@ -132 +133 @@
     //virtual void cleanupActionGroups() {}
     //virtual void cleanupConsoleConnections() {}
+    //virtual void cleanupConnections() {}
 
 protected slots:
@@ -141 +143 @@
     virtual void sltUSBDeviceStateChange(const CUSBDevice &device, bool fIsAttached, const CVirtualBoxErrorInfo &error);
     virtual void sltRuntimeError(bool fIsFatal, const QString &strErrorId, const QString &strMessage);
+
+    /* Mode request watch dog: */
+    void sltCheckRequestedModes();
 
 private slots:
@@ -200 +205 @@
 
     bool m_fIsWindowsCreated : 1;
+    bool m_fIsMachineStarted : 1;
     bool m_fIsPreventAutoStart : 1;
     bool m_fIsPreventAutoClose : 1;

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

@@ -538 +538 @@
     , m_fIsIgnoreRutimeMediumsChanging(false)
     , m_fIsGuestResizeIgnored(false)
+    , m_fIsSeamlessModeRequested(false)
     /* Guest additions flags: */
     , m_fIsGuestAdditionsActive(false)

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

@@ -97 +97 @@
     bool isIgnoreRuntimeMediumsChanging() const { return m_fIsIgnoreRutimeMediumsChanging; }
     bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
+    bool isSeamlessModeRequested() const { return m_fIsSeamlessModeRequested; }
 
     /* Guest additions state getters: */
@@ -124 +125 @@
     bool setPause(bool fOn);
     void setGuestResizeIgnored(bool fIsGuestResizeIgnored) { m_fIsGuestResizeIgnored = fIsGuestResizeIgnored; }
+    void setSeamlessModeRequested(bool fIsSeamlessModeRequested) { m_fIsSeamlessModeRequested = fIsSeamlessModeRequested; }
 
     /* Keyboard setters: */
@@ -201 +203 @@
     bool m_fIsIgnoreRutimeMediumsChanging : 1;
     bool m_fIsGuestResizeIgnored : 1;
+    bool m_fIsSeamlessModeRequested : 1;
 
     /* Guest additions flags: */

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

@@ -132 +132 @@
     if (!isPreventAutoStart())
     {
+        /* Prepare common connections: */
+        prepareConnections();
+
         /* Prepare console connections: */
         prepareConsoleConnections();

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

@@ -57 +57 @@
     if (!isPreventAutoStart())
     {
+        /* Prepare common connections: */
+        prepareConnections();
+
         /* Prepare console connections: */
         prepareConsoleConnections();

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

@@ -125 +125 @@
     if (!isPreventAutoStart())
     {
+        /* Prepare common connections: */
+        prepareConnections();
+
         /* Prepare console connections: */
         prepareConsoleConnections();