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

Timestamp:

Apr 28, 2020 7:31:23 AM (5 years ago)

Author:

vboxsync

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

137597

Message:

bugref:9637. Calling vmware_ctrl extension at each resize iteration. sets the preferred mode of each output to required size thereby solving kscreen mess in KDE by side effect.

File:

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

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

@@ -621 +621 @@
 }
 
-static bool callVMWCTRL()
-{
-    const int hHeight = 600;
-    const int hWidth = 800;
+static bool callVMWCTRL(struct RANDROUTPUT *paOutputs)
+{
+    int hHeight = 600;
+    int hWidth = 800;
 
     xXineramaScreenInfo *extents = (xXineramaScreenInfo *)malloc(x11Context.hOutputCount * sizeof(xXineramaScreenInfo));
@@ -632 +632 @@
     for (int i = 0; i < x11Context.hOutputCount; ++i)
     {
+        if (paOutputs[i].fEnabled)
+        {
+            hHeight = paOutputs[i].height;
+            hWidth = paOutputs[i].width;
+        }
+        else
+        {
+            hHeight = 0;
+            hWidth = 0;
+        }
         extents[i].x_org = hRunningOffset;
         extents[i].y_org = 0;
@@ -648 +658 @@
     if (x11Context.pDisplay == NULL)
         return false;
-    callVMWCTRL();
     if (RT_FAILURE(startX11MonitorThread()))
         return false;
@@ -1117 +1126 @@
 
     XGrabServer(x11Context.pDisplay);
-
+    callVMWCTRL(paOutputs);
     /* Disable crtcs. */
     for (int i = 0; i < x11Context.pScreenResources->noutput; ++i)