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

Timestamp:

Jun 27, 2012 2:04:09 PM (13 years ago)

Author:

vboxsync

Message:

allow to change the clipboard mode during runtime (API change including 'VBoxManage controlvm' change)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -162 +162 @@
 
             CHECK_ERROR_BREAK(sessionMachine, COMSETTER(CPUExecutionCap)(n));
+        }
+        else if (!strcmp(a->argv[1], "clipboard"))
+        {
+            if (a->argc <= 1 + 1)
+            {
+                errorArgument("Missing argument to '%s'. Expected clipboard mode.", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+
+            ClipboardMode_T mode;
+            if (!strcmp(a->argv[2], "disabled"))
+                mode = ClipboardMode_Disabled;
+            else if (!strcmp(a->argv[2], "hosttoguest"))
+                mode = ClipboardMode_HostToGuest;
+            else if (!strcmp(a->argv[2], "guesttohost"))
+                mode = ClipboardMode_GuestToHost;
+            else if (!strcmp(a->argv[2], "bidirectional"))
+                mode = ClipboardMode_Bidirectional;
+            else
+            {
+                errorArgument("Invalid '%s' argument '%s'.", a->argv[1], a->argv[2]);
+                rc = E_FAIL;
+            }
+            if (SUCCEEDED(rc))
+            {
+                CHECK_ERROR_BREAK(sessionMachine, COMSETTER(ClipboardMode)(mode));
+            }
         }
         else if (!strcmp(a->argv[1], "poweroff"))

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

@@ -420 +420 @@
                      "                            gueststatisticsinterval <seconds>]\n"
                      "                            usbattach <uuid>|<address> |\n"
-                     "                            usbdetach <uuid>|<address> |\n");
-        RTStrmPrintf(pStrm,
-                     "                            vrde on|off |\n");
-        RTStrmPrintf(pStrm,
+                     "                            usbdetach <uuid>|<address> |\n"
+                     "                            clipboard disabled|hosttoguest|guesttohost|\n"
+                     "                                         bidirectional]\n"
+                     "                            vrde on|off |\n"
                      "                            vrdeport <port> |\n"
                      "                            vrdeproperty <name=[value]> |\n"
-                     "                            vrdevideochannelquality <percent>\n");
-        RTStrmPrintf(pStrm,
+                     "                            vrdevideochannelquality <percent>\n"
                      "                            setvideomodehint <xres> <yres> <bpp> [display] |\n"
                      "                            screenshotpng <file> [display] |\n"

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

@@ -1954 +1954 @@
             case MODIFYVM_CLIPBOARD:
             {
+                ClipboardMode_T mode;
                 if (!strcmp(ValueUnion.psz, "disabled"))
-                {
-                    CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_Disabled));
-                }
+                    mode = ClipboardMode_Disabled;
                 else if (!strcmp(ValueUnion.psz, "hosttoguest"))
-                {
-                    CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_HostToGuest));
-                }
+                    mode = ClipboardMode_HostToGuest;
                 else if (!strcmp(ValueUnion.psz, "guesttohost"))
-                {
-                    CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_GuestToHost));
-                }
+                    mode = ClipboardMode_GuestToHost;
                 else if (!strcmp(ValueUnion.psz, "bidirectional"))
-                {
-                    CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_Bidirectional));
-                }
+                    mode = ClipboardMode_Bidirectional;
                 else
                 {
                     errorArgument("Invalid --clipboard argument '%s'", ValueUnion.psz);
                     rc = E_FAIL;
+                }
+                if (SUCCEEDED(rc))
+                {
+                    CHECK_ERROR(machine, COMSETTER(ClipboardMode)(mode));
                 }
                 break;