Changeset 21429 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Jul 9, 2009 11:16:58 AM (16 years ago)

Author:

vboxsync

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

49817

Message:

GuestHost/SharedClipboard: make sure that we also notify when a format is found that we don't support and test for this

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (5 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -1065 +1065 @@
 
 /**
+ * Notify VBox that we have returned the clipboard to X11.
+ */
+static void clipReleaseCB(CLIPBACKEND *pCtx)
+{
+    LogFlowFunc (("\n"));
+    /* The formats should be set to the right values as soon as we start
+     * polling */
+    clipReportEmptyX11CB(pCtx);
+    pCtx->fOwnsClipboard = false;
+}
+
+/**
  * This is called by the X toolkit intrinsics to let us know that another
  * X11 client has taken the clipboard.  In this case we notify VBox that
- * we want ownership of the clipboard.
+ * X11 wants ownership of the clipboard.
  * @note  X11 backend code, callback for XtOwnSelection
  */
@@ -1074 +1086 @@
     CLIPBACKEND *pCtx = clipLookupContext(widget);
     LogFlowFunc (("\n"));
-    /* These should be set to the right values as soon as we start polling */
-    clipResetX11Formats(pCtx);
-    pCtx->fOwnsClipboard = false;
+    clipReleaseCB(pCtx);
 }
 
@@ -1864 +1874 @@
 {
     return g_fX11Formats;
+}
+
+static void clipInvalidateFormats()
+{
+    g_fX11Formats = ~0;
 }
 
@@ -2315 +2330 @@
         ++cErrs;
 
+    /*** Unknown X11 format ***/
+    RTPrintf(TEST_NAME ": TESTING handling of an unknown X11 format\n");
+    clipInvalidateFormats();
+    clipSetSelectionValues("CLIPBOARD", XA_STRING, "Test",
+                           sizeof("Test"), 8);
+    if (!clipPollTargets())
+    {
+        RTPrintf("Failed to poll for targets\n");
+        ++cErrs;
+    }
+    else if (clipQueryFormats() != 0)
+    {
+        RTPrintf("Failed to send a format update notification\n");
+        ++cErrs;
+    }
 
     /*** Timeout from X11 ***/
@@ -2339 +2369 @@
         RTPrintf("Wrong returned request data, expected %p, got %p\n",
                  pReq, pReqRet);
+        ++cErrs;
+    }
+
+    /*** Ensure that VBox is notified when we return the CB to X11 ***/
+    RTPrintf(TEST_NAME ": TESTING notification of switch to X11 clipboard\n");
+    clipInvalidateFormats();
+    clipReleaseCB(pCtx);
+    if (clipQueryFormats() != 0)
+    {
+        RTPrintf("Failed to send a format update (release) notification\n");
         ++cErrs;
     }