Changeset 19150 in vbox

Timestamp:

Apr 23, 2009 7:01:05 PM (16 years ago)

Author:

vboxsync

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

46393

Message:

Additions/x11/clipboard: fix handling of middle-button pasting and the issue with the guest clipboard not working immediately on startup

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -20 +20 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+/****************************************************************************
+*   Header Files                                                            *
+****************************************************************************/
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #include <VBox/log.h>
@@ -50 +50 @@
 #define USE_CTEXT
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
+/****************************************************************************
+*   Global Variables                                                        *
+****************************************************************************/
 /** The different clipboard formats which we support. */
 enum g_eClipboardFormat
@@ -512 +512 @@
                                  int *piFormat)
 {
-    /* The X Toolkit may have failed to get the clipboard selection for us. */
     LogFlowFunc(("*pcLen=%lu, *piFormat=%d, requested target format: %d, g_ctx.requestBufferSize=%d\n",
                  *pcLen, *piFormat, g_ctx.requestGuestFormat, g_ctx.requestBufferSize));
+    /* The X Toolkit may have failed to get the clipboard selection for us. */
     if (*atomType == XT_CONVERT_FAIL)
     {
@@ -1215 +1215 @@
     g_ctx.guestTextFormat = INVALID;
     g_ctx.guestBitmapFormat = INVALID;
-    if (XtOwnSelection(g_ctx.widget, g_ctx.atomClipboard, CurrentTime, vboxClipboardConvertProc,
-                       vboxClipboardLoseProc, 0) != True)
+    if (XtOwnSelection(g_ctx.widget, g_ctx.atomClipboard, CurrentTime,
+                       vboxClipboardConvertProc, vboxClipboardLoseProc, 0)
+                       == True)
+        XtOwnSelection(g_ctx.widget, g_ctx.atomPrimary, CurrentTime,
+                       vboxClipboardConvertProc, NULL, 0);
+    else
     {
         LogFlow(("vboxClipboardFormatAnnounce: returning clipboard ownership to the guest\n"));
@@ -1222 +1226 @@
         g_ctx.eOwner = GUEST;
     }
-    XtOwnSelection(g_ctx.widget, g_ctx.atomPrimary, CurrentTime, vboxClipboardConvertProc,
-                   NULL, 0);
     LogFlowFunc(("returning\n"));
 }
@@ -1397 +1399 @@
         return VERR_NOT_SUPPORTED;
     }
-    g_ctx.eOwner = HOST;
+    /* Assume that if the guest clipboard already contains data then the
+     * user put it there for a reason. */
+    g_ctx.eOwner = GUEST;
     LogFlowFunc(("g_ctx.client=%u rc=%Rrc\n", g_ctx.client, rc));
     return rc;