Changeset 42261 in vbox for trunk/src/VBox/Main/xml

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/Main/xml

Files:

• Settings.cpp (modified) (4 diffs)
• VirtualBox-settings-common.xsd (modified) (4 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1615 +1615 @@
           chipsetType(ChipsetType_PIIX3),
           fEmulatedUSBCardReader(false),
-          clipboardMode(ClipboardMode_Bidirectional),
+          clipboardMode(ClipboardMode_Disabled),
+          dragAndDropMode(DragAndDropMode_Disabled),
           ulMemoryBalloonSize(0),
           fPageFusionEnabled(false)
@@ -1687 +1688 @@
                   && (llSharedFolders           == h.llSharedFolders)
                   && (clipboardMode             == h.clipboardMode)
+                  && (dragAndDropMode           == h.dragAndDropMode)
                   && (ulMemoryBalloonSize       == h.ulMemoryBalloonSize)
                   && (fPageFusionEnabled        == h.fPageFusionEnabled)
@@ -2762 +2764 @@
                 else
                     throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in Clipboard/@mode attribute"), strTemp.c_str());
+            }
+        }
+        else if (pelmHwChild->nameEquals("DragAndDrop"))
+        {
+            Utf8Str strTemp;
+            if (pelmHwChild->getAttributeValue("mode", strTemp))
+            {
+                if (strTemp == "Disabled")
+                    hw.dragAndDropMode = DragAndDropMode_Disabled;
+                else if (strTemp == "HostToGuest")
+                    hw.dragAndDropMode = DragAndDropMode_HostToGuest;
+                else if (strTemp == "GuestToHost")
+                    hw.dragAndDropMode = DragAndDropMode_GuestToHost;
+                else if (strTemp == "Bidirectional")
+                    hw.dragAndDropMode = DragAndDropMode_Bidirectional;
+                else
+                    throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in DragAndDrop/@mode attribute"), strTemp.c_str());
             }
         }
@@ -4066 +4085 @@
     switch (hw.clipboardMode)
     {
-        case ClipboardMode_Disabled: pcszClip = "Disabled"; break;
+        default: /*case ClipboardMode_Disabled:*/ pcszClip = "Disabled"; break;
         case ClipboardMode_HostToGuest: pcszClip = "HostToGuest"; break;
         case ClipboardMode_GuestToHost: pcszClip = "GuestToHost"; break;
-        default: /*case ClipboardMode_Bidirectional:*/ pcszClip = "Bidirectional"; break;
+        case ClipboardMode_Bidirectional: pcszClip = "Bidirectional"; break;
     }
     pelmClip->setAttribute("mode", pcszClip);
+
+    xml::ElementNode *pelmDragAndDrop = pelmHardware->createChild("DragAndDrop");
+    const char *pcszDragAndDrop;
+    switch (hw.dragAndDropMode)
+    {
+        default: /*case DragAndDropMode_Disabled:*/ pcszDragAndDrop = "Disabled"; break;
+        case DragAndDropMode_HostToGuest: pcszDragAndDrop = "HostToGuest"; break;
+        case DragAndDropMode_GuestToHost: pcszDragAndDrop = "GuestToHost"; break;
+        case DragAndDropMode_Bidirectional: pcszDragAndDrop = "Bidirectional"; break;
+    }
+    pelmDragAndDrop->setAttribute("mode", pcszDragAndDrop);
 
     if (m->sv >= SettingsVersion_v1_10)

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -7 +7 @@
  *  Common definitions
 
-     Copyright (C) 2004-2011 Oracle Corporation
+     Copyright (C) 2004-2012 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -172 +172 @@
 
 <xsd:simpleType name="TClipboardMode">
+  <xsd:restriction base="xsd:string">
+    <xsd:enumeration value="Disabled"/>
+    <xsd:enumeration value="HostToGuest"/>
+    <xsd:enumeration value="GuestToHost"/>
+    <xsd:enumeration value="Bidirectional"/>
+  </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:simpleType name="TDragAndDropMode">
   <xsd:restriction base="xsd:string">
     <xsd:enumeration value="Disabled"/>
@@ -793 +802 @@
 </xsd:complexType>
 
+<xsd:complexType name="TDragAndDrop">
+  <xsd:attribute name="mode" type="TDragAndDropMode" use="required"/>
+</xsd:complexType>
+
 <xsd:complexType name="TGuest">
   <xsd:attribute name="memoryBalloonSize"        type="xsd:unsignedInt" default="0"/>
@@ -865 +878 @@
     </xsd:element>
     <xsd:element name="Clipboard" type="TClipboard"/>
+    <xsd:element name="DragAndDrop" type="TDragAndDrop"/>
     <xsd:element name="Guest" type="TGuest"/>
     <xsd:element name="GuestProperties" type="TGuestProperties" minOccurs="0">