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

Timestamp:

Oct 6, 2020 3:11:43 PM (4 years ago)

Author:

vboxsync

Message:

bugref:9637. Dont start screen topology monitoring thread if xrandr is not new enough

File:

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

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

@@ -129 +129 @@
     int hRandRErrorBase;
     int hEventMask;
+    bool fMonitorInfoAvailable;
     /** The number of outputs (monitors, including disconnect ones) xrandr reports. */
     int hOutputCount;
@@ -773 +774 @@
     if (x11Context.pDisplay == NULL)
         return false;
-    if (RT_FAILURE(startX11MonitorThread()))
-        return false;
+    /* don't start the monitoring thread if related randr functionality is not available. */
+    if (x11Context.fMonitorInfoAvailable)
+        if (RT_FAILURE(startX11MonitorThread()))
+            return false;
     return true;
 }
@@ -834 +837 @@
     *(void **)(&x11Context.pXRRFreeMonitors) = dlsym(x11Context.pRandLibraryHandle, "XRRFreeMonitors");
     checkFunctionPtr(x11Context.pXRRFreeMonitors);
+
+    x11Context.fMonitorInfoAvailable = x11Context.pXRRGetMonitors && x11Context.pXRRFreeMonitors;
 
     *(void **)(&x11Context.pXRRGetScreenResources) = dlsym(x11Context.pRandLibraryHandle, "XRRGetScreenResources");
@@ -897 +902 @@
     x11Context.pXRRAddOutputMode = NULL;
     x11Context.fWmwareCtrlExtention = false;
+    x11Context.fMonitorInfoAvailable = false;
 
     int dummy;