Changeset 37471 in vbox for trunk

Timestamp:

Jun 15, 2011 4:13:46 PM (14 years ago)

Author:

vboxsync

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

72287

Message:

Main/IConsole: add useHostClipboard attribute

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/ConsoleImpl.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6243 +6243 @@
     </attribute>
 
+    <attribute name="useHostClipboard" type="boolean">
+      <desc>
+        Whether the guest clipboard should be connected to the host one or
+        whether it should only be allowed access to the VRDE clipboard.  This
+        setting may not affect existing guest clipboard connections which
+        are already connected to the host clipboard.
+      </desc>
+    </attribute>
+
     <method name="powerUp">
       <desc>

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -128 +128 @@
     STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
     STDMETHOD(COMGETTER(AttachedPciDevices))(ComSafeArrayOut(IPciDeviceAttachment *, aAttachments));
+    STDMETHOD(COMGETTER(UseHostClipboard))(BOOL *aUseHostClipboard);
+    STDMETHOD(COMSETTER(UseHostClipboard))(BOOL aUseHostClipboard);
 
     // IConsole methods
@@ -173 +175 @@
 
     const ComPtr<IMachine> &machine() const { return mMachine; }
+
+    bool useHostClipboard() { return mfUseHostClipboard; }
 
     /** Method is called only from ConsoleVRDPServer */
@@ -755 +759 @@
     bool mVMStateChangeCallbackDisabled;
 
+    bool mfUseHostClipboard;
+
     /** Local machine state value. */
     MachineState_T mMachineState;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -376 +376 @@
     , mBusMgr(NULL)
     , mVMStateChangeCallbackDisabled(false)
+    , mfUseHostClipboard(true)
     , mMachineState(MachineState_PoweredOff)
 {
@@ -1803 +1804 @@
         result.detachTo(ComSafeArrayOutArg(aAttachments));
     }
+
+    return S_OK;
+}
+
+STDMETHODIMP Console::COMGETTER(UseHostClipboard)(BOOL *aUseHostClipboard)
+{
+    CheckComArgOutPointerValid(aUseHostClipboard);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aUseHostClipboard = mfUseHostClipboard;
+
+    return S_OK;
+}
+
+STDMETHODIMP Console::COMSETTER(UseHostClipboard)(BOOL aUseHostClipboard)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mfUseHostClipboard = aUseHostClipboard;
 
     return S_OK;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2422 +2422 @@
 
                     pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE, 1, &parm);
+
+                    parm.setUInt32(!useHostClipboard());
+                    
+                    pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_HEADLESS, 1, &parm);
 
                     Log(("Set VBoxSharedClipboard mode\n"));