Changeset 101107 in vbox

Timestamp:

Sep 13, 2023 2:01:58 PM (15 months ago)

Author:

vboxsync

Message:

VBoxDbg: Rewrote the automatic window positioning to make it more flexible and to try keep the console window wide enough for at least 80 columns of text.

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgBase.cpp (modified) (5 diffs)
• VBoxDbgBase.h (modified) (3 diffs)
• VBoxDbgConsole.cpp (modified) (2 diffs)
• VBoxDbgGui.cpp (modified) (4 diffs)
• VBoxDbgGui.h (modified) (3 diffs)

trunk/src/VBox/Debugger/VBoxDbgBase.cpp

@@ -186 +186 @@
 VBoxDbgBaseWindow::VBoxDbgBaseWindow(VBoxDbgGui *a_pDbgGui, QWidget *a_pParent, const char *a_pszTitle)
     : QWidget(a_pParent, Qt::Window), VBoxDbgBase(a_pDbgGui), m_pszTitle(a_pszTitle), m_fPolished(false)
-    , m_x(INT_MAX), m_y(INT_MAX), m_cx(0), m_cy(0)
+    , m_x(INT_MAX), m_y(INT_MAX), m_cx(0), m_cy(0), m_cxMinHint(0), m_enmAttraction(VBoxDbgBaseWindow::kAttractionVmNone)
 {
     /* Set the title, using the parent one as prefix when possible: */
@@ -237 +237 @@
             m_cy = a_cy;
 
-            QSize BorderSize = frameSize() - size();
-            if (BorderSize == QSize(0,0))
-                BorderSize = vGuessBorderSizes();
-
+            QSize const BorderSize = vGetBorderSize();
             resize(a_cx - BorderSize.width(), a_cy - BorderSize.height());
         }
@@ -248 +245 @@
         move(a_x, a_y);
     }
+}
+
+
+QSize
+VBoxDbgBaseWindow::vGetBorderSize()
+{
+    QSize BorderSize = frameSize() - size();
+
+#ifdef Q_WS_X11 /* (from the qt gui) */
+    /*
+     * On X11, there is no way to determine frame geometry (including WM
+     * decorations) before the widget is shown for the first time.  Stupidly
+     * enumerate other top level widgets to find the thickest frame.
+     */
+    if (BorderSize == QSize(0, 0))
+    {
+        if (!m_cxBorder && !m_cyBorder) /* (only till we're successful) */
+        {
+            int cxExtra = 0;
+            int cyExtra = 0;
+
+            QWidgetList WidgetList = QApplication::topLevelWidgets();
+            for (QListIterator<QWidget *> it(WidgetList); it.hasNext(); )
+            {
+                QWidget *pCurWidget = it.next();
+                if (pCurWidget->isVisible())
+                {
+                    int const cxFrame = pCurWidget->frameGeometry().width()  - pCurWidget->width();
+                    cxExtra = qMax(cxExtra, cxFrame);
+                    int const cyFrame = pCurWidget->frameGeometry().height() - pCurWidget->height();
+                    cyExtra = qMax(cyExtra, cyFrame);
+                    if (cyExtra && cxExtra)
+                        break;
+                }
+            }
+
+            if (cxExtra || cyExtra)
+            {
+                m_cxBorder = cxExtra;
+                m_cyBorder = cyExtra;
+            }
+        }
+        BorderSize.setWidth(m_cxBorder);
+        BorderSize.setHeight(m_cyBorder);
+    }
+#endif /* X11 */
+
+    return BorderSize;
 }
 
@@ -283 +328 @@
         return;
 
-    QSize BorderSize = frameSize() - size();
-    if (BorderSize != QSize(0,0))
+    if (!m_fPolished && VBoxDbgBaseWindow::vGetBorderSize() != QSize(0,0))
         m_fPolished = true;
 
@@ -290 +334 @@
 }
 
-
-QSize
-VBoxDbgBaseWindow::vGuessBorderSizes()
-{
-#ifdef Q_WS_X11 /* (from the qt gui) */
-    /*
-     * On X11, there is no way to determine frame geometry (including WM
-     * decorations) before the widget is shown for the first time.  Stupidly
-     * enumerate other top level widgets to find the thickest frame.
-     */
-    if (!m_cxBorder && !m_cyBorder) /* (only till we're successful) */
-    {
-        int cxExtra = 0;
-        int cyExtra = 0;
-
-        QWidgetList WidgetList = QApplication::topLevelWidgets();
-        for (QListIterator<QWidget *> it(WidgetList); it.hasNext(); )
-        {
-            QWidget *pCurWidget = it.next();
-            if (pCurWidget->isVisible())
-            {
-                int const cxFrame = pCurWidget->frameGeometry().width()  - pCurWidget->width();
-                cxExtra = qMax(cxExtra, cxFrame);
-                int const cyFrame = pCurWidget->frameGeometry().height() - pCurWidget->height();
-                cyExtra = qMax(cyExtra, cyFrame);
-                if (cyExtra && cxExtra)
-                    break;
-            }
-        }
-
-        if (cxExtra || cyExtra)
-        {
-            m_cxBorder = cxExtra;
-            m_cyBorder = cyExtra;
-        }
-    }
-#endif /* X11 */
-    return QSize(m_cxBorder, m_cyBorder);
-}
-

trunk/src/VBox/Debugger/VBoxDbgBase.h

@@ -172 +172 @@
     void vReposition(int a_x, int a_y, unsigned a_cx, unsigned a_cy, bool a_fResize);
 
+    /**
+     * Gets the minimum client area width hint.
+     */
+    unsigned vGetMinWidthHint(void) const RT_NOEXCEPT
+    {
+        return m_cxMinHint;
+    }
+
+protected:
+    /**
+     * Sets the minimum client area width hint (without frame).
+     */
+    void vSetMinWidthHint(unsigned a_cxMin)
+    {
+        m_cxMinHint = a_cxMin;
+    }
+
+
+public:
+    /** VM window magnetic attraction. */
+    typedef enum
+    { kAttractionVmLeft, kAttractionVmRight, kAttractionVmTop, kAttractionVmBottom, kAttractionVmNone } VBoxDbgAttractionType;
+
+    /**
+     * Gets the window attraction.
+     */
+    VBoxDbgAttractionType vGetWindowAttraction(void) const RT_NOEXCEPT
+    {
+        return m_enmAttraction;
+    }
+
+    /**
+     * Sets the window attraction.
+     */
+    void vSetWindowAttraction(VBoxDbgAttractionType a_enmAttraction) RT_NOEXCEPT
+    {
+        m_enmAttraction = a_enmAttraction;
+    }
+
+    /**
+     * Get the border size for the window.
+     *
+     * This may return different values after the window has been shown,
+     * at least on X11.
+     */
+    QSize vGetBorderSize();
+
 protected:
     /**
@@ -193 +240 @@
      */
     void vPolishSizeAndPos();
-
-    /**
-     * Internal worker that guesses the border sizes.
-     */
-    QSize vGuessBorderSizes();
 
 private:
@@ -212 +254 @@
     /** The desired height. */
     unsigned m_cy;
+    /** Minimum client area width hint (for the console window, etc). */
+    unsigned m_cxMinHint;
+    /** The window attraction. */
+    VBoxDbgAttractionType m_enmAttraction;
 
     /** Best effort x border size (for X11). */

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -42 +42 @@
 #include <QContextMenuEvent>
 #include <QMenu>
+#include <QScrollBar>
 
 #include <VBox/dbg.h>
@@ -508 +509 @@
     m_pOutput = new VBoxDbgConsoleOutput(this, a_pVirtualBox);
 
-    /* try figure a suitable size */
-    QLabel *pLabel = new QLabel(      "11111111111111111111111111111111111111111111111111111111111111111111111111111112222222222", this);
+    /* try figure a suitable size and tell the parent class. */
+    QLabel *pLabel = new QLabel("8888888888888888888888888888888888888888888888888888888888888888888888888888888", this);
     pLabel->setFont(m_pOutput->font());
     QSize Size = pLabel->sizeHint();
     delete pLabel;
-    Size.setWidth((int)(Size.width() * 1.10));
-    Size.setHeight(Size.width() / 2);
-    resize(Size);
+    QSize SizeScrollBar(0,0);
+    QScrollBar *pScrollBar = m_pOutput->verticalScrollBar();
+    if (pScrollBar)
+        SizeScrollBar = pScrollBar->sizeHint();
+    vSetMinWidthHint(Size.width() + SizeScrollBar.width() + 1);
 
     /*

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -191 +191 @@
                                        2, m_pParent);
         connect(m_pDbgStats, SIGNAL(destroyed(QObject *)), this, SLOT(notifyChildDestroyed(QObject *)));
-        repositionStatistics();
+        repositionWindowInitial(m_pDbgStats, "DbgStats", VBoxDbgBaseWindow::kAttractionVmRight);
     }
 
     m_pDbgStats->vShow();
     return VINF_SUCCESS;
-}
-
-
-void
-VBoxDbgGui::repositionStatistics(bool fResize/* = true*/)
-{
-    /*
-     * Move it to the right side of the VBox console,
-     * and resize it to cover all the space to the left side of the desktop.
-     */
-    if (m_pDbgStats)
-        m_pDbgStats->vReposition(m_x + m_cx, m_y,
-                                 m_cxDesktop - m_cx - m_x + m_xDesktop, m_cyDesktop - m_y + m_yDesktop,
-                                 fResize);
 }
 
@@ -222 +208 @@
         m_pDbgConsole = new VBoxDbgConsole(this, m_pParent, pVirtualBox);
         connect(m_pDbgConsole, SIGNAL(destroyed(QObject *)), this, SLOT(notifyChildDestroyed(QObject *)));
-        repositionConsole();
+        repositionWindowInitial(m_pDbgConsole, "DbgConsole", VBoxDbgBaseWindow::kAttractionVmBottom);
     }
 
     m_pDbgConsole->vShow();
     return VINF_SUCCESS;
-}
-
-
-void
-VBoxDbgGui::repositionConsole(bool fResize/* = true*/)
-{
-    /*
-     * Move it to the bottom of the VBox console,
-     * and resize it to cover the space down to the bottom of the desktop.
-     */
-    if (m_pDbgConsole)
-        m_pDbgConsole->vReposition(m_x, m_y + m_cy,
-                                   RT_MAX(m_cx, 32), m_cyDesktop - m_cy - m_y + m_yDesktop,
-                                   fResize);
 }
 
@@ -265 +237 @@
 
 void
+VBoxDbgGui::repositionWindow(VBoxDbgBaseWindow *a_pWindow, bool a_fResize /*=true*/)
+{
+    if (a_pWindow)
+    {
+        VBoxDbgBaseWindow::VBoxDbgAttractionType const enmAttraction = a_pWindow->vGetWindowAttraction();
+        QSize const     BorderSize = a_pWindow->vGetBorderSize();
+        unsigned const  cxMinHint  = RT_MAX(32, a_pWindow->vGetMinWidthHint()) + BorderSize.width();
+        int             x,  y;
+        unsigned        cx, cy;
+        /** @todo take the x,y screen into account rather than the one of the VM
+         *        window. also generally consider adjacent screens. */
+        switch (enmAttraction)
+        {
+            case VBoxDbgBaseWindow::kAttractionVmRight:
+                x  = m_x + m_cx;
+                y  = m_y;
+                cx = m_cxDesktop - m_cx - m_x + m_xDesktop;
+                if (cx > m_cxDesktop || cx < cxMinHint)
+                    cx = cxMinHint;
+                cy = m_cyDesktop - m_y + m_yDesktop;
+                break;
+
+            case VBoxDbgBaseWindow::kAttractionVmBottom:
+                x  = m_x;
+                y  = m_y + m_cy;
+                cx = m_cx;
+                if (cx < cxMinHint)
+                {
+                    if (cxMinHint - cx <= unsigned(m_x - m_xDesktop)) /* move it to the left if we have sufficient room. */
+                        x -= cxMinHint - cx;
+                    else
+                        x = m_xDesktop;
+                    cx = cxMinHint;
+                }
+                cy = m_cyDesktop - m_cy - m_y + m_yDesktop;
+                break;
+
+            /** @todo implement the other placements when they become selectable. */
+
+            default:
+                return;
+        }
+
+        a_pWindow->vReposition(x, y, cx, cy, a_fResize);
+    }
+}
+
+
+void
+VBoxDbgGui::repositionWindowInitial(VBoxDbgBaseWindow *a_pWindow, const char *a_pszSettings,
+                                    VBoxDbgBaseWindow::VBoxDbgAttractionType a_enmDefaultAttraction)
+{
+    a_pWindow->vSetWindowAttraction(a_enmDefaultAttraction);
+
+    /** @todo save/restore the attachment type. */
+    RT_NOREF(a_pszSettings);
+
+    repositionWindow(a_pWindow, true /*fResize*/);
+}
+
+
+void
 VBoxDbgGui::adjustRelativePos(int x, int y, unsigned cx, unsigned cy)
 {
     /* Disregard a width less than 640 since it will mess up the console,
-       but only if previous width was already initialized.. */
+       but only if previous width was already initialized. */
     if (cx < 640 && m_cx > 0)
         cx = m_cx;
@@ -282 +316 @@
     if (fMoved)
         updateDesktopSize();
-    repositionConsole(fResize);
-    repositionStatistics(fResize);
+    repositionWindow(m_pDbgConsole, fResize);
+    repositionWindow(m_pDbgStats, fResize);
 }
 

trunk/src/VBox/Debugger/VBoxDbgGui.h

@@ -109 +109 @@
 
     /**
-     * Repositions and resizes (optionally) the statistics to its defaults
-     *
-     * @param   fResize     If set (default) the size of window is also changed.
-     */
-    void repositionStatistics(bool fResize = true);
-
-    /**
      * Show the console window (aka. command line), creating it if necessary.
      *
@@ -121 +114 @@
      */
     int showConsole();
-
-    /**
-     * Repositions and resizes (optionally) the console to its defaults
-     *
-     * @param   fResize     If set (default) the size of window is also changed.
-     */
-    void repositionConsole(bool fResize = true);
 
     /**
@@ -134 +120 @@
      */
     void updateDesktopSize();
+
+    /**
+     * Repositions and maybe resizes a window according to the VM window.
+     *
+     * @param   a_pWindow   The window.  Ignored if NULL.
+     * @param   a_fResize   If set (default) the size of window is also changed.
+     */
+    void repositionWindow(VBoxDbgBaseWindow *a_pWindow, bool a_fResize = true);
+
+    /**
+     * Does the initial repositioning and sizing of a window.
+     *
+     * This may get preferences from extra data.
+     *
+     * @param   a_pWindow               The window.
+     * @param   a_pszSettings           The 'section' name in the settings.
+     * @param   a_enmDefaultAttraction  The default attraction of the window.
+     */
+    void repositionWindowInitial(VBoxDbgBaseWindow *a_pWindow, const char *a_pszSettings,
+                                 VBoxDbgBaseWindow::VBoxDbgAttractionType a_enmDefaultAttraction);
 
     /**