Changeset 50647 in vbox

Timestamp:

Feb 28, 2014 8:22:11 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92545

Message:

FE/Qt: Mac OS X: 7016: Native fullscreen multi-screen support: Fullscreen mode invalidation mechanism improvement (fixing one racing between Qt and cocoa).

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• UIMachineWindowFullscreen.cpp (modified) (5 diffs)
• UIMachineWindowFullscreen.h (modified) (3 diffs)

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

@@ -515 +515 @@
 bool UIMachineLogicFullscreen::shouldWeInvalidateFullscreenMode() const
 {
-    /* Prepare result: */
-    bool fSomethingInvalid = false;
-
     /* Enumerate windows: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
     {
+        /* Cast to 'fullscreen' window: */
+        UIMachineWindowFullscreen *pFullscreenMachineWindow =
+            qobject_cast<UIMachineWindowFullscreen*>(pMachineWindow);
+        /* Ignore window(s) which are in 'fullscreen transition': */
+        if (pFullscreenMachineWindow->isInFullscreenTransition())
+            continue;
+
         /* Get screen ID: */
         ulong uScreenID = pMachineWindow->screenId();
@@ -533 +537 @@
                 if (   uisession()->isScreenVisible(uScreenID)
                     && hasHostScreenForGuestScreen(uScreenID))
-                {
-                    fSomethingInvalid = true;
-                    break;
-                }
+                    return true;
             }
             /* Check window which is in fullscreen: */
@@ -545 +546 @@
                 if (   !uisession()->isScreenVisible(uScreenID)
                     || !hasHostScreenForGuestScreen(uScreenID))
-                {
-                    fSomethingInvalid = true;
-                    break;
-                }
+                    return true;
                 /* Check if that window should be located
                  * on another host-screen than currently. */
                 if (hostScreenForGuestScreen((int)uScreenID) !=
                     QApplication::desktop()->screenNumber(pMachineWindow))
-                {
-                    fSomethingInvalid = true;
-                    break;
-                }
+                    return true;
             }
         }
     }
 
-    /* Return result: */
-    return fSomethingInvalid;
+    /* False by default: */
+    return false;
 }
 

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

@@ -44 +44 @@
     , m_pMainMenu(0)
     , m_pMiniToolBar(0)
+#ifdef Q_WS_MAC
+    , m_fIsInFullscreenTransition(false)
+#endif /* Q_WS_MAC */
 {
 }
@@ -53 +56 @@
     AssertReturnVoid(vboxGlobal().osRelease() > MacOSXRelease_Lion);
 
-    /* Handle arrived notification: */
+    /* Log all arrived notifications: */
     LogRel(("UIMachineWindowFullscreen::handleNativeNotification: Notification '%s' received.\n",
             strNativeNotificationName.toAscii().constData()));
+
     /* Handle 'NSWindowDidEnterFullScreenNotification' notification: */
     if (strNativeNotificationName == "NSWindowDidEnterFullScreenNotification")
     {
+        /* Mark window transition complete: */
+        m_fIsInFullscreenTransition = false;
         LogRel(("UIMachineWindowFullscreen::handleNativeNotification: "
                 "Native fullscreen mode entered, notifying listener...\n"));
@@ -66 +72 @@
     else if (strNativeNotificationName == "NSWindowDidExitFullScreenNotification")
     {
+        /* Mark window transition complete: */
+        m_fIsInFullscreenTransition = false;
         LogRel(("UIMachineWindowFullscreen::handleNativeNotification: "
                 "Native fullscreen mode exited, notifying listener...\n"));
@@ -110 +118 @@
     if (!pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
         return;
+
+    /* Mark window 'transitioned to fullscreen': */
+    m_fIsInFullscreenTransition = true;
 
     /* Enter native fullscreen mode if necessary: */
@@ -121 +132 @@
     /* Make sure this slot is called only under ML and next: */
     AssertReturnVoid(vboxGlobal().osRelease() > MacOSXRelease_Lion);
+
+    /* Mark window 'transitioned from fullscreen': */
+    m_fIsInFullscreenTransition = true;
 
     /* Exit native fullscreen mode if necessary: */

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

@@ -33 +33 @@
 #ifdef RT_OS_DARWIN
 signals:
-    /** Mac OS X: Notifies listener about native fullscreen entering. */
+    /** Mac OS X: Notifies listener about native 'fullscreen' entered. */
     void sigNotifyAboutNativeFullscreenDidEnter();
-    /** Mac OS X: Notifies listener about native fullscreen exiting. */
+    /** Mac OS X: Notifies listener about native 'fullscreen' exited. */
     void sigNotifyAboutNativeFullscreenDidExit();
 #endif /* RT_OS_DARWIN */
@@ -45 +45 @@
 
 #ifdef Q_WS_MAC
-    /** Mac OS X: Handles native notifications @a strNativeNotificationName for fullscreen window. */
+    /** Mac OS X: Handles native notifications @a strNativeNotificationName for 'fullscreen' window. */
     void handleNativeNotification(const QString &strNativeNotificationName);
+    /** Mac OS X: Returns whether window is in 'fullscreen' transition. */
+    bool isInFullscreenTransition() const { return m_fIsInFullscreenTransition; }
 #endif /* Q_WS_MAC */
 
@@ -87 +89 @@
     UIRuntimeMiniToolBar *m_pMiniToolBar;
 
+#ifdef Q_WS_MAC
+    /** Mac OS X: Reflects whether window is in 'fullscreen' transition. */
+    bool m_fIsInFullscreenTransition;
+    /** Mac OS X: Allows 'fullscreen' API access: */
+    friend class UIMachineLogicFullscreen;
+#endif /* Q_WS_MAC */
+
     /* Factory support: */
     friend class UIMachineWindow;