Changeset 27124 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 5, 2010 6:30:32 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: restoring guest size hint on exiting fullscreen/seamless modes.

Location:

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

Files:

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

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

@@ -26 +26 @@
 /* Global includes */
 #include <QAbstractScrollArea>
+#include <QEventLoop>
 
 /* Local includes */
@@ -281 +282 @@
 };
 
+/* This maintenance class is a part of future roll-back mechanism.
+ * It allows to block main GUI thread until specific event received.
+ * Later it will become more abstract but now its just used to help
+ * fullscreen & seamless modes to restore normal guest size hint. */
+class UIMachineViewBlocker : public QEventLoop
+{
+    Q_OBJECT;
+
+public:
+
+    UIMachineViewBlocker(QObject *pWatchedObject)
+        : QEventLoop(0)
+        , m_iTimerId(0)
+    {
+        /* Install object event watcher: */
+        pWatchedObject->installEventFilter(this);
+
+        /* Also start timer to unlock pool in case of
+         * required condition doesn't happens by some reason: */
+        m_iTimerId = startTimer(3000);
+    }
+
+    virtual ~UIMachineViewBlocker()
+    {
+        /* Kill the timer: */
+        killTimer(m_iTimerId);
+    }
+
+protected:
+
+    bool eventFilter(QObject *pWatched, QEvent *pEvent)
+    {
+        switch (pEvent->type())
+        {
+            case VBoxDefs::ResizeEventType:
+            {
+                /* Its a specific part related to fullscreen/seamless modes.
+                 * Here we are waiting for guest resize event to be sure what
+                 * non-normal modes successfully restored previous guest size hint.
+                 * And we just unlocking the 'this' blocker afterwards: */
+                exit();
+                return false;
+            }
+            default:
+                break;
+        }
+        return QEventLoop::eventFilter(pWatched, pEvent);
+    }
+
+    void timerEvent(QTimerEvent *pEvent)
+    {
+        /* If that timer event occurs => it seems
+         * guest resize event doesn't comes in time,
+         * shame on it, but we just unlocking 'this': */
+        QEventLoop::timerEvent(pEvent);
+        exit();
+    }
+
+    int m_iTimerId;
+};
+
 #endif // !___UIMachineViewNormal_h___
 

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

@@ -633 +633 @@
 }
 
+QSize UISession::guestSizeHint(ulong uScreenId) const
+{
+    return (int)uScreenId < m_guestSizeHints.size() ? m_guestSizeHints[uScreenId] : QSize();
+}
+
 bool UISession::setPause(bool fOn)
 {
@@ -655 +660 @@
 
     return ok;
+}
+
+void UISession::setGuestSizeHint(ulong uScreenId, QSize size)
+{
+    if ((int)uScreenId < m_guestSizeHints.size())
+        m_guestSizeHints[uScreenId] = size;
 }
 
@@ -923 +934 @@
     }
 
-
     /* Load extra-data settings: */
     {
@@ -945 +955 @@
         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

@@ -80 +80 @@
     UIActionsPool* actionsPool() const;
     QMenuBar* newMenuBar();
+    QSize guestSizeHint(ulong uScreenId) const;
 
     bool isSaved() const { return machineState() == KMachineState_Saved; }
@@ -122 +123 @@
     bool setPause(bool fOn);
     void setGuestResizeIgnored(bool fIsGuestResizeIgnored) { m_fIsGuestResizeIgnored = fIsGuestResizeIgnored; }
+    void setGuestSizeHint(ulong uScreenId, QSize size);
 
     /* Keyboard setters: */
@@ -191 +193 @@
     HCURSOR m_alphaCursor;
 #endif
+    QList<QSize> m_guestSizeHints;
 
     /* Common flags: */

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

@@ -80 +80 @@
 UIMachineViewFullscreen::~UIMachineViewFullscreen()
 {
+    /* Cleanup fullscreen: */
+    cleanupFullscreen();
+
     /* Cleanup common things: */
     cleanupCommon();
@@ -342 +345 @@
 }
 
+void UIMachineViewFullscreen::cleanupFullscreen()
+{
+    /* Rollback fullscreen frame-buffer size to normal: */
+    machineWindowWrapper()->machineWindow()->hide();
+    UIMachineViewBlocker blocker(this);
+    sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
+    blocker.exec();
+}
+
 void UIMachineViewFullscreen::setGuestAutoresizeEnabled(bool fEnabled)
 {

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

@@ -64 +64 @@
     void prepareConnections();
     void prepareConsoleConnections();
+    //void prepareFullscreen() {}
 
     /* Cleanup routines: */
+    void cleanupFullscreen();
     //void cleanupConsoleConnections() {}
     //void cleanupConnections() {}

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

@@ -80 +80 @@
 UIMachineViewNormal::~UIMachineViewNormal()
 {
+    /* Save machine view settings: */
+    saveMachineViewSettings();
+
     /* Cleanup common things: */
     cleanupCommon();
@@ -341 +344 @@
 }
 
+void UIMachineViewNormal::saveMachineViewSettings()
+{
+    /* Store guest size hint: */
+    uisession()->setGuestSizeHint(screenId(), QSize(frameBuffer()->width(), frameBuffer()->height()));
+}
+
 void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
 {

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

@@ -63 +63 @@
     void prepareConnections();
     void prepareConsoleConnections();
+    //void loadMachineViewSettings();
 
     /* Cleanup helpers: */
+    void saveMachineViewSettings();
     //void cleanupConsoleConnections() {}
     //void prepareConnections() {}

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

@@ -94 +94 @@
 }
 
-void UIMachineViewSeamless::sltPerformGuestResize()
-{
-    /* Get machine window: */
-    QIMainDialog *pMachineWindow = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
-                                qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
-
-    /* Get the available size for the guest display. We assume here that
-     * centralWidget() contains only this machine view and gives it all available space: */
-    QSize newSize(pMachineWindow ? pMachineWindow->centralWidget()->size() : QSize());
-    AssertMsg(newSize.isValid(), ("Size should be valid!\n"));
-
-    /* Do not send the same hints as we already have: */
-    if ((newSize.width() == storedConsoleSize().width()) && (newSize.height() == storedConsoleSize().height()))
-        return;
-
-    /* If we awaiting resize: */
-    if (m_fShouldWeDoResize)
+void UIMachineViewSeamless::sltPerformGuestResize(const QSize &toSize)
+{
+    if (uisession()->isGuestSupportsGraphics())
     {
-        /* Remember the new size: */
-        storeConsoleSize(newSize.width(), newSize.height());
-
-        /* Send new size-hint to the guest: */
-        session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
+        /* Get machine window: */
+        QIMainDialog *pMachineWindow = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
+                                       qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+
+        /* If this slot is invoked directly then use the passed size otherwise get
+         * the available size for the guest display. We assume here that centralWidget()
+         * contains this view only and gives it all available space: */
+        QSize newSize(toSize.isValid() ? toSize : pMachineWindow ? pMachineWindow->centralWidget()->size() : QSize());
+        AssertMsg(newSize.isValid(), ("Size should be valid!\n"));
+
+        /* Do not send the same hints as we already have: */
+        if ((newSize.width() == storedConsoleSize().width()) && (newSize.height() == storedConsoleSize().height()))
+            return;
+
+        /* We only actually send the hint if either an explicit new size was given
+         * (e.g. if the request was triggered directly by a console resize event) or
+         * if no explicit size was specified but a resize is flagged as being needed
+         * (e.g. the autoresize was just enabled and the console was resized while it was disabled). */
+        if (toSize.isValid() || m_fShouldWeDoResize)
+        {
+            /* Remember the new size: */
+            storeConsoleSize(newSize.width(), newSize.height());
+
+            /* Send new size-hint to the guest: */
+            session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
+        }
+
+        /* We had requested resize now, rejecting other accident requests: */
+        m_fShouldWeDoResize = false;
     }
-
-    /* We had requested resize now, rejecting other accident requests: */
-    m_fShouldWeDoResize = false;
 }
 
@@ -355 +362 @@
     /* Reset seamless feature flag of the guest: */
     session().GetConsole().GetDisplay().SetSeamlessMode(false);
+
+    /* Rollback seamless frame-buffer size to normal: */
+    machineWindowWrapper()->machineWindow()->hide();
+    UIMachineViewBlocker blocker(this);
+    sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
+    blocker.exec();
 }
 

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

@@ -45 +45 @@
 
     /* Slot to perform guest resize: */
-    void sltPerformGuestResize();
+    void sltPerformGuestResize(const QSize &aSize = QSize());
 
     /* Console callback handlers: */