Changeset 62917 in vbox

Timestamp:

Aug 3, 2016 2:10:33 PM (9 years ago)

Author:

vboxsync

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

109519

Message:

FE/Qt: bugref:8505: X11: Runtime UI: Do not save/restore normal/scaled geometry for the zero/fake screen case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• runtime/scale/UIMachineLogicScale.cpp (modified) (1 diff)
• runtime/scale/UIMachineWindowScale.cpp (modified) (2 diffs)

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

@@ -49 +49 @@
 #  include <QTextStream>
 # endif /* VBOX_GUI_WITH_PIDFILE */
+# if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#  include <QScreen>
+# endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
 /* GUI includes: */
@@ -405 +408 @@
 }
 
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+bool VBoxGlobal::isFakeScreenDetected() const
+{
+    // WORKAROUND:
+    // In 5.6.1 Qt devs taught the XCB plugin to silently swap last detached screen
+    // with a fake one, and there is no API-way to distinguish fake from real one
+    // because all they do is erasing output for the last real screen, keeping
+    // all other screen attributes stale. Gladly output influencing screen name
+    // so we can use that horrible workaround to detect a fake XCB screen.
+    return    qApp->screens().size() == 0 /* zero-screen case is impossible after 5.6.1 */
+           || (qApp->screens().size() == 1 && qApp->screens().first()->name() == ":0.0");
+}
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
 /**
  *  Sets the new global settings and saves them to the VirtualBox server.

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

@@ -172 +172 @@
         /** Returns the available-geometry of the host-screen which contains @a point. */
         const QRect availableGeometry(const QPoint &point) const;
+
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+        /** Qt5: X11: Returns whether no or fake screen detected. */
+        bool isFakeScreenDetected() const;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -254 +254 @@
 {
 #if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /* Prevent handling if fake screen detected: */
+    if (vboxGlobal().isFakeScreenDetected())
+        return;
+
     /* Make sure all machine-window(s) have previous but normalized geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -462 +462 @@
         case QEvent::Resize:
         {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+            /* Prevent handling if fake screen detected: */
+            if (vboxGlobal().isFakeScreenDetected())
+                break;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
             QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
             if (!isMaximizedChecked())
@@ -476 +482 @@
         case QEvent::Move:
         {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+            /* Prevent handling if fake screen detected: */
+            if (vboxGlobal().isFakeScreenDetected())
+                break;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
             if (!isMaximizedChecked())
             {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -78 +78 @@
 {
 #if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /* Prevent handling if fake screen detected: */
+    if (vboxGlobal().isFakeScreenDetected())
+        return;
+
     /* Make sure all machine-window(s) have previous but normalized geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -180 +180 @@
         case QEvent::Resize:
         {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+            /* Prevent handling if fake screen detected: */
+            if (vboxGlobal().isFakeScreenDetected())
+                break;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
             QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
             if (!isMaximizedChecked())
@@ -193 +199 @@
         case QEvent::Move:
         {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+            /* Prevent handling if fake screen detected: */
+            if (vboxGlobal().isFakeScreenDetected())
+                break;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
             if (!isMaximizedChecked())
             {