Changeset 83242 in vbox

Timestamp:

Mar 10, 2020 11:12:02 AM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. More fixes

File:

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

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

@@ -217 +217 @@
         return;
     }
-    VbglR3SeamlessSendMonitorPositions(cPositions, pPositions);
+    int rc = VbglR3SeamlessSendMonitorPositions(cPositions, pPositions);
+    if (RT_SUCCESS(rc))
+        VBClLogError("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);
 }
 
@@ -239 +243 @@
 #else
     if (x11Context.pXRRGetMonitors)
-        x11Context.pXRRGetMonitors(x11Context.pDisplay, DefaultRootWindow(x11Context.pDisplay), true, &iMonitorCount);
+        pMonitorInfo = x11Context.pXRRGetMonitors(x11Context.pDisplay, DefaultRootWindow(x11Context.pDisplay), true, &iMonitorCount);
 #endif
     if (!pMonitorInfo)
@@ -376 +380 @@
         return false;
     callVMWCTRL();
-#ifdef WITH_DISTRO_XRAND_XINERAMA
-    XRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, x11Context.hEventMask);
-#else
-    if (x11Context.pXRRSelectInput)
-        x11Context.pXRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, x11Context.hEventMask);
-#endif
     if (RT_FAILURE(startX11MonitorThread()))
         return false;
@@ -441 +439 @@
 static void x11Connect()
 {
+    x11Context.pXRRSelectInput = NULL;
+    x11Context.pRandLibraryHandle = NULL;
+    x11Context.pXRRQueryExtension = NULL;
+    x11Context.pXRRQueryVersion = NULL;
+    x11Context.pXRRGetMonitors = NULL;
+    x11Context.pXRRFreeMonitors = NULL;
+
     int dummy;
     if (x11Context.pDisplay != NULL)
@@ -447 +452 @@
     if (x11Context.pDisplay == NULL)
         return;
+#ifndef WITH_DISTRO_XRAND_XINERAMA
+    if (openLibRandR() != VINF_SUCCESS)
+    {
+        XCloseDisplay(x11Context.pDisplay);
+        x11Context.pDisplay = NULL;
+        return;
+    }
+#endif
+
     if (!XQueryExtension(x11Context.pDisplay, "VMWARE_CTRL",
                          &x11Context.hVMWCtrlMajorOpCode, &dummy, &dummy))
@@ -477 +491 @@
         }
     }
-    x11Context.hEventMask = 0;
+    x11Context.rootWindow = DefaultRootWindow(x11Context.pDisplay);
+    x11Context.hOutputCount = determineOutputCount();
+
     x11Context.hEventMask = RRScreenChangeNotifyMask;
     if (x11Context.hRandRMinor >= 2)
@@ -483 +499 @@
                                | RROutputChangeNotifyMask
                                | RROutputPropertyNotifyMask;
-    x11Context.rootWindow = DefaultRootWindow(x11Context.pDisplay);
-    x11Context.hOutputCount = determineOutputCount();
-    x11Context.pXRRSelectInput = NULL;
-    x11Context.pRandLibraryHandle = NULL;
-    x11Context.pXRRQueryExtension = NULL;
-    x11Context.pXRRQueryVersion = NULL;
-    x11Context.pXRRGetMonitors = NULL;
-    x11Context.pXRRFreeMonitors = NULL;
-#ifndef WITH_DISTRO_XRAND_XINERAMA
-    if (openLibRandR() != VINF_SUCCESS)
-    {
-        XCloseDisplay(x11Context.pDisplay);
-        x11Context.pDisplay = NULL;
-        return;
-    }
+
+    /* Select the XEvent types we want to listen to. */
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+    XRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, x11Context.hEventMask);
+#else
+    if (x11Context.pXRRSelectInput)
+        x11Context.pXRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, x11Context.hEventMask);
 #endif
 }