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

Timestamp:

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

Author:

vboxsync

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

49818

Message:

HostServices/SharedClipboard: refactor target handling, clean up test and fix repeat grabbing of the clipboard when X11 has no targets on offer

File:

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

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

@@ -333 +333 @@
     CLIPFORMAT enmBestTextTarget = INVALID;
     AssertPtrReturn(pCtx, NIL_CLIPX11FORMAT);
-    AssertPtrReturn(pTargets, NIL_CLIPX11FORMAT);
+    AssertReturn(VALID_PTR(pTargets) || cTargets == 0, NIL_CLIPX11FORMAT);
     for (unsigned i = 0; i < cTargets; ++i)
     {
@@ -390 +390 @@
     bool changed = false;
     AssertPtrReturnVoid(pCtx);
-    AssertPtrReturnVoid(pTargets);
+    AssertReturnVoid(VALID_PTR(pTargets) || cTargets == 0);
     CLIPX11FORMAT bestTextFormat;
     bestTextFormat = clipGetTextFormatFromTargets(pCtx, pTargets, cTargets);
@@ -414 +414 @@
 
 /**
+ * Update the context's information about targets currently supported by X11,
+ * based on an array of X11 atoms.
+ * @param  pCtx      the context to be updated
+ * @param  pTargets  the array of atoms describing the targets supported
+ * @param  cTargets  the size of the array @a pTargets
+ */
+static void clipUpdateX11Targets(CLIPBACKEND *pCtx, Atom *pTargets,
+                                 size_t cTargets)
+{
+    bool changed = true;
+
+    Log3 (("%s: called\n", __PRETTY_FUNCTION__));
+    if (pCtx->fOwnsClipboard)
+        /* VBox raced us and we lost.  So we don't want to report anything. */
+        return;
+    clipGetFormatsFromTargets(pCtx, pTargets, cTargets, &changed);
+    if (changed)
+        clipReportFormatsToVBox(pCtx);
+}
+
+/**
  * Notify the VBox clipboard about available data formats, based on the
  * "targets" information obtained from the X11 clipboard.
@@ -425 +446 @@
     CLIPBACKEND *pCtx =
             reinterpret_cast<CLIPBACKEND *>(pClientData);
-    Atom *pTargets = reinterpret_cast<Atom *>(pValue);
-    size_t cTargets = *pcLen;
-    bool changed = true;
-
-    Log3 (("%s: called\n", __PRETTY_FUNCTION__));
-    if (pCtx->fOwnsClipboard)
-        /* VBox raced us and we lost.  So we don't want to report anything. */
-        changed = false;
-    else if (   (*atomType == XT_CONVERT_FAIL)  /* timeout */
-             || !pTargets  /* Conversion failed */)
-        clipResetX11Formats(pCtx);
-    else
-        clipGetFormatsFromTargets(pCtx, pTargets, cTargets, &changed);
-    if (changed)
-        clipReportFormatsToVBox(pCtx);
+    Atom *pTargets = (*atomType == XT_CONVERT_FAIL) ? NULL  /* timeout */
+                                                    : (Atom *)pValue;
+    size_t cTargets = pTargets ? *pcLen : 0;
+    clipUpdateX11Targets(pCtx, pTargets, cTargets);
     XtFree(reinterpret_cast<char *>(pValue));
 }
@@ -1588 +1598 @@
 }
 
-static bool clipPollTargets()
-{
-    if (!g_pfnPoller)
-        return false;
-    g_pfnPoller(g_pPollerData, NULL);
-    return true;
-}
-
 /* For the purpose of the test case, we just execute the procedure to be
  * scheduled, as we are running single threaded. */
@@ -1957 +1959 @@
 }
 
+static void clipSendTargetUpdate(CLIPBACKEND *pCtx)
+{
+    clipUpdateX11Targets(pCtx, g_selTarget, RT_ELEMENTS(g_selTarget));
+}
+
 /* Configure if and how the X11 TARGETS clipboard target will fail */
 static void clipSetTargetsFailure(bool fTimeout, bool fFailure)
@@ -2053 +2060 @@
 {
     bool retval = false;
-    if (!clipPollTargets())
-        RTPrintf("Failed to poll for targets\n");
-    else if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    clipSendTargetUpdate(pCtx);
+    if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
         RTPrintf("Wrong targets reported: %02X\n", clipQueryFormats());
     else
@@ -2112 +2118 @@
 {
     bool retval = false;
-    if (!clipPollTargets())
-        RTPrintf("Failed to poll for targets\n");
-    else if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    clipSendTargetUpdate(pCtx);
+    if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
         RTPrintf("Wrong targets reported: %02X\n", clipQueryFormats());
     else
@@ -2335 +2340 @@
     clipSetSelectionValues("CLIPBOARD", XA_STRING, "Test",
                            sizeof("Test"), 8);
-    if (!clipPollTargets())
-    {
-        RTPrintf("Failed to poll for targets\n");
-        ++cErrs;
-    }
-    else if (clipQueryFormats() != 0)
+    clipSendTargetUpdate(pCtx);
+    if (clipQueryFormats() != 0)
     {
         RTPrintf("Failed to send a format update notification\n");
@@ -2398 +2399 @@
     }
 
-    /*** Targets timeout from X11 ***/
-    RTPrintf(TEST_NAME ": TESTING X11 targets timeout\n");
-    clipSetSelectionValues("UTF8_STRING", XA_STRING, "hello world",
-                           sizeof("hello world"), 8);
-    clipSetTargetsFailure(true, false);
-    if (!clipPollTargets())
-    {
-        RTPrintf("Failed to poll for targets\n");
-        ++cErrs;
-    }
-    else if (clipQueryFormats() != 0)
-    {
-        RTPrintf("Wrong targets reported: %02X\n", clipQueryFormats());
-        ++cErrs;
-    }
-
     /*** Targets failure from X11 ***/
     RTPrintf(TEST_NAME ": TESTING X11 targets conversion failure\n");
@@ -2419 +2404 @@
                            sizeof("hello world"), 8);
     clipSetTargetsFailure(false, true);
-    if (!clipPollTargets())
-    {
-        RTPrintf("Failed to poll for targets\n");
-        ++cErrs;
-    }
-    else if (clipQueryFormats() != 0)
+    clipUpdateX11Targets(pCtx, NULL, 0);
+    if (clipQueryFormats() != 0)
     {
         RTPrintf("Wrong targets reported: %02X\n", clipQueryFormats());