Changeset 19191 in vbox

Timestamp:

Apr 26, 2009 5:31:59 PM (16 years ago)

Author:

vboxsync

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

46517

Message:

Fe/Qt: Make it possible open the debugger window(s) and start the vm automatically. Hacked around resize issue when opening the debugger automatically or starting the vm paused (really ugly).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (5 diffs)
• src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -296 +296 @@
     bool isDebuggerAutoShowStatisticsEnabled() const { return mDbgAutoShowStatistics; }
     RTLDRMOD getDebuggerModule() const { return mhVBoxDbg; }
+
+    bool isStartPausedEnabled() const { return mStartPaused; }
 #else
     bool isDebuggerAutoShowEnabled() const { return false; }
     bool isDebuggerAutoShowCommandLineEnabled() const { return false; }
     bool isDebuggerAutoShowStatisticsEnabled() const { return false; }
+
+    bool isStartPausedEnabled() const { false; }
 #endif
 
@@ -875 +879 @@
     /** VBoxDbg module handle. */
     RTLDRMOD mhVBoxDbg;
+
+    /** Whether to start the VM in paused state or not. */
+    bool mStartPaused;
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -977 +977 @@
 QSize VBoxConsoleView::sizeHint() const
 {
+#ifdef VBOX_WITH_DEBUGGER /** @todo figure out a more proper fix. */
+    /* HACK ALERT! Really ugly workaround for the resizing to 9x1 done
+     *             by DevVGA if provoked before power on.  */
+    QSize fb(mFrameBuf->width(), mFrameBuf->height());
+    if (    (   fb.width()  < 16
+             || fb.height() < 16)
+        &&  (   vboxGlobal().isStartPausedEnabled()
+             || vboxGlobal().isDebuggerAutoShowEnabled()) )
+        fb = QSize(640, 480);
+    return QSize (fb.width() + frameWidth() * 2,
+                  fb.height() + frameWidth() * 2);
+#else
     return QSize (mFrameBuf->width() + frameWidth() * 2,
                   mFrameBuf->height() + frameWidth() * 2);
+#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -999 +999 @@
 
     /* start the VM */
-    CProgress progress = vboxGlobal().isDebuggerAutoShowEnabled()
+    CProgress progress =    vboxGlobal().isStartPausedEnabled()
+                         || vboxGlobal().isDebuggerAutoShowEnabled()
                        ? cconsole.PowerUpPaused()
                        : cconsole.PowerUp();
@@ -1079 +1080 @@
         if (vboxGlobal().isDebuggerAutoShowCommandLineEnabled())
             dbgShowCommandLine();
+
+        if (!vboxGlobal().isStartPausedEnabled())
+            console->pause (false);
     }
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -5349 +5349 @@
     mDbgAutoShow = mDbgAutoShowCommandLine = mDbgAutoShowStatistics
         = RTEnvExist("VBOX_GUI_DBG_AUTO_SHOW");
+    mStartPaused = false;
 #endif
 
@@ -5406 +5407 @@
             mDbgEnabled = true;
             mDbgAutoShow = mDbgAutoShowCommandLine = mDbgAutoShowStatistics = true;
+            mStartPaused = true;
         }
         else if (!::strcmp (arg, "--debug-command-line"))
@@ -5411 +5413 @@
             mDbgEnabled = true;
             mDbgAutoShow = mDbgAutoShowCommandLine = true;
+            mStartPaused = true;
         }
         else if (!::strcmp (arg, "--debug-statistics"))
@@ -5416 +5419 @@
             mDbgEnabled = true;
             mDbgAutoShow = mDbgAutoShowStatistics = true;
+            mStartPaused = true;
         }
         else if (!::strcmp (arg, "-no-debug") || !::strcmp (arg, "--no-debug"))
@@ -5423 +5427 @@
             mDbgAutoShowCommandLine = false;
             mDbgAutoShowStatistics = false;
+        }
+        /* Not quite debug options, but they're only useful with the debugger bits. */
+        else if (!::strcmp (arg, "--start-paused"))
+        {
+            mStartPaused = true;
+        }
+        else if (!::strcmp (arg, "--start-running"))
+        {
+            mStartPaused = false;
         }
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -241 +241 @@
             "  --debug-statistics         like --dbg and show statistics window at VM startup\n"
             "  --no-debug                 disable the GUI debug menu and debug windows\n"
+            "  --start-paused             start the VM in the paused state\n"
+            "  --start-running            start the VM running (for overriding --debug*)\n"
             "\n"
             "The following environment variables are evaluated:\n"