Changeset 28389 in vbox

Timestamp:

Apr 15, 2010 8:13:32 PM (15 years ago)

Author:

vboxsync

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

60150

Message:

FE/Qt4: new core: fix debugger GUI

Location:

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

Files:

• UIMachineLogic.cpp (modified) (10 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

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

@@ -347 +347 @@
     , m_fIsWindowsCreated(false)
     , m_fIsPreventAutoClose(false)
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    , m_pDbgGui(0)
+    , m_pDbgGuiVT(0)
+#endif /* VBOX_WITH_DEBUGGER_GUI */
 #ifdef Q_WS_MAC
     , m_fIsDockIconEnabled(true)
@@ -358 +362 @@
 UIMachineLogic::~UIMachineLogic()
 {
-#ifdef VBOX_WITH_DEBUGGER_GUI // TODO: Should we close debugger now?
+#ifdef VBOX_WITH_DEBUGGER_GUI
     /* Close debugger: */
-    //dbgDestroy();
-#endif
+    dbgDestroy();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
 }
 
@@ -1459 +1463 @@
 {
     if (dbgCreated())
-        m_dbgGuiVT->pfnShowStatistics(m_dbgGui);
+        m_pDbgGuiVT->pfnShowStatistics(m_pDbgGui);
 }
 
@@ -1465 +1469 @@
 {
     if (dbgCreated())
-        m_dbgGuiVT->pfnShowCommandLine(m_dbgGui);
+        m_pDbgGuiVT->pfnShowCommandLine(m_pDbgGui);
 }
 
@@ -1549 +1553 @@
 bool UIMachineLogic::dbgCreated()
 {
-    if (m_dbgGui)
+    if (m_pDbgGui)
         return true;
 
@@ -1561 +1565 @@
     {
         ISession *pISession = session().raw();
-        rc = pfnGuiCreate(pISession, &m_dbgGui, &m_dbgGuiVT);
+        rc = pfnGuiCreate(pISession, &m_pDbgGui, &m_pDbgGuiVT);
         if (RT_SUCCESS(rc))
         {
-            if (DBGGUIVT_ARE_VERSIONS_COMPATIBLE(m_dbgGuiVT->u32Version, DBGGUIVT_VERSION) ||
-                m_dbgGuiVT->u32EndVersion == m_dbgGuiVT->u32Version)
+            if (DBGGUIVT_ARE_VERSIONS_COMPATIBLE(m_pDbgGuiVT->u32Version, DBGGUIVT_VERSION) ||
+                m_pDbgGuiVT->u32EndVersion == m_pDbgGuiVT->u32Version)
             {
-                m_dbgGuiVT->pfnSetParent(m_dbgGui, (QWidget*)defaultMachineWindow());
-                m_dbgGuiVT->pfnSetMenu(m_dbgGui, (QMenu*)actionsPool()->action(UIActionIndex_Menu_Debug));
+                m_pDbgGuiVT->pfnSetParent(m_pDbgGui, defaultMachineWindow()->machineWindow());
+                m_pDbgGuiVT->pfnSetMenu(m_pDbgGui, actionsPool()->action(UIActionIndex_Menu_Debug));
                 dbgAdjustRelativePos();
                 return true;
@@ -1574 +1578 @@
 
             LogRel(("DBGGuiCreate failed, incompatible versions (loaded %#x/%#x, expected %#x)\n",
-                    m_dbgGuiVT->u32Version, m_dbgGuiVT->u32EndVersion, DBGGUIVT_VERSION));
+                    m_pDbgGuiVT->u32Version, m_pDbgGuiVT->u32EndVersion, DBGGUIVT_VERSION));
         }
         else
@@ -1582 +1586 @@
         LogRel(("RTLdrGetSymbol(,\"DBGGuiCreate\",) -> %Rrc\n", rc));
 
-    m_dbgGui = 0;
-    m_dbgGuiVT = 0;
+    m_pDbgGui = 0;
+    m_pDbgGuiVT = 0;
     return false;
 }
@@ -1589 +1593 @@
 void UIMachineLogic::dbgDestroy()
 {
-    if (m_dbgGui)
-    {
-        m_dbgGuiVT->pfnDestroy(m_dbgGui);
-        m_dbgGui = 0;
-        m_dbgGuiVT = 0;
+    if (m_pDbgGui)
+    {
+        m_pDbgGuiVT->pfnDestroy(m_pDbgGui);
+        m_pDbgGui = 0;
+        m_pDbgGuiVT = 0;
     }
 }
@@ -1599 +1603 @@
 void UIMachineLogic::dbgAdjustRelativePos()
 {
-    if (m_dbgGui)
+    if (m_pDbgGui)
     {
         QRect rct = defaultMachineWindow()->machineWindow()->frameGeometry();
-        m_dbgGuiVT->pfnAdjustRelativePos(m_dbgGui, rct.x(), rct.y(), rct.width(), rct.height());
+        m_pDbgGuiVT->pfnAdjustRelativePos(m_pDbgGui, rct.x(), rct.y(), rct.width(), rct.height());
     }
 }

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

@@ -207 +207 @@
     void dbgDestroy();
     void dbgAdjustRelativePos();
-    /* The handle to the debugger gui: */
-    PDBGGUI m_dbgGui;
+    /* The handle to the debugger GUI: */
+    PDBGGUI m_pDbgGui;
     /* The virtual method table for the debugger GUI: */
-    PCDBGGUIVT m_dbgGuiVT;
+    PCDBGGUIVT m_pDbgGuiVT;
 #endif
 

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

@@ -441 +441 @@
 }
 
+#ifdef VBOX_WITH_DEBUGGER_GUI
+void UIMachineWindow::updateDbgWindows()
+{
+    /* The debugger windows are bind to the main VM window. */
+    if (m_uScreenId == 0)
+        machineLogic()->dbgAdjustRelativePos();
+}
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
 void UIMachineWindow::sltMachineStateChanged()
 {

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

@@ -90 +90 @@
     /* Update routines: */
     virtual void updateAppearanceOf(int iElement);
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    virtual void updateDbgWindows();
+#endif /* VBOX_WITH_DEBUGGER_GUI */
 
     /* Protected slots: */

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

@@ -281 +281 @@
                 m_normalGeometry.setSize(pResizeEvent->size());
 #ifdef VBOX_WITH_DEBUGGER_GUI
-                // TODO: Update debugger window size!
-                //dbgAdjustRelativePos();
+                /* Update debugger window position */
+                updateDbgWindows();
 #endif
             }
@@ -293 +293 @@
                 m_normalGeometry.moveTo(geometry().x(), geometry().y());
 #ifdef VBOX_WITH_DEBUGGER_GUI
-                // TODO: Update debugger window position!
-                //dbgAdjustRelativePos();
+                /* Update debugger window position */
+                updateDbgWindows();
 #endif
             }