Changeset 86710 in vbox

Timestamp:

Oct 26, 2020 2:35:44 PM (4 years ago)

Author:

vboxsync

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

141094

Message:

Shared Clipboard/X11: Guarded the Xt busy / update handling via VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY (enabled by default for now). bugref:9848

Location:

trunk

Files:

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

trunk/include/VBox/GuestHost/SharedClipboard-x11.h

@@ -35 +35 @@
 
 #include <VBox/GuestHost/SharedClipboard.h>
+
+/** Enables the Xt busy / update handling. */
+#define VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY      1
 
 /**
@@ -117 +120 @@
     /** The first XFixes event number. */
     int fixesEventBase;
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
     /** XtGetSelectionValue on some versions of libXt isn't re-entrant
      * so block overlapping requests on this flag. */
@@ -124 +128 @@
      * before processing the callback event. */
     bool fXtNeedsUpdate;
+#endif
 } SHCLX11CTX, *PSHCLX11CTX;
 

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

@@ -663 +663 @@
     LogFlowFuncEnter();
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
     pCtx->fXtBusy = false;
     if (pCtx->fXtNeedsUpdate)
@@ -671 +672 @@
         return;
     }
+#endif
 
     if (paIdxFmtTargets == NULL)
@@ -769 +771 @@
 {
 #ifndef TESTCASE
+
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
     LogFlowFunc(("fXtBusy=%RTbool\n", pCtx->fXtBusy));
-
     if (pCtx->fXtBusy)
     {
@@ -778 +781 @@
 
     pCtx->fXtBusy = true;
+# endif
+
     XtGetSelectionValue(pCtx->pWidget,
                         clipGetAtom(pCtx, "CLIPBOARD"),
@@ -1110 +1115 @@
     pCtx->pFrontend      = pParent;
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
     pCtx->fXtBusy        = false;
     pCtx->fXtNeedsUpdate = false;
+#endif
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -1782 +1789 @@
     size_t cbDst = 0;
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
     PSHCLX11CTX pCtx = pReq->pCtx;
     AssertPtr(pReq->pCtx);
@@ -1788 +1796 @@
     if (pCtx->fXtNeedsUpdate)
         clipQueryX11Formats(pCtx);
+#endif
 
     if (pvSrc == NULL)
@@ -2040 +2049 @@
     int rc = VERR_NO_DATA; /* VBox thinks we have data and we don't. */
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
     const bool fXtBusy = pCtx->fXtBusy;
     pCtx->fXtBusy = true;
@@ -2047 +2057 @@
         rc = VERR_TRY_AGAIN;
     }
-    else if (pReq->uFmtVBox & VBOX_SHCL_FMT_UNICODETEXT)
+    else
+#endif
+    if (pReq->uFmtVBox & VBOX_SHCL_FMT_UNICODETEXT)
     {
         pReq->idxFmtX11 = pCtx->idxFmtText;
@@ -2087 +2099 @@
     else
     {
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
         pCtx->fXtBusy = false;
-
+#endif
         rc = VERR_NOT_IMPLEMENTED;
     }