Changeset 91962 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Oct 21, 2021 3:20:29 PM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: partly revert r147454, bugref:10120.

Restore screens xorigin adjustments introduced in r136057.
Keep posibillity to set primary screen with VBoxManage.

File:

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

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

@@ -1439 +1439 @@
             /* Create a whole topology and send it to xrandr. */
             struct RANDROUTPUT aOutputs[VMW_MAX_HEADS];
+            int iRunningX = 0;
             for (int j = 0; j < x11Context.hOutputCount; ++j)
             {
-                aOutputs[j].x = aMonitors[j].xOrigin;
+                aOutputs[j].x = iRunningX;
                 aOutputs[j].y = aMonitors[j].yOrigin;
                 aOutputs[j].width = aMonitors[j].cx;
@@ -1447 +1448 @@
                 aOutputs[j].fEnabled = !(aMonitors[j].fDisplayFlags & VMMDEV_DISPLAY_DISABLED);
                 aOutputs[j].fPrimary = (aMonitors[j].fDisplayFlags & VMMDEV_DISPLAY_PRIMARY);
+                if (aOutputs[j].fEnabled)
+                    iRunningX += aOutputs[j].width;
             }
             /* In 32-bit guests GAs build on our release machines causes an xserver lock during vmware_ctrl extention