Changeset 86684 in vbox for trunk

Timestamp:

Oct 23, 2020 9:24:36 AM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/X11: Re-integrated previously removed fixes (before 5.2) for busy / overlapping Xt handling (see r86051 + r119036). bugref:9848

File:

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

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

@@ -92 +92 @@
 class formats;
 SHCL_X11_DECL(Atom) clipGetAtom(PSHCLX11CTX pCtx, const char *pszName);
+SHCL_X11_DECL(void) clipQueryX11FormatsCallback(PSHCLX11CTX pCtx);
 
 
@@ -662 +663 @@
     LogFlowFuncEnter();
 
+    pCtx->fXtBusy = false;
+    if (pCtx->fXtNeedsUpdate)
+    {
+        /* We may already be out of date. */
+        pCtx->fXtNeedsUpdate = false;
+        clipQueryX11FormatsCallback(pCtx);
+        return;
+    }
+
     if (paIdxFmtTargets == NULL)
     {
@@ -690 +700 @@
     PSHCLX11CTX pCtx = reinterpret_cast<SHCLX11CTX *>(pClient);
 
-#ifndef TESTCASE
-    LogFlowFunc(("fXtNeedsUpdate=%RTbool, fXtBusy=%RTbool\n", pCtx->fXtNeedsUpdate, pCtx->fXtBusy));
-
-    if (pCtx->fXtNeedsUpdate)
-    {
-        // The data from this callback is already out of date.  Refresh it.
-        pCtx->fXtNeedsUpdate = false;
-        XtGetSelectionValue(pCtx->pWidget,
-                            clipGetAtom(pCtx, "CLIPBOARD"),
-                            clipGetAtom(pCtx, "TARGETS"),
-                            clipConvertX11TargetsCallback, pCtx,
-                            CurrentTime);
-        return;
-    }
-    else
-    {
-        pCtx->fXtBusy = false;
-    }
-#endif
-
-    Atom *pAtoms = (Atom *)pValue;
-
     LogFlowFunc(("pValue=%p, *pcLen=%u, *atomType=%d%s\n",
                  pValue, *pcLen, *atomType, *atomType == XT_CONVERT_FAIL ? " (XT_CONVERT_FAIL)" : ""));
+
+    Atom *pAtoms = (Atom *)pValue;
 
     unsigned cFormats = *pcLen;
@@ -784 +774 @@
     {
         pCtx->fXtNeedsUpdate = true;
-    }
-    else
-    {
-        pCtx->fXtBusy = true;
-        XtGetSelectionValue(pCtx->pWidget,
-                            clipGetAtom(pCtx, "CLIPBOARD"),
-                            clipGetAtom(pCtx, "TARGETS"),
-                            clipConvertX11TargetsCallback, pCtx,
-                            CurrentTime);
-    }
+        return;
+    }
+
+    pCtx->fXtBusy = true;
+    XtGetSelectionValue(pCtx->pWidget,
+                        clipGetAtom(pCtx, "CLIPBOARD"),
+                        clipGetAtom(pCtx, "TARGETS"),
+                        clipConvertX11TargetsCallback, pCtx,
+                        CurrentTime);
 #else
     tstRequestTargets(pCtx);
@@ -1772 +1761 @@
     void  *pvDst = NULL;
     size_t cbDst = 0;
+
+    PSHCLX11CTX pCtx = pReq->pCtx;
+    AssertPtr(pReq->pCtx);
+
+    pCtx->fXtBusy = false;
+    if (pCtx->fXtNeedsUpdate)
+        clipQueryX11FormatsCallback(pCtx);
 
     if (pvSrc == NULL)
@@ -2023 +2019 @@
     int rc = VERR_NO_DATA; /* VBox thinks we have data and we don't. */
 
-    if (pReq->uFmtVBox & VBOX_SHCL_FMT_UNICODETEXT)
+    const bool fXtBusy = pCtx->fXtBusy;
+    pCtx->fXtBusy = true;
+    if (fXtBusy)
+    {
+        /* If the clipboard is busy just fend off the request. */
+        rc = VERR_TRY_AGAIN;
+    }
+    else if (pReq->uFmtVBox & VBOX_SHCL_FMT_UNICODETEXT)
     {
         pReq->idxFmtX11 = pCtx->idxFmtText;
@@ -2063 +2066 @@
     else
     {
+        pCtx->fXtBusy = false;
+
         rc = VERR_NOT_IMPLEMENTED;
     }