Changeset 84025 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Apr 28, 2020 6:27:44 AM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. Try sleeping before the first resize to avoid races with DE

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -46 +46 @@
 #include <stdio.h>
 #include <dlfcn.h>
+/** For sleep(..) */
+#include <unistd.h>
 #include "VBoxClient.h"
 
@@ -204 +206 @@
   * out of horizontal and vertical resolutions. Replicated here to avoid further
   * dependencies. */
-DisplayModeR f86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
+DisplayModeR f86CVTMode(int HDisplay, int VDisplay, float VRefresh /* Herz */, Bool Reduced,
             Bool Interlaced)
 {
@@ -923 +925 @@
     unsigned int iYRes = 0;
     /* Don't care about the output positions for now. */
-    for (int i = 0; i < VMW_MAX_HEADS; ++i)
+    for (int i = 0; i < x11Context.hOutputCount; ++i)
     {
         if (!paOutputs[i].fEnabled)
@@ -1173 +1175 @@
         configureOutput(i, paOutputs);
     }
-
+    XSync(x11Context.pDisplay, False);
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+    XRRFreeScreenResources(x11Context.pScreenResources);
+#else
+    if (x11Context.pXRRFreeScreenResources)
+        x11Context.pXRRFreeScreenResources(x11Context.pScreenResources);
+#endif
     XUngrabServer(x11Context.pDisplay);
     XFlush(x11Context.pDisplay);
-
-#ifdef WITH_DISTRO_XRAND_XINERAMA
-    XRRFreeScreenResources(x11Context.pScreenResources);
-#else
-    if (x11Context.pXRRFreeScreenResources)
-        x11Context.pXRRFreeScreenResources(x11Context.pScreenResources);
-#endif
-
 }
 
@@ -1204 +1204 @@
      * e.g. from before a guest reboot. */
     bool fAck = false;
-
+    bool fFirstRun = true;
     if (!init())
         return VINF_SUCCESS;
@@ -1266 +1266 @@
             }
             setXrandrTopology(aOutputs);
+            /* Wait for some seconds and set toplogy again after the boot. In some desktop environments (cinnamon) where
+               DE get into our resizing our first resize is reverted by the DE. Sleeping for some secs. helps. Setting
+               topology a 2nd time resolves the black screen I get after resizing.*/
+            if (fFirstRun)
+            {
+                sleep(4);
+                setXrandrTopology(aOutputs);
+                fFirstRun = false;
+            }
         }
         do