Changeset 82216 in vbox

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!

Location:

trunk

Files:

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

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

@@ -77 +77 @@
     bool fGrabClipboardOnStart;
 
-    /** The best text format X11 has to offer, as an index into the formats
-     * table */
+    /** The best text format X11 has to offer, as an index into the formats table. */
     CLIPX11FORMAT X11TextFormat;
-    /** The best bitmap format X11 has to offer, as an index into the formats
-     * table */
+    /** The best bitmap format X11 has to offer, as an index into the formats table. */
     CLIPX11FORMAT X11BitmapFormat;
-    /** The best HTML format X11 has to offer, as an index into the formats
-     * table */
+    /** The best HTML format X11 has to offer, as an index into the formats table. */
     CLIPX11FORMAT X11HTMLFormat;
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    /** The best HTML format X11 has to offer, as an index into the formats
-     * table */
+    /** The best HTML format X11 has to offer, as an index into the formats table. */
     CLIPX11FORMAT X11URIListFormat;
 #endif
     /** What kind of formats does VBox have to offer? */
     SHCLFORMATS vboxFormats;
-    /** Cache of the last unicode data that we received */
+    /** Cache of the last unicode data that we received. */
     void *pvUnicodeCache;
-    /** Size of the unicode data in the cache */
+    /** Size of the unicode data in the cache. */
     uint32_t cbUnicodeCache;
     /** When we wish the clipboard to exit, we have to wake up the event
@@ -101 +97 @@
      * the end that another thread can write to. */
     int wakeupPipeWrite;
-    /** The reader end of the pipe */
+    /** The reader end of the pipe. */
     int wakeupPipeRead;
-    /** A pointer to the XFixesSelectSelectionInput function */
+    /** A pointer to the XFixesSelectSelectionInput function. */
     void (*fixesSelectInput)(Display *, Window, Atom, unsigned long);
-    /** The first XFixes event number */
+    /** The first XFixes event number. */
     int fixesEventBase;
+    /** XtGetSelectionValue on some versions of libXt isn't re-entrant
+     * so block overlapping requests on this flag. */
+    bool fXtBusy;
+    /** If a request is blocked on the previous flag, set this flag to request
+     * an update later - the first callback should check and clear this flag
+     * before processing the callback event. */
+    bool fXtNeedsUpdate;
 } SHCLX11CTX, *PSHCLX11CTX;
 

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);