Changeset 22233 in vbox

Timestamp:

Aug 13, 2009 12:17:35 PM (15 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard/x11: remove more bits which XFIXES made unnecessary

File:

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

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

@@ -168 +168 @@
     Widget widget;
 
-    /** Does VBox currently own the clipboard? */
-    bool fOwnsClipboard;
     /** Should we try to grab the clipboard on startup? */
     bool fGrabClipboardOnStart;
@@ -181 +179 @@
     /** What formats does VBox have on offer? */
     uint32_t vboxFormats;
-    /** Windows hosts and guests cache the clipboard data they receive.
-     * Since we have no way of knowing whether their cache is still valid,
-     * we always send a "data changed" message after a successful transfer
-     * to invalidate it. */
-    bool notifyVBox;
     /** Cache of the last unicode data that we received */
     void *pvUnicodeCache;
@@ -401 +394 @@
  * @param  pTargets  the list of targets
  * @param  cTargets  the size of the list in @a pTargets
- * @param  pChanged  This is set to true if the formats available have changed
- *                   from VBox's point of view, and to false otherwise.
- *                   Somehow this didn't feel right as a return value.
  */
 static void clipGetFormatsFromTargets(CLIPBACKEND *pCtx, Atom *pTargets,
-                                      size_t cTargets, bool *pChanged)
-{
-    bool changed = false;
+                                      size_t cTargets)
+{
     AssertPtrReturnVoid(pCtx);
-    AssertReturnVoid(VALID_PTR(pTargets) || cTargets == 0);
+    AssertPtrReturnVoid(pTargets);
     CLIPX11FORMAT bestTextFormat;
     bestTextFormat = clipGetTextFormatFromTargets(pCtx, pTargets, cTargets);
     if (pCtx->X11TextFormat != bestTextFormat)
     {
-        changed = true;
         pCtx->X11TextFormat = bestTextFormat;
 #if defined(DEBUG) && !defined(TESTCASE)
@@ -429 +417 @@
     }
     pCtx->X11BitmapFormat = INVALID;  /* not yet supported */
-    if (pChanged)
-        *pChanged = changed;
 }
 
@@ -443 +429 @@
                                  size_t cTargets)
 {
-    bool changed = false;
-
     LogRel2 (("%s: called\n", __PRETTY_FUNCTION__));
-    if (pCtx->fOwnsClipboard)
-        /* VBox raced us and we lost.  So we don't want to report anything. */
-        return;
-    clipGetFormatsFromTargets(pCtx, pTargets, cTargets, &changed);
+    clipGetFormatsFromTargets(pCtx, pTargets, cTargets);
     clipReportFormatsToVBox(pCtx);
 }
-
-#ifdef TESTCASE
-static bool clipTestTargetUpdate(CLIPBACKEND *pCtx)
-{
-    bool success = true;
-    bool changed = true;
-    clipGetFormatsFromTargets(pCtx, NULL, 0, &changed);
-    clipGetFormatsFromTargets(pCtx, NULL, 0, &changed);  /* twice */
-    if (changed)
-        success = false;
-    Atom targets[3];
-    targets[0] = clipGetAtom(NULL, "COMPOUND_TEXT");
-    targets[1] = clipGetAtom(NULL, "text/plain");
-    targets[2] = clipGetAtom(NULL, "TARGETS");
-    clipGetFormatsFromTargets(pCtx, targets, RT_ELEMENTS(targets), &changed);
-    if (!changed)
-        success = false;
-    clipGetFormatsFromTargets(pCtx, targets, RT_ELEMENTS(targets), &changed);
-    if (changed)
-        success = false;
-    return success;
-}
-#endif
 
 /**
@@ -488 +446 @@
     CLIPBACKEND *pCtx =
             reinterpret_cast<CLIPBACKEND *>(pClientData);
-    Atom *pTargets = (*atomType == XT_CONVERT_FAIL) ? NULL  /* timeout */
-                                                    : (Atom *)pValue;
-    size_t cTargets = pTargets ? *pcLen : 0;
     LogRel2(("clipConvertX11Targets: pValue=%p, *pcLen=%u, *atomType=%d, XT_CONVERT_FAIL=%d\n",
              pValue, *pcLen, *atomType, XT_CONVERT_FAIL));
-    clipUpdateX11Targets(pCtx, pTargets, cTargets);
+    if (   (*atomType == XT_CONVERT_FAIL)  /* timeout */
+        || (pValue == NULL))               /* No data available */
+    {
+        clipReportEmptyX11CB(pCtx);
+        return;
+    }
+    clipUpdateX11Targets(pCtx, (Atom *)pValue, *pcLen);
     XtFree(reinterpret_cast<char *>(pValue));
 }
@@ -502 +463 @@
 void clipQueryX11CBFormats(CLIPBACKEND *pCtx)
 {
-    LogRel2 (("%s: called\n", __PRETTY_FUNCTION__));
-    /* Get the current clipboard contents if we don't own it ourselves */
-    if (!pCtx->fOwnsClipboard)
-    {
-        LogRel2 (("%s: requesting the targets that the X11 clipboard offers\n",
-               __PRETTY_FUNCTION__));
-        XtGetSelectionValue(pCtx->widget,
-                            clipGetAtom(pCtx->widget, "CLIPBOARD"),
-                            clipGetAtom(pCtx->widget, "TARGETS"),
-                            clipConvertX11Targets, pCtx,
-                            CurrentTime);
-    }
+    LogRel2 (("%s: requesting the targets that the X11 clipboard offers\n",
+           __PRETTY_FUNCTION__));
+    XtGetSelectionValue(pCtx->widget,
+                        clipGetAtom(pCtx->widget, "CLIPBOARD"),
+                        clipGetAtom(pCtx->widget, "TARGETS"),
+                        clipConvertX11Targets, pCtx,
+                        CurrentTime);
 }
 
 #ifndef TESTCASE
+
+typedef struct {
+    int type;                   /* event base */
+    unsigned long serial;
+    Bool send_event;
+    Display *display;
+    Window window;
+    int subtype;
+    Window owner;
+    Atom selection;
+    Time timestamp;
+    Time selection_timestamp;
+} XFixesSelectionNotifyEvent;
+
 /**
  * Wait until an event arrives and handle it if it is an XFIXES selection
@@ -523 +493 @@
 void clipPeekEventAndDoXFixesHandling(CLIPBACKEND *pCtx)
 {
-    XEvent event = { 0 };
-
-    if (XtAppPeekEvent(pCtx->appContext, &event))
-        if (   !pCtx->fOwnsClipboard
-            && (event.type == pCtx->fixesEventBase))
-            clipQueryX11CBFormats(pCtx);
+    union
+    {
+        XEvent event;
+        XFixesSelectionNotifyEvent fixes;
+    } event = { { 0 } };
+
+    if (XtAppPeekEvent(pCtx->appContext, &event.event))
+        if (   (event.event.type == pCtx->fixesEventBase)
+            && (event.fixes.owner != XtWindow(pCtx->widget)))
+        {
+            if (   (event.fixes.subtype == 0  /* XFixesSetSelectionOwnerNotify */)
+                && (event.fixes.owner != 0))
+                clipQueryX11CBFormats(pCtx);
+            else
+                clipReportEmptyX11CB(pCtx);
+        }
 }
 
@@ -776 +756 @@
     if (RT_SUCCESS(rc))
     {
-        pCtx->fOwnsClipboard = false;
         clipResetX11Formats(pCtx);
         pCtx->fGrabClipboardOnStart = grab;
@@ -1160 +1139 @@
 
     LogRelFlowFunc(("\n"));
-    if (   !pCtx->fOwnsClipboard   /* Drop requests we receive too late. */
-        || !clipIsSupportedSelectionType(pCtx->widget, *atomSelection))
+    if (!clipIsSupportedSelectionType(pCtx->widget, *atomSelection))
         return false;
     if (*atomTarget == clipGetAtom(pCtx->widget, "TARGETS"))
@@ -1173 +1151 @@
 }
 
-/**
- * Notify VBox that we have returned the clipboard to X11.
- */
-static void clipReleaseCB(CLIPBACKEND *pCtx)
-{
-    LogRelFlowFunc (("\n"));
-    /* The formats should be set to the right values as soon as X11 clipboard
-     * data becomes available. */
-    clipReportEmptyX11CB(pCtx);
-    pCtx->fOwnsClipboard = false;
-}
-
-/**
- * This is called by the X toolkit intrinsics to let us know that another
- * X11 client has taken the clipboard.  In this case we notify VBox that
- * X11 wants ownership of the clipboard.
- * @note  X11 backend code, callback for XtOwnSelection
- */
-static void clipXtLoseSelectionProc(Widget widget, Atom *)
-{
-    CLIPBACKEND *pCtx = clipLookupContext(widget);
-    LogRelFlowFunc (("\n"));
-    clipReleaseCB(pCtx);
-}
-
 /** Structure used to pass information about formats that VBox supports */
 typedef struct _CLIPNEWVBOXFORMATS
@@ -1222 +1175 @@
 static void clipGrabX11CB(CLIPBACKEND *pCtx, uint32_t u32Formats)
 {
-    /* Make sure we don't try to query ourselves if we get the clipboard */
-    pCtx->fOwnsClipboard = true;
     if (XtOwnSelection(pCtx->widget, clipGetAtom(pCtx->widget, "CLIPBOARD"),
-                       CurrentTime, clipXtConvertSelectionProc,
-                       clipXtLoseSelectionProc, 0))
+                       CurrentTime, clipXtConvertSelectionProc, NULL, 0))
     {
         pCtx->vboxFormats = u32Formats;
@@ -1233 +1183 @@
                        CurrentTime, clipXtConvertSelectionProc, NULL, 0);
     }
-    else
-        /* Someone raced us to get the clipboard and they won. */
-        pCtx->fOwnsClipboard = false;
 }
 
@@ -1591 +1538 @@
 
     int rc = VINF_SUCCESS;
-    /* Do not continue if we already own the clipboard */
-    if (pCtx->fOwnsClipboard == true)
-        rc = VERR_TIMEOUT;
+    /*
+     * VBox wants to read data in the given format.
+     */
+    if (pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    {
+        pReq->mTextFormat = pCtx->X11TextFormat;
+        if (pReq->mTextFormat == INVALID)
+            /* VBox thinks we have data and we don't */
+            rc = VERR_NO_DATA;
+        else
+            /* Send out a request for the data to the current clipboard
+             * owner */
+            XtGetSelectionValue(pCtx->widget, clipGetAtom(pCtx->widget, "CLIPBOARD"),
+                                clipAtomForX11Format(pCtx->widget,
+                                                     pCtx->X11TextFormat),
+                                clipConvertX11CB,
+                                reinterpret_cast<XtPointer>(pReq),
+                                CurrentTime);
+    }
     else
-    {
-        /*
-         * VBox wants to read data in the given format.
-         */
-        if (pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
-        {
-            pReq->mTextFormat = pCtx->X11TextFormat;
-            if (pReq->mTextFormat == INVALID)
-                /* VBox thinks we have data and we don't */
-                rc = VERR_NO_DATA;
-            else
-                /* Send out a request for the data to the current clipboard
-                 * owner */
-                XtGetSelectionValue(pCtx->widget, clipGetAtom(pCtx->widget, "CLIPBOARD"),
-                                    clipAtomForX11Format(pCtx->widget,
-                                                         pCtx->X11TextFormat),
-                                    clipConvertX11CB,
-                                    reinterpret_cast<XtPointer>(pReq),
-                                    CurrentTime);
-        }
-        else
-            rc = VERR_NOT_IMPLEMENTED;
-    }
+        rc = VERR_NOT_IMPLEMENTED;
     if (RT_FAILURE(rc))
     {
@@ -2436 +2377 @@
     RTTestSub(hTest, "notification of switch to X11 clipboard");
     clipInvalidateFormats();
-    clipReleaseCB(pCtx);
+    clipReportEmptyX11CB(pCtx);
     RTTEST_CHECK_MSG(hTest, clipQueryFormats() == 0,
                      (hTest, "Failed to send a format update (release) notification\n"));
@@ -2456 +2397 @@
                            sizeof("hello world"), 8);
     clipSetTargetsFailure(false, true);
-    clipUpdateX11Targets(pCtx, NULL, 0);
+    Atom atom = XA_STRING;
+    long unsigned int cLen = 0;
+    int format = 8;
+    clipConvertX11Targets(NULL, (XtPointer) pCtx, NULL, &atom, NULL, &cLen,
+                          &format);
     RTTEST_CHECK_MSG(hTest, clipQueryFormats() == 0,
                      (hTest, "Wrong targets reported: %02X\n",
@@ -2465 +2410 @@
     RTTEST_CHECK_MSG(hTest, clipTestTextFormatConversion(pCtx),
                      (hTest, "failed to select the right X11 text formats\n"));
-    RTTEST_CHECK_MSG(hTest, clipTestTargetUpdate(pCtx),
-                     (hTest, "incorrect reporting of new selection targets\n"));
 
     /*** Utf-8 from VBox ***/
@@ -2556 +2499 @@
     /*** No data in VBox clipboard ***/
     RTTestSub(hTest, "an empty VBox clipboard");
+    clipSetSelectionValues("TEXT", XA_STRING, "", sizeof(""), 8);
     clipEmptyVBox(pCtx, VINF_SUCCESS);
-    RTTEST_CHECK_MSG(hTest, pCtx->fOwnsClipboard,
+    RTTEST_CHECK_MSG(hTest, g_ownsSel,
                      (hTest, "VBox grabbed the clipboard with no data and we ignored it\n"));
     testStringFromVBoxFailed(hTest, pCtx, "UTF8_STRING");
@@ -2563 +2507 @@
     /*** An unknown VBox format ***/
     RTTestSub(hTest, "reading an unknown VBox format");
+    clipSetSelectionValues("TEXT", XA_STRING, "", sizeof(""), 8);
     clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "", 2);
     ClipAnnounceFormatToX11(pCtx, 0xa0000);
-    RTTEST_CHECK_MSG(hTest, pCtx->fOwnsClipboard,
+    RTTEST_CHECK_MSG(hTest, g_ownsSel,
                      (hTest, "VBox grabbed the clipboard with unknown data and we ignored it\n"));
     testStringFromVBoxFailed(hTest, pCtx, "UTF8_STRING");