Changeset 8951 in vbox for trunk

Timestamp:

May 20, 2008 12:31:51 PM (17 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard and Additions/x11: support middle-button pasting (but not copying) in X11 guests and hosts

Location:

trunk/src/VBox

Files:

• Additions/x11/xclient/clipboard.cpp (modified) (4 diffs)
• HostServices/SharedClipboard/x11.cpp (modified) (4 diffs)

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

@@ -93 +93 @@
     /** X11 atom refering to the clipboard: CLIPBOARD */
     Atom atomClipboard;
+    /** X11 atom refering to the selection: PRIMARY */
+    Atom atomPrimary;
     /** X11 atom refering to the clipboard: TARGETS */
     Atom atomTargets;
@@ -1127 +1129 @@
 
     LogFlowFunc(("\n"));
-    if (*atomSelection != g_ctx.atomClipboard)
+    if (   (*atomSelection != g_ctx.atomClipboard)
+        && (*atomSelection != g_ctx.atomPrimary)
+       )
     {
         LogFlowFunc(("rc = false\n"));
@@ -1217 +1221 @@
         g_ctx.eOwner = GUEST;
     }
+    XtOwnSelection(g_ctx.widget, g_ctx.atomPrimary, CurrentTime, vboxClipboardConvertProc,
+                   NULL, 0);
     LogFlowFunc(("returning\n"));
 }
@@ -1430 +1436 @@
     /* Get hold of the atoms which we need */
     g_ctx.atomClipboard = XInternAtom(XtDisplay(g_ctx.widget), "CLIPBOARD", false /* only_if_exists */);
+    g_ctx.atomPrimary   = XInternAtom(XtDisplay(g_ctx.widget), "PRIMARY",   false);
     g_ctx.atomTargets   = XInternAtom(XtDisplay(g_ctx.widget), "TARGETS",   false);
     g_ctx.atomMultiple  = XInternAtom(XtDisplay(g_ctx.widget), "MULTIPLE",  false);

trunk/src/VBox/HostServices/SharedClipboard/x11.cpp

@@ -97 +97 @@
     /** X11 atom refering to the clipboard: CLIPBOARD */
     Atom atomClipboard;
+    /** X11 atom refering to the selection: PRIMARY */
+    Atom atomPrimary;
     /** X11 atom refering to the clipboard targets: TARGETS */
     Atom atomTargets;
@@ -724 +726 @@
     /* Get hold of the atoms which we need */
     g_ctx.atomClipboard = XInternAtom(XtDisplay(g_ctx.widget), "CLIPBOARD", false /* only_if_exists */);
+    g_ctx.atomPrimary   = XInternAtom(XtDisplay(g_ctx.widget), "PRIMARY",   false);
     g_ctx.atomTargets   = XInternAtom(XtDisplay(g_ctx.widget), "TARGETS",   false);
     g_ctx.atomMultiple  = XInternAtom(XtDisplay(g_ctx.widget), "MULTIPLE",  false);
@@ -1230 +1233 @@
 
     LogFlowFunc(("\n"));
-    if (*atomSelection != g_ctx.atomClipboard)
+    if (   (*atomSelection != g_ctx.atomClipboard)
+        && (*atomSelection != g_ctx.atomPrimary)
+       )
     {
         LogFlowFunc(("rc = false\n"));
@@ -1327 +1332 @@
         g_ctx.eOwner = HOST;
     }
+    XtOwnSelection(g_ctx.widget, g_ctx.atomPrimary, CurrentTime, vboxClipboardConvertProc,
+                   NULL, 0);
     LogFlowFunc(("returning\n"));