Changeset 42261 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 20, 2012 1:27:47 PM (13 years ago)

Author:

vboxsync

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

79316

Message:

enabled shared clipboard support for Linux hosts (guest=>host only)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -189 +189 @@
             {
                 CHECK_ERROR_BREAK(sessionMachine, COMSETTER(ClipboardMode)(mode));
+            }
+        }
+        else if (!strcmp(a->argv[1], "draganddrop"))
+        {
+            if (a->argc <= 1 + 1)
+            {
+                errorArgument("Missing argument to '%s'. Expected drag'n'drop mode.", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+
+            DragAndDropMode_T mode;
+            if (!strcmp(a->argv[2], "disabled"))
+                mode = DragAndDropMode_Disabled;
+            else if (!strcmp(a->argv[2], "hosttoguest"))
+                mode = DragAndDropMode_HostToGuest;
+            else if (!strcmp(a->argv[2], "guesttohost"))
+                mode = DragAndDropMode_GuestToHost;
+            else if (!strcmp(a->argv[2], "bidirectional"))
+                mode = DragAndDropMode_Bidirectional;
+            else
+            {
+                errorArgument("Invalid '%s' argument '%s'.", a->argv[1], a->argv[2]);
+                rc = E_FAIL;
+            }
+            if (SUCCEEDED(rc))
+            {
+                CHECK_ERROR_BREAK(sessionMachine, COMSETTER(DragAndDropMode)(mode));
             }
         }

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

@@ -305 +305 @@
                      "                            [--audiocontroller ac97|hda|sb16]\n"
                      "                            [--clipboard disabled|hosttoguest|guesttohost|\n"
-                     "                                         bidirectional]\n");
+                     "                                         bidirectional]\n"
+                     "                            [--draganddrop disabled|hosttoguest\n");
         RTStrmPrintf(pStrm,
                      "                            [--vrde on|off]\n"
@@ -429 +430 @@
                      "                            clipboard disabled|hosttoguest|guesttohost|\n"
                      "                                         bidirectional]\n"
+                     "                            draganddrop disabled|hosttoguest]\n"
                      "                            vrde on|off |\n"
                      "                            vrdeport <port> |\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp ¶

@@ -1513 +1513 @@
     }
 
+    /* Drag'n'drop */
+    {
+        const char *psz = "Unknown";
+        DragAndDropMode_T enmMode;
+        rc = machine->COMGETTER(DragAndDropMode)(&enmMode);
+        switch (enmMode)
+        {
+            case DragAndDropMode_Disabled:
+                if (details == VMINFO_MACHINEREADABLE)
+                    psz = "disabled";
+                else
+                    psz = "disabled";
+                break;
+            case DragAndDropMode_HostToGuest:
+                if (details == VMINFO_MACHINEREADABLE)
+                    psz = "hosttoguest";
+                else
+                    psz = "HostToGuest";
+                break;
+            case DragAndDropMode_GuestToHost:
+                if (details == VMINFO_MACHINEREADABLE)
+                    psz = "guesttohost";
+                else
+                    psz = "GuestToHost";
+                break;
+            case DragAndDropMode_Bidirectional:
+                if (details == VMINFO_MACHINEREADABLE)
+                    psz = "bidirectional";
+                else
+                    psz = "Bidirectional";
+                break;
+            default:
+                if (details == VMINFO_MACHINEREADABLE)
+                    psz = "unknown";
+                break;
+        }
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("draganddrop=\"%s\"\n", psz);
+        else
+            RTPrintf("Drag'n'drop Mode:  %s\n", psz);
+    }
+
     if (console)
     {

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

@@ -140 +140 @@
     MODIFYVM_AUDIO,
     MODIFYVM_CLIPBOARD,
+    MODIFYVM_DRAGANDDROP,
     MODIFYVM_VRDPPORT,                /* VRDE: deprecated */
     MODIFYVM_VRDPADDRESS,             /* VRDE: deprecated */
@@ -286 +287 @@
     { "--audio",                    MODIFYVM_AUDIO,                     RTGETOPT_REQ_STRING },
     { "--clipboard",                MODIFYVM_CLIPBOARD,                 RTGETOPT_REQ_STRING },
+    { "--draganddrop",              MODIFYVM_DRAGANDDROP,               RTGETOPT_REQ_STRING },
     { "--vrdpport",                 MODIFYVM_VRDPPORT,                  RTGETOPT_REQ_STRING },     /* deprecated */
     { "--vrdpaddress",              MODIFYVM_VRDPADDRESS,               RTGETOPT_REQ_STRING },     /* deprecated */
@@ -2002 +2004 @@
             }
 
+            case MODIFYVM_DRAGANDDROP:
+            {
+                DragAndDropMode_T mode;
+                if (!strcmp(ValueUnion.psz, "disabled"))
+                    mode = DragAndDropMode_Disabled;
+                else if (!strcmp(ValueUnion.psz, "hosttoguest"))
+                    mode = DragAndDropMode_HostToGuest;
+                else if (!strcmp(ValueUnion.psz, "guesttohost"))
+                    mode = DragAndDropMode_GuestToHost;
+                else if (!strcmp(ValueUnion.psz, "bidirectional"))
+                    mode = DragAndDropMode_Bidirectional;
+                else
+                {
+                    errorArgument("Invalid --draganddrop argument '%s'", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                if (SUCCEEDED(rc))
+                {
+                    CHECK_ERROR(machine, COMSETTER(DragAndDropMode)(mode));
+                }
+                break;
+            }
+
             case MODIFYVM_VRDE_EXTPACK:
             {