Changeset 34918 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 6:08:01 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: multi-monitor dynamic resizing

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display.cpp (modified) (3 diffs)

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

@@ -29 +29 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/file.h>
+#include <iprt/string.h>
 #include <iprt/thread.h>
 #include <VBox/log.h>
@@ -155 +157 @@
     Cursor hClockCursor = XCreateFontCursor(pDisplay, XC_watch);
     Cursor hArrowCursor = XCreateFontCursor(pDisplay, XC_left_ptr);
+    int RRMaj, RRMin;
+    if (!XRRQueryVersion(pDisplay, &RRMaj, &RRMin))
+        RRMin = 0;
+    const char *pcszXrandr = "xrandr";
+    if (RTFileExists("/usr/X11/bin/xrandr"))
+        pcszXrandr = "/usr/X11/bin/xrandr";
     int rc = RTThreadCreate(NULL, x11ConnectionMonitor, NULL, 0,
                    RTTHREADTYPE_INFREQUENT_POLLER, 0, "X11 monitor");
@@ -187 +195 @@
                 RTThreadYield();
             else
-                setSize(pDisplay, cx, cy);
+                if (RRMin < 2)
+                    setSize(pDisplay, cx, cy);
+                else
+                {
+                    char szCommand[256];
+                    RTStrPrintf(szCommand, sizeof(szCommand),
+                                "%s --output VBOX%u --set VBOX_MODE %dx%d",
+                                pcszXrandr, iDisplay, cx, cy);
+                    system(szCommand);
+                    RTStrPrintf(szCommand, sizeof(szCommand),
+                                "%s --output VBOX%u --preferred",
+                                pcszXrandr, iDisplay);
+                    system(szCommand);
+                }
         }
     }