Changeset 22212 in vbox

Timestamp:

Aug 12, 2009 4:14:51 PM (16 years ago)

Author:

vboxsync

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

51012

Message:

GuestHost/SharedClipboard/x11: fixed an accidental deletion and make sure we don't ask ourselves for supported clipboard data formats

File:

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

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

@@ -526 +526 @@
 
     if (XtAppPeekEvent(pCtx->appContext, &event))
-        if (event.type == pCtx->fixesEventBase)
+        if (   !pCtx->fOwnsClipboard
+            && (event.type == pCtx->fixesEventBase))
             clipQueryX11CBFormats(pCtx);
 }
@@ -1165 +1166 @@
         rc = clipCreateX11Targets(pCtx, atomTypeReturn, pValReturn,
                                   pcLenReturn, piFormatReturn);
+    else
         rc = clipConvertVBoxCBForX11(pCtx, atomTarget, atomTypeReturn,
                                      pValReturn, pcLenReturn, piFormatReturn);
@@ -1220 +1222 @@
 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))
     {
-        pCtx->fOwnsClipboard = true;
         pCtx->vboxFormats = u32Formats;
         /* Grab the middle-button paste selection too. */