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

Timestamp:

May 10, 2022 9:46:23 AM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: Delete unused display mode on screen resize event, bugref:10222.

File:

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

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

@@ -187 +187 @@
     void (*pXRRFreeCrtcInfo)(XRRCrtcInfo *);
     void (*pXRRAddOutputMode)(Display *, RROutput, RRMode);
+    void (*pXRRDeleteOutputMode)(Display *, RROutput, RRMode);
+    void (*pXRRDestroyMode)(Display *, RRMode);
     void (*pXRRSetOutputPrimary)(Display *, Window, RROutput);
 };
@@ -956 +958 @@
     *(void **)(&x11Context.pXRRAddOutputMode) = dlsym(x11Context.pRandLibraryHandle, "XRRAddOutputMode");
     checkFunctionPtr(x11Context.pXRRAddOutputMode);
+
+    *(void **)(&x11Context.pXRRDeleteOutputMode) = dlsym(x11Context.pRandLibraryHandle, "XRRDeleteOutputMode");
+    checkFunctionPtr(x11Context.pXRRDeleteOutputMode);
+
+    *(void **)(&x11Context.pXRRDestroyMode) = dlsym(x11Context.pRandLibraryHandle, "XRRDestroyMode");
+    checkFunctionPtr(x11Context.pXRRDestroyMode);
 
     *(void **)(&x11Context.pXRRSetOutputPrimary) = dlsym(x11Context.pRandLibraryHandle, "XRRSetOutputPrimary");
@@ -986 +994 @@
     x11Context.pXRRFreeCrtcInfo = NULL;
     x11Context.pXRRAddOutputMode = NULL;
+    x11Context.pXRRDeleteOutputMode = NULL;
+    x11Context.pXRRDestroyMode = NULL;
     x11Context.pXRRSetOutputPrimary = NULL;
     x11Context.fWmwareCtrlExtention = false;
@@ -1274 +1284 @@
         return false;
     }
+
+    AssertReturn(iOutputIndex >= 0, false);
+    AssertReturn(iOutputIndex < VMW_MAX_HEADS, false);
+
+    /* Remember the last instantiated display mode ID here. This mode will be replaced with the
+     * new one on the next guest screen resize event. */
+    static RRMode aPrevMode[VMW_MAX_HEADS];
+
     RROutput outputId = x11Context.pScreenResources->outputs[iOutputIndex];
     XRROutputInfo *pOutputInfo = NULL;
@@ -1309 +1327 @@
         x11Context.pXRRAddOutputMode(x11Context.pDisplay, outputId, pModeInfo->id);
 #endif
+
+    /* Destroy and forget mode created on previous guest screen resize event. */
+    if (   aPrevMode[outputId] > 0
+        && pModeInfo->id != aPrevMode[outputId])
+    {
+        VBClLogInfo("removing unused mode %u\n", aPrevMode[outputId]);
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+        XRRDeleteOutputMode(x11Context.pDisplay, outputId, aPrevMode[outputId]);
+        XRRDestroyMode(x11Context.pDisplay, aPrevMode[outputId]);
+#else
+        if (x11Context.pXRRDeleteOutputMode)
+            x11Context.pXRRDeleteOutputMode(x11Context.pDisplay, outputId, aPrevMode[outputId]);
+        if (x11Context.pXRRDestroyMode)
+            x11Context.pXRRDestroyMode(x11Context.pDisplay, aPrevMode[outputId]);
+#endif
+    }
+
+    aPrevMode[outputId] = pModeInfo->id;
 
     if (paOutputs[iOutputIndex].fPrimary)