Changeset 72352 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 26, 2018 12:37:50 PM (7 years ago)

Author:

vboxsync

Message:

Main, VMMDev: implemented IDisplay::SetScreenLayout, VMMDev multimonitor resize request and VBoxManage controlvm setscreenlayout. bugref:8393

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -1441 +1441 @@
                                                          uXRes, uYRes, uBpp));
         }
+        else if (!strcmp(a->argv[1], "setscreenlayout"))
+        {
+            if (a->argc < 4)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }
+
+            ComPtr<IDisplay> pDisplay;
+            CHECK_ERROR_BREAK(console, COMGETTER(Display)(pDisplay.asOutParam()));
+            if (!pDisplay)
+            {
+                RTMsgError("Guest not running");
+                rc = E_FAIL;
+                break;
+            }
+
+            com::SafeIfaceArray<IGuestScreenInfo> aGuestScreenInfos;
+
+            /* Parse "<display> on|primary <xorigin> <yorigin> <xres> <yres> <bpp> | off" sequences. */
+            int argc = a->argc - 2;
+            char **argv = &a->argv[2];
+            while (argc >= 2)
+            {
+                ULONG aDisplay = RTStrToUInt32(argv[0]);
+                BOOL aPrimary = FALSE;
+
+                GuestMonitorStatus_T aStatus;
+                if (RTStrICmp(argv[1], "primary") == 0)
+                {
+                    aStatus = GuestMonitorStatus_Enabled;
+                    aPrimary = TRUE;
+                }
+                else if (RTStrICmp(argv[1], "on") == 0)
+                    aStatus = GuestMonitorStatus_Enabled;
+                else if (RTStrICmp(argv[1], "off") == 0)
+                    aStatus = GuestMonitorStatus_Disabled;
+                else
+                {
+                    errorSyntax(USAGE_CONTROLVM, "Display status must be <on> or <off>");
+                    rc = E_FAIL;
+                    break;
+                }
+
+                BOOL aChangeOrigin = FALSE;
+                LONG aOriginX = 0;
+                LONG aOriginY = 0;
+                ULONG aWidth = 0;
+                ULONG aHeight = 0;
+                ULONG aBitsPerPixel = 0;
+                if (aStatus = GuestMonitorStatus_Enabled)
+                {
+                    if (argc < 7)
+                    {
+                        errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                        rc = E_FAIL;
+                        break;
+                    }
+
+                    aChangeOrigin = TRUE;
+                    aOriginX      = RTStrToUInt32(argv[2]);
+                    aOriginY      = RTStrToUInt32(argv[3]);
+                    aWidth        = RTStrToUInt32(argv[4]);
+                    aHeight       = RTStrToUInt32(argv[5]);
+                    aBitsPerPixel = RTStrToUInt32(argv[6]);
+
+                    argc -= 7;
+                    argv += 7;
+                }
+                else
+                {
+                    argc -= 2;
+                    argv += 2;
+                }
+
+                ComPtr<IGuestScreenInfo> pInfo;
+                CHECK_ERROR_BREAK(pDisplay, CreateGuestScreenInfo(aDisplay, aStatus, aPrimary, aChangeOrigin,
+                                                                  aOriginX, aOriginY, aWidth, aHeight, aBitsPerPixel,
+                                                                  pInfo.asOutParam()));
+                aGuestScreenInfos.push_back(pInfo);
+            }
+
+            if (FAILED(rc))
+                break;
+
+            CHECK_ERROR_BREAK(pDisplay, SetScreenLayout(ScreenLayoutMode_Apply, ComSafeArrayAsInParam(aGuestScreenInfos)));
+        }
         else if (!strcmp(a->argv[1], "setcredentials"))
         {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -825 +825 @@
                      "                                            [[<display>] [<enabled:yes|no> |\n"
                      "                                              [<xorigin> <yorigin>]]] |\n"
+                     "                            setscreenlayout <display> on|primary <xorigin> <yorigin> <xres> <yres> <bpp> | off\n"
                      "                            screenshotpng <file> [display] |\n"
                      "                            videocap on|off |\n"