Changeset 82216 in vbox for trunk/src

Timestamp:

Nov 26, 2019 9:28:21 AM (5 years ago)

Author:

vboxsync

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

135030

Message:

Shared Clipboard/VBoxClient: Re-added code removed in r134460, as this still is needed for various software products. Thank you, Andrew Caldwell!

File:

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

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

@@ -640 +640 @@
     PSHCLX11CTX pCtx = reinterpret_cast<SHCLX11CTX *>(pClient);
 
+    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->widget,
+                            clipGetAtom(pCtx, "CLIPBOARD"),
+                            clipGetAtom(pCtx, "TARGETS"),
+                            clipConvertX11TargetsCallback, pCtx,
+                            CurrentTime);
+        return;
+    }
+    else
+    {
+        pCtx->fXtBusy = false;
+    }
+
     Atom *pAtoms = (Atom *)pValue;
     unsigned i, j;
@@ -711 +729 @@
 
 #ifndef TESTCASE
-    XtGetSelectionValue(pCtx->widget,
-                        clipGetAtom(pCtx, "CLIPBOARD"),
-                        clipGetAtom(pCtx, "TARGETS"),
-                        clipConvertX11TargetsCallback, pCtx,
-                        CurrentTime);
+    LogFlowFunc(("fXtBusy=%RTbool\n", pCtx->fXtBusy));
+
+    if (pCtx->fXtBusy)
+    {
+        pCtx->fXtNeedsUpdate = true;
+    }
+    else
+    {
+        pCtx->fXtBusy = true;
+        XtGetSelectionValue(pCtx->widget,
+                            clipGetAtom(pCtx, "CLIPBOARD"),
+                            clipGetAtom(pCtx, "TARGETS"),
+                            clipConvertX11TargetsCallback, pCtx,
+                            CurrentTime);
+    }
 #else
     tstRequestTargets(pCtx);
@@ -1025 +1053 @@
     }
 
-    pCtx->fHaveX11  = !fHeadless;
-    pCtx->pFrontend = pParent;
+    pCtx->fHaveX11       = !fHeadless;
+    pCtx->pFrontend      = pParent;
+
+    pCtx->fXtBusy        = false;
+    pCtx->fXtNeedsUpdate = false;
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);