Changeset 3126 in vbox for trunk

Timestamp:

Jun 15, 2007 4:54:53 PM (18 years ago)

Author:

vboxsync

Message:

Fixes to the Linux shared clipboard

File:

• trunk/src/VBox/Additions/linux/xclient/clipboard.cpp (modified) (6 diffs)

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

@@ -133 +133 @@
     /** X11 atom refering to the clipboard: TIMESTAMP */
     Atom atomTimestamp;
+    /** X11 atom refering to the clipboard utf16 text format: text/plain;charset=ISO-10646-UCS-2 */
+    Atom atomUtf16;
+    /** X11 atom refering to the clipboard utf8 text format: UTF8_STRING */
+    Atom atomUtf8;
 
     /** A list of the X11 formats which we support, mapped to our identifier for them, in the order
@@ -947 +951 @@
            pu16GuestText + 1));
     RTMemFree(reinterpret_cast<void *>(pu16HostText));
-    *atomTypeReturn = XA_STRING;
+    *atomTypeReturn = g_ctx.atomUtf16;
     *pValReturn = reinterpret_cast<XtPointer>(pu16GuestText);
     *pcLenReturn = cwGuestText * 2;
@@ -1028 +1032 @@
     RTMemFree(reinterpret_cast<char *>(pu16HostText));
     RTMemFree(reinterpret_cast<char *>(pu16GuestText));
-    *atomTypeReturn = XA_STRING;
+    *atomTypeReturn = g_ctx.atomUtf8;
     *pValReturn = reinterpret_cast<XtPointer>(pcGuestText);
     *pcLenReturn = cbGuestText;
@@ -1183 +1187 @@
     LogFlowFunc(("giving the guest clipboard ownership\n"));
     g_ctx.eOwner = GUEST;
+    g_ctx.notifyHost = true;
     LogFlowFunc(("returning\n"));
 }
@@ -1207 +1212 @@
     g_ctx.guestBitmapFormat = INVALID;
     if (XtOwnSelection(g_ctx.widget, g_ctx.atomClipboard, CurrentTime, vboxClipboardConvertProc,
-                       vboxClipboardLoseProc, 0) == True)
-    {
-        /* We set this so that the host gets notified when we take the clipboard, even if no
-          guest formats are found which we understand. */
+                       vboxClipboardLoseProc, 0) != True)
+    {
+        Log2 (("vboxClipboardFormatAnnounce: returning clipboard ownership to the guest\n"));
         g_ctx.notifyHost = true;
-    }
-    else
-    {
-        Log2 (("vboxClipboardFormatAnnounce: returning clipboard ownership to the guest\n"));
         g_ctx.eOwner = GUEST;
     }
@@ -1523 +1523 @@
     g_ctx.atomMultiple  = XInternAtom(XtDisplay(g_ctx.widget), "MULTIPLE",  false);
     g_ctx.atomTimestamp = XInternAtom(XtDisplay(g_ctx.widget), "TIMESTAMP", false);
+    g_ctx.atomUtf16     = XInternAtom(XtDisplay(g_ctx.widget),
+                                      "text/plain;charset=ISO-10646-UCS-2", false);
+    g_ctx.atomUtf8      = XInternAtom(XtDisplay(g_ctx.widget), "UTF_STRING", false);
     /* And build up the vector of supported formats */
 #ifdef USE_UTF16