Changeset 27052 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2010 6:44:12 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: seamless reworked to use 'maximized' state; some fullscreen functionality merged into seamless.

Location:

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

Files:

• UIMachineViewSeamless.cpp (modified) (13 diffs)
• UIMachineViewSeamless.h (modified) (4 diffs)
• UIMachineWindowSeamless.cpp (modified) (3 diffs)

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

@@ -25 +25 @@
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QTimer>
 #ifdef Q_WS_MAC
 #include <QMenuBar>
@@ -51 +52 @@
 #endif
                     , uMonitor)
+    , m_fIsInitialResizeEventProcessed(false)
+    , m_fShouldWeDoResize(false)
 {
     /* Prepare frame buffer: */
     prepareFrameBuffer();
 
-    /* Prepare backup inforrmation: */
-    prepareBackup();
-
     /* Prepare common things: */
     prepareCommon();
@@ -73 +73 @@
     loadMachineViewSettings();
 
-    /* Prepare seamless mode: */
+    /* Prepare seamless view: */
     prepareSeamless();
 
@@ -95 +95 @@
 }
 
+void UIMachineViewSeamless::sltPerformGuestResize()
+{
+    /* Get machine window: */
+    QIMainDialog *pMainDialog = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
+                                qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+
+    /* Get the available size for the guest display. We assume here that the centralWidget()
+     * contains only this machine view and gives it all available space: */
+    QSize newSize(pMainDialog ? pMainDialog->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)
+    {
+        /* 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;
+}
+
 void UIMachineViewSeamless::sltAdditionsStateChanged()
 {
@@ -100 +129 @@
 }
 
-/* If the desktop geometry is set automatically, this will update it: */
 void UIMachineViewSeamless::sltDesktopResized()
 {
     // TODO: Try to resize framebuffer according new desktop size, exit seamless if resize is failed!
+
+    /* If the desktop geometry is set automatically, this will update it: */
+    calculateDesktopGeometry();
 }
 
@@ -117 +148 @@
                 return true;
 
+            /* We are starting to perform machine view resize: */
+            bool oldIgnoreMainwndResize = isMachineWindowResizeIgnored();
+            setMachineWindowResizeIgnored(true);
+
             /* Get guest resize-event: */
             UIResizeEvent *pResizeEvent = static_cast<UIResizeEvent*>(pEvent);
@@ -125 +160 @@
             /* Reapply maximum size restriction for machine view: */
             setMaximumSize(sizeHint());
+
+            /* Store the new size to prevent unwanted resize hints being sent back: */
+            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
 
             /* Perform machine view resize: */
@@ -143 +181 @@
             //mDockIconPreview->setOriginalSize(pResizeEvent->width(), pResizeEvent->height());
 #endif /* Q_WS_MAC */
-
-            /* Update machine view sliders: */
-            updateSliders();
 
             /* Unfortunately restoreOverrideCursor() is broken in Qt 4.4.0 if WA_PaintOnScreen widgets are present.
@@ -165 +200 @@
             session().GetConsole().GetDisplay().ResizeCompleted(screenId());
 
+            /* We are finishing to perform machine view resize: */
+            setMachineWindowResizeIgnored(oldIgnoreMainwndResize);
+
             /* Make sure that all posted signals are processed: */
             qApp->processEvents();
+
+            /* We also recalculate the desktop geometry if this is determined automatically.
+             * In fact, we only need this on the first resize,
+             * but it is done every time to keep the code simpler. */
+            calculateDesktopGeometry();
 
             /* Emit a signal about guest was resized: */
@@ -210 +253 @@
 bool UIMachineViewSeamless::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
+    QIMainDialog *pMainDialog = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
+        qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+    if (pWatched != 0 && pWatched == pMainDialog)
+    {
+        switch (pEvent->type())
+        {
+            case QEvent::Resize:
+            {
+                /* Ignore initial resize event: */
+                if (!m_fIsInitialResizeEventProcessed)
+                {
+                    m_fIsInitialResizeEventProcessed = true;
+                    break;
+                }
+
+                /* Set the "guest needs to resize" hint.
+                 * This hint is acted upon when (and only when) the autoresize property is "true": */
+                m_fShouldWeDoResize = uisession()->isGuestSupportsGraphics();
+                if (!isMachineWindowResizeIgnored() && uisession()->isGuestSupportsGraphics())
+                    QTimer::singleShot(0, this, SLOT(sltPerformGuestResize()));
+                break;
+            }
+            default:
+                break;
+        }
+    }
 #ifdef Q_WS_MAC // TODO: Is it really needed?
     QMenuBar *pMenuBar = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
@@ -242 +311 @@
 }
 
-void UIMachineViewSeamless::prepareBackup()
-{
+void UIMachineViewSeamless::prepareCommon()
+{
+    /* Base class common settings: */
+    UIMachineView::prepareCommon();
+
     /* Store old machine view size before bramebuffer resized: */
     m_normalSize = QSize(frameBuffer()->width(), frameBuffer()->height());
+
+    /* Minimum size is ignored: */
+    setMinimumSize(0, 0);
+    /* No scrollbars: */
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
@@ -254 +332 @@
 
 #ifdef Q_WS_MAC // TODO: Is it really needed? See UIMachineViewSeamless::eventFilter(...);
-    /* Menu bar filters: */
+    /* Menu bar filter: */
     qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow())->menuBar()->installEventFilter(this);
 #endif
@@ -275 +353 @@
 void UIMachineViewSeamless::prepareSeamless()
 {
+    /* Set seamless feature flag to the guest: */
     session().GetConsole().GetDisplay().SetSeamlessMode(true);
-    session().GetConsole().GetDisplay().SetVideoModeHint(machineWindowWrapper()->machineWindow()->width(),
-                                                         machineWindowWrapper()->machineWindow()->height(), 0, screenId());
 }
 
 void UIMachineViewSeamless::cleanupSeamless()
 {
-    /* Send normal size-hint to the guest: */
+    /* Reset seamless feature flag of the guest: */
     session().GetConsole().GetDisplay().SetSeamlessMode(false);
-    session().GetConsole().GetDisplay().SetVideoModeHint(m_normalSize.width(), m_normalSize.height(), 0, screenId());
 }
 

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

@@ -44 +44 @@
 private slots:
 
+    /* Slot to perform guest resize: */
+    void sltPerformGuestResize();
+
     /* Console callback handlers: */
     void sltAdditionsStateChanged();
@@ -57 +60 @@
 
     /* Prepare helpers: */
-    void prepareBackup();
+    void prepareCommon();
     void prepareFilters();
     void prepareConnections();
@@ -68 +71 @@
     //void prepareConnections() {}
     //void cleanupFilters() {}
-    //void prepareBackup() {}
+    //void cleanupCommon();
 
     /* Private helpers: */
@@ -74 +77 @@
 
     /* Private variables: */
+    bool m_fIsInitialResizeEventProcessed : 1;
+    bool m_fShouldWeDoResize : 1;
     QRegion m_lastVisibleRegion;
     QSize m_normalSize;

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

@@ -78 +78 @@
 
     /* Show window: */
-    show();
+    showMaximized();
 }
 
@@ -157 +157 @@
 void UIMachineWindowSeamless::prepareSeamless()
 {
-    /* Move & resize seamless frameless window: */
-    QRect geometry = QApplication::desktop()->availableGeometry();
 #ifdef Q_WS_WIN
-    m_prevRegion = geometry;
-#endif
-    move(geometry.topLeft());
-    resize(geometry.size());
+    m_prevRegion = QApplication::desktop()->availableGeometry();
+#endif
 
 #ifdef Q_WS_MAC
@@ -172 +168 @@
     ::darwinSetShowsWindowTransparent(this, true);
 #endif
-
-    /* Perform these events: */
-    qApp->processEvents();
 }