Changeset 7242 in vbox

Timestamp:

Mar 3, 2008 3:22:38 PM (17 years ago)

Author:

vboxsync

Message:

Mac OS X: If the host clipboard is cleared or filled with unsupported content the guest clipboard is cleared also.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• darwin-pasteboard.cpp (modified) (2 diffs)
• darwin-pasteboard.h (modified) (1 diff)
• darwin.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp

@@ -65 +65 @@
  * @param   pfFormats      Pointer for the bit combination of the
  *                         supported types.
+ * @param   pbChanged      True if something has changed after the
+ *                         last call.
  *
  * @returns IPRT status code.
  */
-int queryNewPasteboardFormats (PasteboardRef pPasteboard, uint32_t *pfFormats)
+int queryNewPasteboardFormats (PasteboardRef pPasteboard, uint32_t *pfFormats, bool *pbChanged)
 {
     Log (("queryNewPasteboardFormats\n"));
 
     OSStatus err = noErr;
+    *pbChanged = true;
 
     PasteboardSyncFlags syncFlags;
@@ -79 +82 @@
     /* If nothing changed return */
     if (!(syncFlags & kPasteboardModified))
+    {
+        *pbChanged = false; 
         return VINF_SUCCESS;
+    }
 
     /* Are some items in the pasteboard? */

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h

@@ -25 +25 @@
 void destroyPasteboard (PasteboardRef *pPasteboardRef);
 
-int queryNewPasteboardFormats (PasteboardRef pPasteboard, uint32_t *pfFormats);
+int queryNewPasteboardFormats (PasteboardRef pPasteboard, uint32_t *pfFormats, bool *pbChanged);
 int readFromPasteboard (PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual);
 int writeToPasteboard (PasteboardRef pPasteboard, void *pv, uint32_t cb, uint32_t fFormat);

trunk/src/VBox/HostServices/SharedClipboard/darwin.cpp

@@ -54 +54 @@
 
     uint32_t fFormats = 0;
+    bool bChanged = false;
     /* Retrieve the formats currently in the clipboard and supported by vbox */
-    int rc = queryNewPasteboardFormats (pCtx->pasteboard, &fFormats);
-
-    if (fFormats > 0)
+    int rc = queryNewPasteboardFormats (pCtx->pasteboard, &fFormats, &bChanged);
+
+    if (bChanged)
     {
         vboxSvcClipboardReportMsg (pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, fFormats);