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

Timestamp:

Dec 11, 2013 4:27:39 PM (11 years ago)

Author:

vboxsync

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

91244

Message:

Additions/x11: make vboxvideo dynamic resizing compatible with what the KMS/modesetting drivers can do.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• display.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -30 +30 @@
 endif
 VBoxClient_DEFS.linux += _GNU_SOURCE
+ifdef VBOX_WITH_GUEST_KMS_DRIVER
+ VBoxClient_DEFS += VBOX_WITH_GUEST_KMS_DRIVER
+endif
 VBoxClient_SOURCES = \
         main.cpp

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

@@ -48 +48 @@
         rc = VERR_NOT_SUPPORTED;
     if (RT_SUCCESS(rc))
+    {
         rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
+#ifdef VBOX_WITH_GUEST_KMS_DRIVER
+        if (RT_SUCCESS(rc))
+            VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0);
+#endif
+    }
     else
         VbglR3CtlFilterMask(0, VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
@@ -68 +74 @@
     if (RT_FAILURE(rc))
     {
-        VbglR3CtlFilterMask(0, VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);
+        VbglR3CtlFilterMask(0,   VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED
+                               | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
+#ifdef VBOX_WITH_GUEST_KMS_DRIVER
+        VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+#endif
         VbglR3SetMouseStatus(  fMouseFeatures
                              | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
@@ -82 +92 @@
     VbglR3CtlFilterMask(0,   VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
                            | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);
+#ifdef VBOX_WITH_GUEST_KMS_DRIVER
+    VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+#endif
     int rc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL);
     if (RT_SUCCESS(rc))
@@ -223 +236 @@
                             {
                                 RTStrPrintf(szCommand, sizeof(szCommand),
-                                            "%s --output VBOX%u --set VBOX_MODE %dx%d",
-                                            pcszXrandr, iDisplay, cx, cy);
+                                            "%s --output VGA-%u --set VBOX_MODE %d",
+                                            pcszXrandr, iDisplay,
+                                            (cx & 0xffff) << 16 | (cy & 0xffff));
                                 system(szCommand);
                             }
@@ -231 +245 @@
                             {
                                 RTStrPrintf(szCommand, sizeof(szCommand),
-                                            "%s --output VBOX%u --auto --pos %dx%d",
+                                            "%s --output VGA-%u --auto --pos %dx%d",
                                             pcszXrandr, iDisplay, cxOrg, cyOrg);
                                 system(szCommand);
                             }
                             RTStrPrintf(szCommand, sizeof(szCommand),
-                                        "%s --output VBOX%u --preferred",
+                                        "%s --output VGA-%u --preferred",
                                         pcszXrandr, iDisplay);
                             system(szCommand);
@@ -243 +257 @@
                         {
                             RTStrPrintf(szCommand, sizeof(szCommand),
-                                        "%s --output VBOX%u --off",
+                                        "%s --output VGA-%u --off",
                                          pcszXrandr, iDisplay);
                             system(szCommand);
@@ -253 +267 @@
                         {
                             RTStrPrintf(szCommand, sizeof(szCommand),
-                                        "%s --output VBOX%u --set VBOX_MODE %dx%d",
-                                        pcszXrandr, iDisplay, cx, cy);
+                                        "%s --output VGA-%u --set VBOX_MODE %d",
+                                        pcszXrandr, iDisplay,
+                                        (cx & 0xffff) << 16 | (cy & 0xffff));
                             system(szCommand);
                             RTStrPrintf(szCommand, sizeof(szCommand),
-                                        "%s --output VBOX%u --preferred",
+                                        "%s --output VGA-%u --preferred",
                                         pcszXrandr, iDisplay);
                             system(szCommand);