Changeset 27296 in vbox

Timestamp:

Mar 11, 2010 5:09:17 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: storing guest-size-hints in machine extra-data instead of temporary placement in uisession.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxDefs.cpp (modified) (1 diff)
• globals/VBoxDefs.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UIMachineView.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (3 diffs)
• runtime/UISession.h (modified) (3 diffs)
• runtime/fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• runtime/normal/UIMachineViewNormal.cpp (modified) (1 diff)
• runtime/seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp

@@ -28 +28 @@
 const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPostion";
 const char* VBoxDefs::GUI_LastWindowPosition_Max = "max";
+const char* VBoxDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
 const char* VBoxDefs::GUI_Fullscreen = "GUI/Fullscreen";
 const char* VBoxDefs::GUI_Seamless = "GUI/Seamless";

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h

@@ -146 +146 @@
     static const char* GUI_LastWindowPosition;
     static const char* GUI_LastWindowPosition_Max;
+    static const char* GUI_LastGuestSizeHint;
     static const char* GUI_Fullscreen;
     static const char* GUI_Seamless;

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

@@ -310 +310 @@
 }
 
+QSize UIMachineView::guestSizeHint()
+{
+    /* Result: */
+    QSize sizeHint;
+
+    /* Get current machine: */
+    CMachine machine = session().GetMachine();
+
+    /* Load machine view hint: */
+    QString strKey = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastGuestSizeHint) :
+                     QString("%1%2").arg(VBoxDefs::GUI_LastGuestSizeHint).arg(m_uScreenId);
+    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::setDesktopGeometry(DesktopGeo geometry, int aWidth, int aHeight)
 {
@@ -340 +375 @@
 {
     m_storedConsoleSize = QSize(iWidth, iHeight);
+}
+
+void UIMachineView::storeGuestSizeHint(const QSize &sizeHint)
+{
+    /* Get current machine: */
+    CMachine machine = session().GetMachine();
+
+    /* Save machine view hint: */
+    QString strKey = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastGuestSizeHint) :
+                     QString("%1%2").arg(VBoxDefs::GUI_LastGuestSizeHint).arg(m_uScreenId);
+    QString strValue = QString("%1,%2").arg(sizeHint.width()).arg(sizeHint.height());
+    machine.SetExtraData(strKey, strValue);
 }
 

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

@@ -114 +114 @@
     DesktopGeo desktopGeometryType() const { return m_desktopGeometryType; }
     QSize desktopGeometry() const;
+    QSize guestSizeHint();
 
     /* Protected setters: */
@@ -119 +120 @@
     void storeConsoleSize(int iWidth, int iHeight);
     void setMachineWindowResizeIgnored(bool fIgnore = true) { m_bIsMachineWindowResizeIgnored = fIgnore; }
+    void storeGuestSizeHint(const QSize &sizeHint);
 
     /* Protected helpers: */

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

@@ -614 +614 @@
 }
 
-QSize UISession::guestSizeHint(ulong uScreenId) const
-{
-    return (int)uScreenId < m_guestSizeHints.size() ? m_guestSizeHints[uScreenId] : QSize();
-}
-
 bool UISession::setPause(bool fOn)
 {
@@ -641 +636 @@
 
     return ok;
-}
-
-void UISession::setGuestSizeHint(ulong uScreenId, QSize size)
-{
-    if ((int)uScreenId < m_guestSizeHints.size())
-        m_guestSizeHints[uScreenId] = size;
 }
 
@@ -948 +937 @@
         pGuestAutoresizeSwitch->setChecked(strSettings != "off");
         pGuestAutoresizeSwitch->blockSignals(false);
-    }
-
-    /* Some initialization: */
-    {
-        /* Initial guest size hints: */
-        m_guestSizeHints.clear();
-        for (ulong i = 0; i < machine.GetMonitorCount(); ++ i)
-            m_guestSizeHints << QSize(640, 480);
     }
 }

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

@@ -83 +83 @@
     QMenuBar* newMenuBar();
     QCursor cursor() const { return m_cursor; }
-    QSize guestSizeHint(ulong uScreenId) const;
 
     bool isSaved() const { return machineState() == KMachineState_Saved; }
@@ -125 +124 @@
     bool setPause(bool fOn);
     void setGuestResizeIgnored(bool fIsGuestResizeIgnored) { m_fIsGuestResizeIgnored = fIsGuestResizeIgnored; }
-    void setGuestSizeHint(ulong uScreenId, QSize size);
 
     /* Keyboard setters: */
@@ -198 +196 @@
     HCURSOR m_alphaCursor;
 #endif
-    QList<QSize> m_guestSizeHints;
 
     /* Common flags: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -249 +249 @@
             machineWindowWrapper()->machineWindow()->hide();
             UIMachineViewBlocker blocker(this);
-            sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
+            sltPerformGuestResize(guestSizeHint());
             blocker.exec();
         }

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

@@ -253 +253 @@
 {
     /* Store guest size hint: */
-    uisession()->setGuestSizeHint(screenId(), QSize(frameBuffer()->width(), frameBuffer()->height()));
+    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -268 +268 @@
         machineWindowWrapper()->machineWindow()->hide();
         UIMachineViewBlocker blocker(this);
-        sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
+        sltPerformGuestResize(guestSizeHint());
         blocker.exec();
     }