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

Timestamp:

Aug 7, 2014 1:43:32 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: use the X11 EWMH protocol _NET_WM_FULLSCREEN_MONITORS to manage multi-monitor full-screen.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -4662 +4662 @@
 }
 
+bool VBoxGlobal::setFullScreenMonitorX11(QWidget *pWidget,
+                                         unsigned long cScreen)
+{
+    return XXSendClientMessage(pWidget->x11Info().display(),
+                               pWidget->window()->winId(),
+                               "_NET_WM_FULLSCREEN_MONITORS", cScreen, cScreen,
+                               cScreen, cScreen, 1
+                               /* Source indication (1 = normal application) */
+                              );
+}

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -120 +120 @@
     bool switchToMachine(CMachine &machine);
     bool launchMachine(CMachine &machine, bool fHeadless = false);
+    bool setFullScreenMonitorX11(QWidget *pWidget, unsigned long cScreen);
+
 
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }

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

@@ -296 +296 @@
         setGeometry(geo);
     }
-#else /* !Q_WS_MAC */
+#elif defined(Q_WS_WIN)
     /* Resize to the appropriate size: */
     resize(workingArea.size());
+#elif defined(Q_WS_X11)
+    /* Any more-or-less modern window manager provides special mechanisms for
+     * multi-monitor resizing.  We may fail on very old ones, but since we
+     * do not test them I prefer not to write speculative code to make them
+     * work. */
 #endif /* !Q_WS_MAC */
     /* Adjust guest screen size if necessary: */
@@ -327 +332 @@
 
     /* Make sure this window is maximized and placed on valid screen: */
+    /** @todo Only needed for legacy window managers on X11 which we do not
+     *        test; therefore this may not help there.  Better to just refuse
+     *        to support them? */
     placeOnScreen();
 
@@ -340 +348 @@
 
 #ifdef Q_WS_X11
-    /* Make sure the window is placed on valid screen again
-     * after window is shown & window's decorations applied.
-     * That is required (still?) due to X11 Window Geometry Rules. */
-    placeOnScreen();
+    /* This tells recent window managers which screen(s) a window should be
+     * mapped to.  Apparently some window managers will not respond to requests
+     * for unmapped windows, so do this after the call to showFullScreen(). */
+    vboxGlobal().setFullScreenMonitorX11(this, pFullscreenLogic
+                                                  ->hostScreenForGuestScreen
+                                                      (m_uScreenId));
 #endif /* Q_WS_X11 */
 }