Changeset 27379 in vbox

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt4: New running VM core: improve f/s mode-switching stability.

Location:

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

Files:

• UIMachineView.h (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (5 diffs)
• fullscreen/UIMachineViewFullscreen.h (modified) (2 diffs)
• seamless/UIMachineViewSeamless.cpp (modified) (4 diffs)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)

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

@@ -277 +277 @@
 public:
 
-    UIMachineViewBlocker(QObject *pWatchedObject)
+    UIMachineViewBlocker()
         : 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: */
@@ -296 +293 @@
 
 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)

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

@@ -56 +56 @@
     , m_bIsGuestAutoresizeEnabled(pMachineWindow->machineLogic()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->isChecked())
     , m_fShouldWeDoResize(false)
+    , m_pSyncBlocker(0)
 {
     /* Load machine view settings: */
@@ -71 +72 @@
     /* Prepare console connections: */
     prepareConsoleConnections();
+
+    /* Prepare fullscreen: */
+    prepareFullscreen();
 
     /* Initialization: */
@@ -162 +166 @@
                     pEvent->ignore();
             }
+        }
+
+        case VBoxDefs::ResizeEventType:
+        {
+            bool fResult = UIMachineView::event(pEvent);
+            if (m_pSyncBlocker && m_pSyncBlocker->isRunning())
+                m_pSyncBlocker->quit();
+            return fResult;
         }
         default:
@@ -238 +250 @@
 }
 
+void UIMachineViewFullscreen::prepareFullscreen()
+{
+    /* Create sync-blocker: */
+    m_pSyncBlocker = new UIMachineViewBlocker;
+}
+
 void UIMachineViewFullscreen::cleanupFullscreen()
 {
@@ -246 +264 @@
         if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
         {
-            /* Rollback fullscreen frame-buffer size to normal: */
-            UIMachineViewBlocker blocker(this);
+            /* Rollback seamless frame-buffer size to normal: */
+            machineWindowWrapper()->machineWindow()->hide();
             sltPerformGuestResize(guestSizeHint());
-            blocker.exec();
+            m_pSyncBlocker->exec();
+
+            /* Request to delete sync-blocker: */
+            m_pSyncBlocker->deleteLater();
         }
     }

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

@@ -64 +64 @@
     void prepareConnections();
     void prepareConsoleConnections();
-    //void prepareFullscreen() {}
+    void prepareFullscreen();
 
     /* Cleanup routines: */
@@ -82 +82 @@
     void maybeRestrictMinimumSize();
 
-    /* Private members: */
+    /* Private variables: */
     bool m_bIsGuestAutoresizeEnabled : 1;
     bool m_fShouldWeDoResize : 1;
+    UIMachineViewBlocker *m_pSyncBlocker;
 
     /* Friend classes: */

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

@@ -54 +54 @@
                     , uMonitor)
     , m_fShouldWeDoResize(false)
+    , m_pSyncBlocker(0)
 {
     /* Load machine view settings: */
@@ -176 +177 @@
                     pEvent->ignore();
             }
+        }
+
+        case VBoxDefs::ResizeEventType:
+        {
+            bool fResult = UIMachineView::event(pEvent);
+            if (m_pSyncBlocker && m_pSyncBlocker->isRunning())
+                m_pSyncBlocker->quit();
+            return fResult;
+            break;
         }
         default:
@@ -256 +266 @@
     /* Set seamless feature flag to the guest: */
     session().GetConsole().GetDisplay().SetSeamlessMode(true);
+    /* Create sync-blocker: */
+    m_pSyncBlocker = new UIMachineViewBlocker;
 }
 
@@ -267 +279 @@
 
         /* Rollback seamless frame-buffer size to normal: */
-        UIMachineViewBlocker blocker(this);
+        machineWindowWrapper()->machineWindow()->hide();
         sltPerformGuestResize(guestSizeHint());
-        blocker.exec();
+        m_pSyncBlocker->exec();
+
+        /* Delete sync-blocker: */
+        m_pSyncBlocker->deleteLater();
     }
 }

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

@@ -83 +83 @@
     bool m_fShouldWeDoResize : 1;
     QRegion m_lastVisibleRegion;
+    UIMachineViewBlocker *m_pSyncBlocker;
 
     /* Friend classes: */