Changeset 89598 in vbox

Timestamp:

Jun 10, 2021 12:46:07 PM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: VMSVGA: attempt to fix black screen when X11 has no VMWARE_CTRL extension, bugref#10028.

• Prevent VBoxClient from sending uninitialised buffer to host,
• Add XSync/XFlush calls on error path handling, so XServer does not stuck with black screen,
• Update logging.

File:

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

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

@@ -499 +499 @@
     int rc = VbglR3SeamlessSendMonitorPositions(cPositions, pPositions);
     if (RT_SUCCESS(rc))
-        VBClLogError("Sending monitor positions (%u of them)  to the host: %Rrc\n", cPositions, rc);
+        VBClLogInfo("Sending monitor positions (%u of them)  to the host: %Rrc\n", cPositions, rc);
     else
         VBClLogError("Error during sending monitor positions (%u of them)  to the host: %Rrc\n", cPositions, rc);
@@ -538 +538 @@
         for (int i = 0; i < iMonitorCount; ++i)
         {
-            int iMonitorID = getMonitorIdFromName(XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name)) - 1;
+            int iMonitorID = getMonitorIdFromName(XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name));
             if (iMonitorID >= x11Context.hOutputCount || iMonitorID == -1)
+            {
+                VBClLogInfo("queryMonitorPositions: skip monitor %d (id %d, %s) (w,h)=(%d,%d) (x,y)=(%d,%d)\n",
+                        i, iMonitorID, XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name),
+                        pMonitorInfo[i].width, pMonitorInfo[i].height,
+                        pMonitorInfo[i].x, pMonitorInfo[i].y);
                 continue;
+            }
             VBClLogInfo("Monitor %d (w,h)=(%d,%d) (x,y)=(%d,%d)\n",
                         i,
@@ -1061 +1067 @@
     if (!event || newSize.width != (int)iXRes || newSize.height != (int)iYRes)
     {
-        VBClLogError("Resizing frame buffer to %d %d has failed\n", iXRes, iYRes);
+        VBClLogError("Resizing frame buffer to %d %d has failed, current mode %d %d\n",
+            iXRes, iYRes, newSize.width, newSize.height);
         return false;
     }
@@ -1210 +1217 @@
     {
         XUngrabServer(x11Context.pDisplay);
+        XFlush(x11Context.pDisplay);
         return;
     }
@@ -1232 +1240 @@
             VBClLogFatalError("Crtc disable failed %lu\n", pOutputInfo->crtc);
             XUngrabServer(x11Context.pDisplay);
+            XSync(x11Context.pDisplay, False);
 #ifdef WITH_DISTRO_XRAND_XINERAMA
             XRRFreeScreenResources(x11Context.pScreenResources);
@@ -1238 +1247 @@
                 x11Context.pXRRFreeScreenResources(x11Context.pScreenResources);
 #endif
+            XFlush(x11Context.pDisplay);
             return;
         }
@@ -1251 +1261 @@
     {
         XUngrabServer(x11Context.pDisplay);
+        XSync(x11Context.pDisplay, False);
 #ifdef WITH_DISTRO_XRAND_XINERAMA
         XRRFreeScreenResources(x11Context.pScreenResources);
@@ -1257 +1268 @@
             x11Context.pXRRFreeScreenResources(x11Context.pScreenResources);
 #endif
+        XFlush(x11Context.pDisplay);
         return;
     }