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

Timestamp:

Oct 7, 2020 2:33:09 PM (4 years ago)

Author:

vboxsync

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

140777

Message:

bugref:9637. Exit the resizing client if randr extension version is 1.3 or smaller

File:

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

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

@@ -903 +903 @@
     x11Context.fWmwareCtrlExtention = false;
     x11Context.fMonitorInfoAvailable = false;
+    x11Context.hRandRMajor = 0;
+    x11Context.hRandRMinor = 0;
 
     int dummy;
@@ -952 +954 @@
             return;
         }
+        if (x11Context.hRandRMajor < 1 || x11Context.hRandRMinor <= 3)
+        {
+            VBClLogFatalError("Resizing service requires libXrandr Version >= 1.4. Detected version is %d.%d\n", x11Context.hRandRMajor, x11Context.hRandRMinor);
+            XCloseDisplay(x11Context.pDisplay);
+            x11Context.pDisplay = NULL;
+            return;
+        }
     }
     x11Context.rootWindow = DefaultRootWindow(x11Context.pDisplay);
@@ -1024 +1033 @@
                                            CurrentTime, 0, 0, None, RR_Rotate_0, NULL, 0);
 #endif
+    /** @todo  In case of unsuccesful crtc config set  we have to revert frame buffer size and crtc sizes. */
     if (ret == Success)
         return true;
@@ -1098 +1108 @@
 #endif
     XRRScreenSize newSize = currentSize();
-    /** @todo  In case of unsuccesful frame buffer resize we have to revert frame buffer size and crtc sizes. */
+
     if (!event || newSize.width != (int)iXRes || newSize.height != (int)iYRes)
     {