Changeset 52788 in vbox for trunk

Timestamp:

Sep 18, 2014 3:33:11 PM (11 years ago)

Author:

vboxsync

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

96174

Message:

FE/Qt: X11: Legacy full-screen mapping is now available using global GUI/Fullscreen/LegacyMode extra-data flag.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp ¶

@@ -101 +101 @@
 const char* UIExtraDataDefs::GUI_Seamless = "GUI/Seamless";
 const char* UIExtraDataDefs::GUI_Scale = "GUI/Scale";
+#ifdef Q_WS_X11
+const char* UIExtraDataDefs::GUI_Fullscreen_LegacyMode = "GUI/Fullscreen/LegacyMode";
+#endif /* Q_WS_X11 */
 const char* UIExtraDataDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
 const char* UIExtraDataDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h ¶

@@ -170 +170 @@
         /** Holds whether scaled visual-state is requested. */
         extern const char* GUI_Scale;
+#ifdef Q_WS_X11
+        /** Holds whether legacy full-screen mode is requested. */
+        extern const char* GUI_Fullscreen_LegacyMode;
+#endif /* Q_WS_X11 */
         /** Holds whether guest-screen auto-resize according machine-window size is enabled. */
         extern const char* GUI_AutoresizeGuest;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ¶

@@ -1785 +1785 @@
            << GUI_RestrictedVisualStates
            << GUI_Fullscreen << GUI_Seamless << GUI_Scale
+#ifdef Q_WS_X11
+           << GUI_Fullscreen_LegacyMode
+#endif /* Q_WS_X11 */
            << GUI_AutoresizeGuest << GUI_LastGuestSizeHint << GUI_LastGuestSizeHintWasFullscreen
            << GUI_VirtualScreenToHostScreen << GUI_AutomountGuestScreens
@@ -2904 +2907 @@
     setExtraDataString(GUI_Scale, toFeatureAllowed(visualState == UIVisualStateType_Scale), strID);
 }
+
+#ifdef Q_WS_X11
+bool UIExtraDataManager::legacyFullscreenModeRequested()
+{
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_Fullscreen_LegacyMode);
+}
+#endif /* Q_WS_X11 */
 
 bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QString &strID)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h ¶

@@ -338 +338 @@
         void setRequestedVisualState(UIVisualStateType visualState, const QString &strID);
 
+#ifdef Q_WS_X11
+        /** Returns whether legacy full-screen mode is requested. */
+        bool legacyFullscreenModeRequested();
+#endif /* Q_WS_X11 */
+
         /** Returns whether guest-screen auto-resize according machine-window size is enabled. */
         bool guestScreenAutoResizeEnabled(const QString &strID);

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

@@ -384 +384 @@
      * which we do not test, so this is 'best effort' code. With window managers which
      * support the _NET_WM_FULLSCREEN_MONITORS protocol this would interfere unreliable. */
-    const bool fSupportsNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11();
+    const bool fSupportsNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11() &&
+                                           !gEDataManager->legacyFullscreenModeRequested();
     if (!fSupportsNativeFullScreen)
         placeOnScreen();