Changeset 12424 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

Sep 12, 2008 2:45:16 PM (17 years ago)

Author:

vboxsync

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

36493

Message:

DBGGui,VirtualBox4: dynamically load the debugger GUI (VBoxDBG).

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxConsoleWnd.h (modified) (6 diffs)
• VBoxGlobal.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

@@ -36 +36 @@
 #include <QDialog>
 
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
+#ifdef VBOX_WITH_DEBUGGER_GUI
 # include <VBox/dbggui.h>
 #endif
@@ -104 +104 @@
     void retranslateUi();
 
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
+#ifdef VBOX_WITH_DEBUGGER_GUI
     bool dbgCreated();
     void dbgDestroy();
@@ -193 +193 @@
     void dbgShowStatistics();
     void dbgShowCommandLine();
+    void dbgLoggingToggled(bool aBool);
 
     void onExitFullscreen();
@@ -234 +235 @@
     QAction *devicesInstallGuestToolsAction;
 
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
+#ifdef VBOX_WITH_DEBUGGER_GUI
     // Debugger actions
     QAction *dbgStatisticsAction;
     QAction *dbgCommandLineAction;
+    QAction *dbgLoggingAction;
 #endif
 
@@ -264 +266 @@
     VBoxUSBMenu *mDevicesUSBMenu;
     /* VBoxSwitchMenu *mDevicesVRDPMenu; */
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
+#ifdef VBOX_WITH_DEBUGGER_GUI
     // Debugger popup menu
     QMenu *mDbgMenu;
@@ -324 +326 @@
     bool mIsAutoSaveMedia : 1;
 
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
-    // Debugger GUI
-    PDBGGUI dbg_gui;
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    /** The handle to the debugger gui. */
+    PDBGGUI mDbgGui;
+    /** The virtual method table for the debugger GUI. */
+    PCDBGGUIVT mDbgGuiVT;
 #endif
 

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

@@ -237 +237 @@
     const char *vmRenderModeStr() const { return vm_render_mode_str; }
 
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
-    bool isDebuggerEnabled() const { return dbg_enabled; }
-    bool isDebuggerVisibleAtStartup() const { return dbg_visible_at_startup; }
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    bool isDebuggerEnabled() const { return mDbgEnabled; }
+    bool isDebuggerAutoShowEnabled() const { return mDbgAutoShow; }
+    RTLDRMOD getDebuggerModule() const { return mhVBoxDbg; }
 #endif
 
@@ -716 +717 @@
     const char * vm_render_mode_str;
 
-#if defined(VBOX_WITH_DEBUGGER_GUI) && 0
-    bool dbg_enabled;
-    bool dbg_visible_at_startup;
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    /** Whether the debugger should be accessible or not.
+     * Use --dbg, the env.var. VBOX_GUI_DBG_ENABLED, --debug or the env.var.
+     * VBOX_GUI_DBG_AUTO_SHOW to enable. */
+    bool mDbgEnabled;
+    /** Whether to show the debugger automatically with the console.
+     * Use --debug or the env.var. VBOX_GUI_DBG_AUTO_SHOW to enable. */
+    bool mDbgAutoShow;
+    /** VBoxDbg module handle. */
+    RTLDRMOD mhVBoxDbg;
 #endif