Changeset 83934 in vbox

Timestamp:

Apr 22, 2020 7:12:40 PM (5 years ago)

Author:

vboxsync

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

137483

Message:

bugref:9637. Using a separate X11 connection for RandR event monitoring.

File:

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

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

@@ -39 +39 @@
  *    # The order of the outputs (monitors) is assumed to be the same in RANDROUTPUT array and
         XRRScreenResources.outputs array.
+ *  - This code does 2 related but separate things: 1- It resizes and enables/disables monitors upon host's
+      requests (see the infinite loop in run()). 2- it listens to RandR events (caused by this or any other X11 client)
+      on a different thread and notifies host about the new monitor positions. See sendMonitorPositions(...). This is
+      mainly work around since we have realized that vmsvga does not convey correct monitor positions thru FIFO.
  */
 #include <stdio.h>
@@ -111 +115 @@
 {
     Display *pDisplay;
+    /* We use a separate connection for randr event listening for sharing  a
+       single display object with resizing (main) and event listening threads ends up having a deadlock.*/
+    Display *pDisplayRandRMonitoring;
     Window rootWindow;
     int iDefaultScreen;
@@ -499 +506 @@
     XRRMonitorInfo *pMonitorInfo = NULL;
 #ifdef WITH_DISTRO_XRAND_XINERAMA
-    pMonitorInfo = XRRGetMonitors(x11Context.pDisplay, DefaultRootWindow(x11Context.pDisplay), true, &iMonitorCount);
+    pMonitorInfo = XRRGetMonitors(x11Context.pDisplayRandRMonitoring,
+                                  DefaultRootWindow(x11Context.pDisplayRandRMonitoring), true, &iMonitorCount);
 #else
     if (x11Context.pXRRGetMonitors)
-        pMonitorInfo = x11Context.pXRRGetMonitors(x11Context.pDisplay, DefaultRootWindow(x11Context.pDisplay), true, &iMonitorCount);
+        pMonitorInfo = x11Context.pXRRGetMonitors(x11Context.pDisplayRandRMonitoring,
+                                                  DefaultRootWindow(x11Context.pDisplayRandRMonitoring), true, &iMonitorCount);
 #endif
     if (!pMonitorInfo)
@@ -519 +528 @@
         for (int i = 0; i < iMonitorCount; ++i)
         {
-            int iMonitorID = getMonitorIdFromName(XGetAtomName(x11Context.pDisplay, pMonitorInfo[i].name)) - 1;
+            int iMonitorID = getMonitorIdFromName(XGetAtomName(x11Context.pDisplayRandRMonitoring, pMonitorInfo[i].name)) - 1;
             if (iMonitorID >= x11Context.hOutputCount || iMonitorID == -1)
                 continue;
@@ -543 +552 @@
 {
     XEvent event;
-    XNextEvent(x11Context.pDisplay, &event);
+    XNextEvent(x11Context.pDisplayRandRMonitoring, &event);
     int eventTypeOffset = event.type - x11Context.hRandREventBase;
     switch (eventTypeOffset)
@@ -657 +666 @@
     }
 #ifdef WITH_DISTRO_XRAND_XINERAMA
-    XRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, 0);
+    XRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
     XRRFreeScreenResources(x11Context.pScreenResources);
 #else
     if (x11Context.pXRRSelectInput)
-        x11Context.pXRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, 0);
+        x11Context.pXRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
     if (x11Context.pXRRFreeScreenResources)
         x11Context.pXRRFreeScreenResources(x11Context.pScreenResources);
 #endif
     XCloseDisplay(x11Context.pDisplay);
+    XCloseDisplay(x11Context.pDisplayRandRMonitoring);
 }
 
@@ -764 +774 @@
         VBClLogFatalError("%s called with bad argument\n", __func__);
     x11Context.pDisplay = XOpenDisplay(NULL);
+    x11Context.pDisplayRandRMonitoring = XOpenDisplay(NULL);
     if (x11Context.pDisplay == NULL)
         return;
@@ -770 +781 @@
     {
         XCloseDisplay(x11Context.pDisplay);
+        XCloseDisplay(x11Context.pDisplayRandRMonitoring);
         x11Context.pDisplay = NULL;
+        x11Context.pDisplayRandRMonitoring = NULL;
         return;
     }
@@ -778 +791 @@
     {
         XCloseDisplay(x11Context.pDisplay);
+        XCloseDisplay(x11Context.pDisplayRandRMonitoring);
         x11Context.pDisplay = NULL;
+        x11Context.pDisplayRandRMonitoring = NULL;
         return;
     }
@@ -813 +828 @@
     /* Select the XEvent types we want to listen to. */
 #ifdef WITH_DISTRO_XRAND_XINERAMA
-    XRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, x11Context.hEventMask);
+    XRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, x11Context.hEventMask);
 #else
     if (x11Context.pXRRSelectInput)
-        x11Context.pXRRSelectInput(x11Context.pDisplay, x11Context.rootWindow, x11Context.hEventMask);
+        x11Context.pXRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, x11Context.hEventMask);
 #endif
     x11Context.iDefaultScreen = DefaultScreen(x11Context.pDisplay);