Changeset 81700 in vbox for trunk/src/VBox

Timestamp:

Nov 6, 2019 11:03:13 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/clipboard-x11: Removed obsolete VBOX_AFTER_5_2 define and associated code.

File:

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

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

@@ -64 +64 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-/* The serialisation mechanism looks like it is not needed (everything using it
- * runs on one thread, and the flag is always cleared at the end of calls which
- * use it).  So we will remove it after the 5.2 series. */
-#if (VBOX_VERSION_MAJOR * 100000 + VBOX_VERSION_MINOR * 1000 + VBOX_VERION_BUILD >= 502051)
-# define VBOX_AFTER_5_2
-#endif
 
 
@@ -267 +261 @@
     /** The first XFixes event number */
     int fixesEventBase;
-#ifndef VBOX_AFTER_5_2
-    /** The Xt Intrinsics can only handle one outstanding clipboard operation
-     * at a time, so we keep track of whether one is in process. */
-    bool fBusy;
-    /** We can't handle a clipboard update event while we are busy, so remember
-     * it for later. */
-    bool fUpdateNeeded;
-#endif
 };
 
@@ -671 +657 @@
 {
     LogFlowFuncEnter();
-#ifndef VBOX_AFTER_5_2
-    pCtx->fBusy = false;
-    if (pCtx->fUpdateNeeded)
-    {
-        /* We may already be out of date. */
-        pCtx->fUpdateNeeded = false;
-        clipQueryX11CBFormats(pCtx);
-        return;
-    }
-#endif
+
     if (pTargets == NULL)
     {
@@ -687 +664 @@
         return;
     }
+
     clipGetFormatsFromTargets(pCtx, pTargets, cTargets);
     clipReportFormatsToVBox(pCtx);
@@ -775 +753 @@
 {
     LogFlowFuncEnter();
-
-#ifndef VBOX_AFTER_5_2
-    if (pCtx->fBusy)
-    {
-        pCtx->fUpdateNeeded = true;
-        return;
-    }
-    pCtx->fBusy = true;
-#endif
 
 #ifndef TESTCASE
@@ -1989 +1958 @@
 {
     CLIPREADX11CBREQ *pReq = (CLIPREADX11CBREQ *) pClient;
+
     LogFlowFunc(("pReq->mFormat=%02X, pReq->mTextFormat=%u, "
                  "pReq->mBitmapFormat=%u, pReq->mHtmlFormat=%u, pReq->mCtx=%p\n",
                  pReq->mFormat, pReq->mTextFormat, pReq->mBitmapFormat,
                  pReq->mHtmlFormat, pReq->mCtx));
+
     AssertPtr(pReq->mCtx);
     Assert(pReq->mFormat != 0);  /* sanity */
+
     int rc = VINF_SUCCESS;
-#ifndef VBOX_AFTER_5_2
-    CLIPBACKEND *pCtx = pReq->mCtx;
-#endif
+
     void *pvDest = NULL;
     uint32_t cbDest = 0;
 
-#ifndef VBOX_AFTER_5_2
-    pCtx->fBusy = false;
-    if (pCtx->fUpdateNeeded)
-        clipQueryX11CBFormats(pCtx);
-#endif
     if (pvSrc == NULL)
+    {
         /* The clipboard selection may have changed before we could get it. */
         rc = VERR_NO_DATA;
+    }
     else if (pReq->mFormat == VBOX_SHCL_FMT_UNICODETEXT)
     {
@@ -2186 +2153 @@
     int rc = VERR_NO_DATA; /* VBox thinks we have data and we don't. */
 
-#ifndef VBOX_AFTER_5_2
-    bool fBusy = pCtx->fBusy;
-    pCtx->fBusy = true;
-    if (fBusy)
-    {
-        /* If the clipboard is busy just fend off the request. */
-        rc = VERR_TRY_AGAIN;
-    }
-    else
-#endif
     if (pReq->mFormat == VBOX_SHCL_FMT_UNICODETEXT)
     {
@@ -2237 +2194 @@
     {
         rc = VERR_NOT_IMPLEMENTED;
-#ifndef VBOX_AFTER_5_2
-        pCtx->fBusy = false;
-#endif
     }