Changeset 9018 in vbox for trunk/src/VBox

Timestamp:

May 21, 2008 2:03:01 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: rename the graphics driver output to VBOX1 and only enable dynamic resizing if our graphics driver is running on the display the client is connected to

Location:

trunk/src/VBox/Additions/x11

Files:

• installer/VBoxRandR.sh (modified) (1 diff)
• xgraphics/vboxvideo_13.c (modified) (1 diff)

trunk/src/VBox/Additions/x11/installer/VBoxRandR.sh

@@ -40 +40 @@
 fi
 
+# If we were called with the --test parameter, we check whether the display
+# we are running on is really using the VBox video driver (and RandR 1.2).
 if test "$1" = "--test"; then
-  version=`$randrbin -v 2>&1 | sed -n 's/[^0-9]*version 1\.\([0-9]*\)/\1/p'`
-  expr "$version" '>=' 2 2>&1 > /dev/null
+  $randrbin 2> /dev/null | grep VBOX1
   exit
 fi
-$randrbin --output Virtual\ Output --preferred
+
+# Otherwise we just switch the guest display into its preferred resolution,
+# which is the one corresponding to the last video mode hint sent by the host.
+$randrbin --output VBOX1 --preferred
 xrefresh 2>&1 > /dev/null

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c

@@ -750 +750 @@
 
     /* Set up our single virtual output. */
-    output = xf86OutputCreate(pScrn, &VBOXOutputFuncs, "Virtual Output");
+    output = xf86OutputCreate(pScrn, &VBOXOutputFuncs, "VBOX1");
 
     /* Set a sane minimum mode size and the maximum allowed by the available VRAM */