Changeset 55413 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Apr 23, 2015 8:08:25 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: do not set the virtual resolution too early to avoid triggering a problem in old RandR versions.

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -1054 +1054 @@
     if (cx != 0 && cy != 0)
     {
-        if (fLimitedContext)
-        {
-            pScrn->virtualX = cx;
-            pScrn->virtualY = cy;
-        }
-        else
+        /* Do not set the virtual resolution in limited context as that can
+         * cause problems setting up RandR 1.2 which needs it set to the
+         * maximum size at this point. */
+        if (!fLimitedContext)
         {
             TRACE_LOG("cx=%u, cy=%u\n", cx, cy);
@@ -1105 +1103 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
 
+    if (!fLimitedContext)
+    {
 # if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 5
-    RRGetInfo(xf86ScrnToScreen(pScrn), TRUE);
+        RRGetInfo(xf86ScrnToScreen(pScrn), TRUE);
 # else
-    RRGetInfo(xf86ScrnToScreen(pScrn));
+        RRGetInfo(xf86ScrnToScreen(pScrn));
 # endif
+    }
     setVirtualSizeRandR12(pScrn, fLimitedContext);
     setScreenSizesRandR12(pScrn, fLimitedContext);