Changeset 83257 in vbox

Timestamp:

Mar 11, 2020 12:42:35 PM (5 years ago)

Author:

vboxsync

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

136406

Message:

bugref:9637. Adding a few alternative library names for libXrandr.

Location:

trunk/src/VBox

Files:

• Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (1 diff)

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

@@ -406 +406 @@
 static int openLibRandR()
 {
-    x11Context.pRandLibraryHandle = dlopen("/usr/lib/x86_64-linux-gnu/libXrandr.so", RTLD_LAZY /*| RTLD_LOCAL */);
-
+    x11Context.pRandLibraryHandle = dlopen("libXrandr.so", RTLD_LAZY /*| RTLD_LOCAL */);
     if (!x11Context.pRandLibraryHandle)
-    {
-        VBClLogFatalError("Could not locate libXranr for dlopen\n");
+        x11Context.pRandLibraryHandle = dlopen("libXrandr.so.2", RTLD_LAZY /*| RTLD_LOCAL */);
+    if (!x11Context.pRandLibraryHandle)
+        x11Context.pRandLibraryHandle = dlopen("libXrandr.so.2.2.0", RTLD_LAZY /*| RTLD_LOCAL */);
+
+    if (!x11Context.pRandLibraryHandle)
+    {
+        VBClLogFatalError("Could not locate libXrandr for dlopen\n");
         return VERR_NOT_FOUND;
     }

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -1289 +1289 @@
 {
     AssertMsgReturn(pPosition, ("Empty monitor position array\n"), E_INVALIDARG);
+    for (unsigned i = 0; i < cPositions; ++i)
+        LogRel2(("Display::i_handleUpdateMonitorPositions: uScreenId=%d xOrigin=%d yOrigin=%dX\n",
+                 i, pPosition[i].x, pPosition[i].y));
+
     if (mpDrv && mpDrv->pUpPort->pfnReportMonitorPositions)
         mpDrv->pUpPort->pfnReportMonitorPositions(mpDrv->pUpPort, cPositions, pPosition);