Changeset 51558 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 5, 2014 4:08:24 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_LastGuestSizeHint, GUI_LastGuestSizeHintWasFullscreen.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (5 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (3 diffs)
• runtime/UIMachineView.h (modified) (2 diffs)
• runtime/normal/UIMachineViewNormal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -516 +516 @@
     switch (visualStateType)
     {
-        case UIVisualStateType_Normal: strKey = GUI_LastNormalWindowPosition; break;
-        case UIVisualStateType_Scale:  strKey = GUI_LastScaleWindowPosition; break;
+        case UIVisualStateType_Normal: strKey = extraDataKeyPerScreen(GUI_LastNormalWindowPosition, uScreenIndex); break;
+        case UIVisualStateType_Scale:  strKey = extraDataKeyPerScreen(GUI_LastScaleWindowPosition, uScreenIndex); break;
         default: AssertFailedReturn(QRect());
     }
-    /* Append with screen-index: */
-    if (uScreenIndex)
-        strKey += QString::number(uScreenIndex);
 
     /* Load corresponding extra-data: */
@@ -553 +550 @@
     switch (visualStateType)
     {
-        case UIVisualStateType_Normal: strKey = GUI_LastNormalWindowPosition; break;
-        case UIVisualStateType_Scale:  strKey = GUI_LastScaleWindowPosition; break;
+        case UIVisualStateType_Normal: strKey = extraDataKeyPerScreen(GUI_LastNormalWindowPosition, uScreenIndex); break;
+        case UIVisualStateType_Scale:  strKey = extraDataKeyPerScreen(GUI_LastScaleWindowPosition, uScreenIndex); break;
         default: AssertFailedReturn(false);
     }
-    /* Append with screen-index: */
-    if (uScreenIndex)
-        strKey += QString::number(uScreenIndex);
 
     /* Load corresponding extra-data: */
@@ -574 +568 @@
     switch (visualStateType)
     {
-        case UIVisualStateType_Normal: strKey = GUI_LastNormalWindowPosition; break;
-        case UIVisualStateType_Scale:  strKey = GUI_LastScaleWindowPosition; break;
+        case UIVisualStateType_Normal: strKey = extraDataKeyPerScreen(GUI_LastNormalWindowPosition, uScreenIndex); break;
+        case UIVisualStateType_Scale:  strKey = extraDataKeyPerScreen(GUI_LastScaleWindowPosition, uScreenIndex); break;
         default: AssertFailedReturnVoid();
     }
-    /* Append with screen-index: */
-    if (uScreenIndex)
-        strKey += QString::number(uScreenIndex);
 
     /* Serialize passed values: */
@@ -593 +584 @@
     /* Re-cache corresponding extra-data: */
     setExtraDataStringList(strKey, data, strId);
+}
+
+QSize UIExtraDataManager::lastGuestSizeHint(ulong uScreenIndex, const QString &strId) const
+{
+    /* Choose corresponding key: */
+    QString strKey = extraDataKeyPerScreen(GUI_LastGuestSizeHint, uScreenIndex);
+
+    /* Load corresponding extra-data: */
+    const QStringList data = extraDataStringList(strKey, strId);
+
+    /* Parse loaded data: */
+    int iW = 0, iH = 0;
+    bool fOk = data.size() == 2;
+    do
+    {
+        if (!fOk) break;
+        iW = data[0].toInt(&fOk);
+        if (!fOk) break;
+        iH = data[1].toInt(&fOk);
+    }
+    while (0);
+
+    /* Return size (loaded or invalid): */
+    return fOk ? QSize(iW, iH) : QSize();
+}
+
+void UIExtraDataManager::setLastGuestSizeHint(ulong uScreenIndex, const QSize &size, const QString &strId)
+{
+    /* Choose corresponding key: */
+    QString strKey = extraDataKeyPerScreen(GUI_LastGuestSizeHint, uScreenIndex);
+
+    /* Serialize passed values: */
+    QStringList data;
+    data << QString::number(size.width());
+    data << QString::number(size.height());
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(strKey, data, strId);
+}
+
+bool UIExtraDataManager::wasLastGuestSizeHintForFullScreen(ulong uScreenIndex, const QString &strId) const
+{
+    /* Choose corresponding key: */
+    const QString strKey = extraDataKeyPerScreen(GUI_LastGuestSizeHintWasFullscreen, uScreenIndex);
+
+    /* True only if was stated directly: */
+    return isFeatureAllowed(strKey, strId);
+}
+
+void UIExtraDataManager::markLastGuestSizeHintAsFullScreen(ulong uScreenIndex, bool fWas, const QString &strId)
+{
+    /* Choose corresponding key: */
+    const QString strKey = extraDataKeyPerScreen(GUI_LastGuestSizeHintWasFullscreen, uScreenIndex);
+
+    /* State directly only if was true: */
+    return setExtraDataString(strKey, toFeatureAllowed(fWas), strId);
 }
 
@@ -1140 +1187 @@
 }
 
+/* static */
+QString UIExtraDataManager::extraDataKeyPerScreen(const QString &strBase, ulong uScreenIndex)
+{
+    return uScreenIndex ? strBase + QString::number(uScreenIndex) : strBase;
+}
+
 #include "UIExtraDataManager.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -180 +180 @@
     /** Defines geometry for machine-window with @a uScreenIndex in @a visualStateType as @a geometry and @a fMaximized. */
     void setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QString &strId);
+
+    /** Returns last guest-screen size-hint for screen with @a uScreenIndex. */
+    QSize lastGuestSizeHint(ulong uScreenIndex, const QString &strId) const;
+    /** Defines last guest-screen size-hint for screen with @a uScreenIndex as @a size. */
+    void setLastGuestSizeHint(ulong uScreenIndex, const QSize &size, const QString &strId);
+    /** Returns whether guest size hint was for full or seamless screen with @a uScreenIndex. */
+    bool wasLastGuestSizeHintForFullScreen(ulong uScreenIndex, const QString &strId) const;
+    /** Defines whether guest size hint @a fWas for full or seamless screen with @a uScreenIndex. */
+    void markLastGuestSizeHintAsFullScreen(ulong uScreenIndex, bool fWas, const QString &strId);
 
     /** Returns whether this machine started for the first time. */
@@ -301 +310 @@
     void setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID = m_sstrGlobalID);
 
+    /** Return a string consisting of @a strBase with a suffix for the passed screen.
+      * Used for storing per-screen extra-data. */
+    static QString extraDataKeyPerScreen(const QString &strBase, ulong uScreenIndex);
+
     /** Singleton Extra-data Manager instance. */
     static UIExtraDataManager *m_pInstance;

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

@@ -189 +189 @@
                                                          uisession()->isScreenVisible(screenId()),
                                                          false, 0, 0, newSize.width(), newSize.height(), 0);
-    /* And track whether we have had a "normal" resize since the last
-     * fullscreen resize hint was sent: */
-    QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen);
-    machine.SetExtraData(strKey, isFullscreenOrSeamless() ? "true" : "");
+    /* And track whether we have a "normal" or "fullscreen"/"seamless" size-hint sent: */
+    gEDataManager->markLastGuestSizeHintAsFullScreen(m_uScreenId, isFullscreenOrSeamless(), vboxGlobal().managedVMUuid());
 }
 
@@ -648 +646 @@
 QSize UIMachineView::guestSizeHint()
 {
-    /* Result: */
-    QSize sizeHint;
-
-    /* Get current machine: */
-    CMachine machine = session().GetMachine();
-
-    /* Load machine view hint: */
-    QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHint);
-    QString strValue = machine.GetExtraData(strKey);
-
-    bool ok = true;
-    int width = 0, height = 0;
-    if (ok)
-        width = strValue.section(',', 0, 0).toInt(&ok);
-    if (ok)
-        height = strValue.section(',', 1, 1).toInt(&ok);
-
-    if (ok /* If previous parameters were read correctly! */)
-    {
-        /* Compose guest size hint from loaded values: */
-        sizeHint = QSize(width, height);
-    }
-    else
-    {
-        /* Compose guest size hint from default attributes: */
-        sizeHint = QSize(800, 600);
-    }
-
-    /* Return result: */
-    return sizeHint;
-}
-
-void UIMachineView::storeGuestSizeHint(const QSize &sizeHint)
-{
-    /* Get current machine: */
-    CMachine machine = session().GetMachine();
-
-    /* Save machine view hint: */
-    QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHint);
-    QString strValue = QString("%1,%2").arg(sizeHint.width()).arg(sizeHint.height());
-    machine.SetExtraData(strKey, strValue);
+    /* Load guest-screen size-hint: */
+    QSize size = gEDataManager->lastGuestSizeHint(m_uScreenId, vboxGlobal().managedVMUuid());
+
+    /* Return loaded or default: */
+    return size.isValid() ? size : QSize(800, 600);
+}
+
+void UIMachineView::storeGuestSizeHint(const QSize &size)
+{
+    /* Save guest-screen size-hint: */
+    gEDataManager->setLastGuestSizeHint(m_uScreenId, size, vboxGlobal().managedVMUuid());
 }
 
@@ -846 +814 @@
     return    visualStateType() == UIVisualStateType_Fullscreen
            || visualStateType() == UIVisualStateType_Seamless;
-}
-
-QString UIMachineView::makeExtraDataKeyPerMonitor(QString base) const
-{
-    return m_uScreenId == 0 ? QString("%1").arg(base)
-                            : QString("%1%2").arg(base).arg(m_uScreenId);
 }
 

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

@@ -175 +175 @@
     /** Store a guest size hint value to extra data, called on switching to
      * fullscreen. */
-    void storeGuestSizeHint(const QSize &sizeHint);
+    void storeGuestSizeHint(const QSize &size);
 
     /* Protected helpers: */
@@ -200 +200 @@
     /** Is this a fullscreen-type view? */
     bool isFullscreenOrSeamless() const;
-    /** Return a string consisting of @a base with a suffix for the active
-     * virtual monitor.  Used for storing monitor-specific extra data. */
-    QString makeExtraDataKeyPerMonitor(QString base) const;
 
     /* Cross-platforms event processors: */

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

@@ -33 +33 @@
 #include "UIMachineWindow.h"
 #include "UIMachineViewNormal.h"
+#include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
 
@@ -171 +172 @@
     if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
     {
-        /* Get the current machine: */
-        CMachine machine = session().GetMachine();
-
-        /* We send a guest size hint if needed to reverse a transition
-         * to fullscreen or seamless. */
-        QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen);
-        QString strHintSent = machine.GetExtraData(strKey);
-        if (!strHintSent.isEmpty())
+        /* Send guest-screen size-hint if needed to reverse a transition to fullscreen or seamless: */
+        if (gEDataManager->wasLastGuestSizeHintForFullScreen(m_uScreenId, vboxGlobal().managedVMUuid()))
         {
             QSize hint = guestSizeHint();