Changeset 50634 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 27, 2014 3:53:39 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Native fullscreen multi-screen support: Fullscreen mode invalidation mechanism improvement.

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (11 diffs)
• UIMachineLogicFullscreen.h (modified) (2 diffs)
• UIMachineWindowFullscreen.cpp (modified) (1 diff)
• UIMachineWindowFullscreen.h (modified) (1 diff)

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

@@ -132 +132 @@
     if (!m_fullscreenMachineWindows.isEmpty())
     {
-        /* Ask remain window(s) to exit fullscreen too: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            if (darwinIsInFullscreenMode(pMachineWindow))
-                darwinToggleFullscreenMode(pMachineWindow);
+        /* Exit fullscreen mode if it was not invalidated yet: */
+        if (!m_fIsFullscreenInvalidated)
+            emit sigNotifyAboutNativeFullscreenShouldBeExited();
     }
     /* If there is/are no more fullscreen window(s) left: */
@@ -153 +152 @@
             foreach (UIMachineWindow *pMachineWindow, machineWindows())
                 pMachineWindow->showInNecessaryMode();
-            /* Re-enter fullscreen mode: */
-            foreach (UIMachineWindow *pMachineWindow, machineWindows())
-                if (   uisession()->isScreenVisible(pMachineWindow->screenId())
-                    && (darwinScreensHaveSeparateSpaces() || pMachineWindow->screenId() == 0)
-                    && !darwinIsInFullscreenMode(pMachineWindow))
-                    darwinToggleFullscreenMode(pMachineWindow);
+            /* Ask all window(s) to re-enter fullscreen mode: */
+            emit sigNotifyAboutNativeFullscreenShouldBeEntered();
         }
         /* If fullscreen mode was manually exited: */
@@ -186 +181 @@
         /* Request 'normal' (window) visual-state: */
         uisession()->setRequestedVisualState(UIVisualStateType_Normal);
-        /* Exit native fullscreen mode for each window: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            if (darwinIsInFullscreenMode(pMachineWindow))
-                darwinToggleFullscreenMode(pMachineWindow);
+        /* Ask all window(s) to exit fullscreen mode: */
+        emit sigNotifyAboutNativeFullscreenShouldBeExited();
     }
 }
@@ -203 +196 @@
         /* Request 'seamless' visual-state: */
         uisession()->setRequestedVisualState(UIVisualStateType_Seamless);
-        /* Exit native fullscreen mode for each window: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            if (darwinIsInFullscreenMode(pMachineWindow))
-                darwinToggleFullscreenMode(pMachineWindow);
+        /* Ask all window(s) to exit fullscreen mode: */
+        emit sigNotifyAboutNativeFullscreenShouldBeExited();
     }
 }
@@ -220 +211 @@
         /* Request 'scale' visual-state: */
         uisession()->setRequestedVisualState(UIVisualStateType_Scale);
-        /* Exit native fullscreen mode for each window: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            if (darwinIsInFullscreenMode(pMachineWindow))
-                darwinToggleFullscreenMode(pMachineWindow);
+        /* Ask all window(s) to exit fullscreen mode: */
+        emit sigNotifyAboutNativeFullscreenShouldBeExited();
     }
 }
@@ -270 +259 @@
     }
     /* Invalidate fullscreen mode for ML and next: */
-    else invalidateFullscreenMode();
+    else if (shouldWeInvalidateFullscreenMode())
+        invalidateFullscreenMode();
+    else
+    {
+        /* Make sure all machine-window(s) have proper geometry: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            pMachineWindow->showInNecessaryMode();
+    }
 #else /* !Q_WS_MAC */
     /* Make sure all machine-window(s) have proper geometry: */
@@ -292 +288 @@
         UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
     /* Invalidate fullscreen mode for ML and next: */
-    else invalidateFullscreenMode();
+    else if (shouldWeInvalidateFullscreenMode())
+        invalidateFullscreenMode();
+    /* Call to base-class otherwise: */
+    else UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
 #else /* !Q_WS_MAC */
     /* Call to base-class: */
@@ -311 +310 @@
         UIMachineLogic::sltHostScreenCountChanged();
     /* Invalidate fullscreen mode for ML and next: */
-    else invalidateFullscreenMode();
+    else if (shouldWeInvalidateFullscreenMode())
+        invalidateFullscreenMode();
+    /* Call to base-class otherwise: */
+    else UIMachineLogic::sltHostScreenCountChanged();
 #else /* !Q_WS_MAC */
     /* Call to base-class: */
@@ -391 +393 @@
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
     {
-        /* For all the machine-window(s): */
+        /* Enable native fullscreen support: */
         foreach (UIMachineWindow *pMachineWindow, machineWindows())
         {
-            /* Watch for native fullscreen signals: */
+            /* Logic => window signals: */
+            connect(this, SIGNAL(sigNotifyAboutNativeFullscreenShouldBeEntered()),
+                    pMachineWindow, SLOT(sltEnterNativeFullscreen()));
+            connect(this, SIGNAL(sigNotifyAboutNativeFullscreenShouldBeExited()),
+                    pMachineWindow, SLOT(sltExitNativeFullscreen()));
+            /* Window => logic signals: */
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidEnter()),
                     this, SLOT(sltHandleNativeFullscreenDidEnter()));
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidExit()),
                     this, SLOT(sltHandleNativeFullscreenDidExit()));
-            /* Enter native fullscreen mode: */
-            if (   (darwinScreensHaveSeparateSpaces() || pMachineWindow->screenId() == 0)
-                && !darwinIsInFullscreenMode(pMachineWindow))
-                darwinToggleFullscreenMode(pMachineWindow);
-        }
+        }
+        /* Ask all window(s) to enter fullscreen mode: */
+        emit sigNotifyAboutNativeFullscreenShouldBeEntered();
     }
 #endif /* Q_WS_MAC */
@@ -508 +513 @@
 }
 
+bool UIMachineLogicFullscreen::shouldWeInvalidateFullscreenMode() const
+{
+    /* Prepare result: */
+    bool fSomethingInvalid = false;
+
+    /* Enumerate windows: */
+    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+    {
+        /* Get screen ID: */
+        ulong uScreenID = pMachineWindow->screenId();
+        /* Check window which can be fullscreen: */
+        if (uScreenID == 0 || darwinScreensHaveSeparateSpaces())
+        {
+            /* Check window which is not in fullscreen: */
+            if (!darwinIsInFullscreenMode(pMachineWindow))
+            {
+                /* Check if that window should really
+                 * be shown and is mapped to some host-screen: */
+                if (   uisession()->isScreenVisible(uScreenID)
+                    && hasHostScreenForGuestScreen(uScreenID))
+                {
+                    fSomethingInvalid = true;
+                    break;
+                }
+            }
+            /* Check window which is in fullscreen: */
+            else
+            {
+                /* Check if that window shouldn't really
+                 * be shown or isn't mapped to some host-screen: */
+                if (   !uisession()->isScreenVisible(uScreenID)
+                    || !hasHostScreenForGuestScreen(uScreenID))
+                {
+                    fSomethingInvalid = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    /* Return result: */
+    return fSomethingInvalid;
+}
+
 void UIMachineLogicFullscreen::invalidateFullscreenMode()
 {
@@ -514 +563 @@
         return;
 
+    LogRel(("UIMachineLogicFullscreen::invalidateFullscreenMode: "
+            "Fullscreen mode invalidated...\n"));
+
     /* Mark 'fullscreen' mode as invalidated: */
     m_fIsFullscreenInvalidated = true;
 
-    /* Exit fullscreen mode: */
-    foreach (UIMachineWindow *pMachineWindow, machineWindows())
-        if (darwinIsInFullscreenMode(pMachineWindow))
-            darwinToggleFullscreenMode(pMachineWindow);
-}
-#endif /* Q_WS_MAC */
-
+    /* Ask all window(s) to exit fullscreen mode: */
+    emit sigNotifyAboutNativeFullscreenShouldBeExited();
+}
+#endif /* Q_WS_MAC */
+

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

@@ -28 +28 @@
 {
     Q_OBJECT;
+
+#ifdef RT_OS_DARWIN
+signals:
+    /** Mac OS X: Notifies listener about native fullscreen mode should be entered. */
+    void sigNotifyAboutNativeFullscreenShouldBeEntered();
+    /** Mac OS X: Notifies listener about native fullscreen mode should be exited. */
+    void sigNotifyAboutNativeFullscreenShouldBeExited();
+#endif /* RT_OS_DARWIN */
 
 protected:
@@ -96 +104 @@
     void setPresentationModeEnabled(bool fEnabled);
 
+    /** Mac OS X: Checks if 'fullscreen' mode should be invalidated. */
+    bool shouldWeInvalidateFullscreenMode() const;
     /** Mac OS X: Invalidates 'fullscreen' mode. */
     void invalidateFullscreenMode();

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

@@ -91 +91 @@
     }
 }
+
+#ifdef Q_WS_MAC
+void UIMachineWindowFullscreen::sltEnterNativeFullscreen()
+{
+    /* Make sure this slot is called only under ML and next: */
+    AssertReturnVoid(vboxGlobal().osRelease() > MacOSXRelease_Lion);
+
+    /* Make sure this window should be shown at all: */
+    if (!uisession()->isScreenVisible(m_uScreenId))
+        return;
+
+    /* Make sure this window has fullscreen logic: */
+    UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
+    if (!pFullscreenLogic)
+        return;
+
+    /* Make sure this window mapped to some host-screen: */
+    if (!pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
+        return;
+
+    /* Enter native fullscreen mode if necessary: */
+    if (   (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
+        && !darwinIsInFullscreenMode(this))
+        darwinToggleFullscreenMode(this);
+}
+
+void UIMachineWindowFullscreen::sltExitNativeFullscreen()
+{
+    /* Make sure this slot is called only under ML and next: */
+    AssertReturnVoid(vboxGlobal().osRelease() > MacOSXRelease_Lion);
+
+    /* Exit native fullscreen mode if necessary: */
+    if (   (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
+        && darwinIsInFullscreenMode(this))
+        darwinToggleFullscreenMode(this);
+}
+#endif /* Q_WS_MAC */
 
 void UIMachineWindowFullscreen::prepareMenu()

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

@@ -57 +57 @@
     void sltPopupMainMenu();
 
+#ifdef RT_OS_DARWIN
+    /** Mac OS X: Commands window to enter native 'fullscreen' mode if possible. */
+    void sltEnterNativeFullscreen();
+    /** Mac OS X: Commands window to exit native 'fullscreen' mode if possible. */
+    void sltExitNativeFullscreen();
+#endif /* RT_OS_DARWIN */
+
 private: