Changeset 24301 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Nov 3, 2009 10:07:55 PM (16 years ago)

Author:

vboxsync

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

54298

Message:

Main,Frontends: Added two new running states: Teleporting and LiveSnapshotting. Also added TeleportingPausedVM. Renamed TeleportingFrom to TeleportingIn.

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -463 +463 @@
 
         if (     machineState == MachineState_Aborted
+            ||   machineState == MachineState_Teleported
             ||  (machineState == MachineState_Saved      && !m_fIgnorePowerOffEvents)
-            ||  (machineState == MachineState_PoweredOff && !m_fIgnorePowerOffEvents))
+            ||  (machineState == MachineState_PoweredOff && !m_fIgnorePowerOffEvents)
+           )
         {
             /*
@@ -472 +474 @@
             event.user.type = SDL_USER_EVENT_TERMINATE;
             event.user.code = machineState == MachineState_Aborted
-                                           ? VBOXSDL_TERM_ABEND
-                                           : VBOXSDL_TERM_NORMAL;
+                            ? VBOXSDL_TERM_ABEND
+                            : VBOXSDL_TERM_NORMAL;
         }
         else
@@ -605 +607 @@
             case MachineState_PoweredOff:           return "PoweredOff";
             case MachineState_Saved:                return "Saved";
+            case MachineState_Teleported:           return "Teleported";
             case MachineState_Aborted:              return "Aborted";
             case MachineState_Running:              return "Running";
+            case MachineState_Teleporting:          return "Teleporting";
+            case MachineState_LiveSnapshotting:     return "LiveSnapshotting";
             case MachineState_Paused:               return "Paused";
             case MachineState_Stuck:                return "GuruMeditation";
@@ -613 +618 @@
             case MachineState_Saving:               return "Saving";
             case MachineState_Restoring:            return "Restoring";
-            case MachineState_TeleportingFrom:      return "TeleportingFrom";
+            case MachineState_TeleportingPausedVM:  return "TeleportingPausedVM";
+            case MachineState_TeleportingIn:        return "TeleportingIn";
             case MachineState_RestoringSnapshot:    return "RestoringSnapshot";
             case MachineState_DeletingSnapshot:     return "DeletingSnapshot";
@@ -2143 +2149 @@
             &&  (   machineState == MachineState_Starting
                  || machineState == MachineState_Restoring
-                 || machineState == MachineState_TeleportingFrom)
+                 || machineState == MachineState_TeleportingIn
+                )
             )
         {
@@ -2239 +2246 @@
              && (   machineState == MachineState_Starting
                  || machineState == MachineState_Restoring
-                 || machineState == MachineState_TeleportingFrom)
+                 || machineState == MachineState_TeleportingIn
+                )
             );
 
@@ -2774 +2782 @@
      */
     if (   gConsole
-        && machineState == MachineState_Running)
+        && (   machineState == MachineState_Running
+            || machineState == MachineState_Teleporting
+            || machineState == MachineState_LiveSnapshotting
+            /** @todo power off paused VMs too? */
+           )
+       )
     {
         cbConsoleImpl->ignorePowerOffEvents(true);
@@ -4338 +4351 @@
                                 " - Restoring...");
             }
-            else if (machineState == MachineState_TeleportingFrom)
+            else if (machineState == MachineState_TeleportingIn)
             {
                 ULONG cPercentNow;
@@ -4770 +4783 @@
             MachineState_T machineState;
             gMachine->COMGETTER(State)(&machineState);
-            if (machineState == MachineState_Running)
+            bool fPauseIt = machineState == MachineState_Running
+                         || machineState == MachineState_Teleporting
+                         || machineState == MachineState_LiveSnapshotting;
+            if (fPauseIt)
                 gConsole->Pause();
             SetFullscreen(!gpFramebuffer[0]->getFullscreen());
-            if (machineState == MachineState_Running)
+            if (fPauseIt)
                 gConsole->Resume();
 
@@ -4794 +4810 @@
             MachineState_T machineState;
             gMachine->COMGETTER(State)(&machineState);
-            if (machineState == MachineState_Running)
+            if (   machineState == MachineState_Running
+                || machineState == MachineState_Teleporting
+                || machineState == MachineState_LiveSnapshotting
+               )
             {
                 if (gfGrabbed)