Changeset 95468 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

Timestamp:

Jul 1, 2022 10:37:52 AM (2 years ago)

Author:

vboxsync

Message:

Additions: X11: VBoxClient --vmsvga: Use proper index when caching video modes, bugref:10222.

File:

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

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

@@ -1315 +1315 @@
         /* A mode with required size was not found. Create a new one. */
         pModeInfo = createMode(paOutputs[iOutputIndex].width, paOutputs[iOutputIndex].height);
+        VBClLogInfo("create mode %s (%u) on output %d\n", pModeInfo->name, pModeInfo->id, iOutputIndex);
         fNewMode = true;
     }
@@ -1330 +1331 @@
         x11Context.pXRRAddOutputMode(x11Context.pDisplay, outputId, pModeInfo->id);
 #endif
+
     /* If mode has been newly created, destroy and forget mode created on previous guest screen resize event. */
     if (   aPrevMode[iOutputIndex] > 0
@@ -1335 +1337 @@
         && fNewMode)
     {
-        VBClLogInfo("removing unused mode %u\n", aPrevMode[outputId]);
-#ifdef WITH_DISTRO_XRAND_XINERAMA
-        XRRDeleteOutputMode(x11Context.pDisplay, outputId, aPrevMode[outputId]);
-        XRRDestroyMode(x11Context.pDisplay, aPrevMode[outputId]);
+        VBClLogInfo("removing unused mode %u from output %d\n", aPrevMode[iOutputIndex], iOutputIndex);
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+        XRRDeleteOutputMode(x11Context.pDisplay, outputId, aPrevMode[iOutputIndex]);
+        XRRDestroyMode(x11Context.pDisplay, aPrevMode[iOutputIndex]);
 #else
         if (x11Context.pXRRDeleteOutputMode)
-            x11Context.pXRRDeleteOutputMode(x11Context.pDisplay, outputId, aPrevMode[outputId]);
+            x11Context.pXRRDeleteOutputMode(x11Context.pDisplay, outputId, aPrevMode[iOutputIndex]);
         if (x11Context.pXRRDestroyMode)
-            x11Context.pXRRDestroyMode(x11Context.pDisplay, aPrevMode[outputId]);
+            x11Context.pXRRDestroyMode(x11Context.pDisplay, aPrevMode[iOutputIndex]);
 #endif
         /* Forget destroyed mode. */
-        aPrevMode[outputId] = 0;
+        aPrevMode[iOutputIndex] = 0;
     }
 
@@ -1352 +1354 @@
      * was not created by XRRCreateMode call. */
     if (fNewMode)
-        aPrevMode[outputId] = pModeInfo->id;
+        aPrevMode[iOutputIndex] = pModeInfo->id;
 
     if (paOutputs[iOutputIndex].fPrimary)