Changeset 21184 in vbox for trunk/src

Timestamp:

Jul 2, 2009 9:53:03 PM (16 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard: fix broken code for selecting the format to request from X11 and add a test for that code

File:

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

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

@@ -62 +62 @@
     INVALID = 0,
     TARGETS,
+    TEXT,  /* Treat this as Utf8, but it may really be ascii */
     CTEXT,
     UTF8
@@ -85 +86 @@
     { "text/plain;charset=utf-8", UTF8,
       VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "STRING", UTF8, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "TEXT", UTF8, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "text/plain", UTF8, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
+    { "STRING", TEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
+    { "TEXT", TEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
+    { "text/plain", TEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
     { "COMPOUND_TEXT", CTEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT }
 };
@@ -333 +334 @@
     bool changed = false;
     CLIPX11FORMAT bestTextFormat = NIL_CLIPX11FORMAT;
+    CLIPFORMAT enmBestTextTarget = INVALID;
     AssertPtrReturnVoid(pCtx);
     AssertPtrReturnVoid(pTargets);
     for (unsigned i = 0; i < cTargets; ++i)
     {
-        CLIPFORMAT enmBestTextTarget = INVALID;
         CLIPX11FORMAT format = clipFindX11FormatByAtom(pCtx->widget,
                                                        pTargets[i]);
@@ -355 +356 @@
         changed = true;
         pCtx->X11TextFormat = bestTextFormat;
+#if defined(DEBUG) && !defined(TESTCASE)
+        for (unsigned i = 0; i < cTargets; ++i)
+            if (pTargets[i])
+            {
+                char *pszName = XGetAtomName(XtDisplay(pCtx->widget),
+                                                   pTargets[i]);
+                Log2(("%s: found target %s\n", __PRETTY_FUNCTION__, pszName));
+                XFree(pszName);
+            }
+#endif
     }
     pCtx->X11BitmapFormat = INVALID;  /* not yet supported */
@@ -959 +970 @@
                                                       *atomTarget);
     CLIPFORMAT format = clipRealFormatForX11Format(x11Format);
-    if (   ((format == UTF8) || (format == CTEXT))
+    if (   ((format == UTF8) || (format == CTEXT) || (format == TEXT))
         && (pCtx->vboxFormats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT))
     {
@@ -969 +980 @@
         if (RT_SUCCESS(rc) && (cb == 0))
             rc = VERR_NO_DATA;
-        if (RT_SUCCESS(rc) && (format == UTF8))
+        if (RT_SUCCESS(rc) && ((format == UTF8) || (format == TEXT)))
             rc = clipWinTxtToUtf8ForX11CB(XtDisplay(pCtx->widget),
                                           (PRTUTF16)pv, cb, atomTarget,
@@ -1395 +1406 @@
                 break;
             case UTF8:
+            case TEXT:
             {
                 /* If we are given broken Utf-8, we treat it as Latin1.  Is
@@ -1515 +1527 @@
 #ifdef TESTCASE
 
+/** @todo This unit test currently works by emulating the X11 and X toolkit
+ * APIs to exercise the code, since I didn't want to rewrite the code too much
+ * when I wrote the tests.  However, this makes it rather ugly and hard to
+ * understand.  Anyone doing any work on the code should feel free to
+ * rewrite the tests and the code to make them cleaner and more readable. */
+
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
@@ -1755 +1773 @@
 /* The current values of the X selection, which will be returned to the
  * XtGetSelectionValue callback. */
-static Atom g_selTarget = 0;
+static Atom g_selTarget[3] = { 0 };
 static Atom g_selType = 0;
 static const void *g_pSelData = NULL;
@@ -1773 +1791 @@
             && selection != clipGetAtom(NULL, "CLIPBOARD")
             && selection != clipGetAtom(NULL, "TARGETS"))
-        || (   target != g_selTarget
+        || (   target != g_selTarget[0]
             && target != clipGetAtom(NULL, "TARGETS")))
     {
         /* Otherwise this is probably a caller error. */
-        Assert(target != g_selTarget);
+        Assert(target != g_selTarget[0]);
         callback(widget, closure, &selection, &type, NULL, &count, &format);
                 /* Could not convert to target. */
@@ -1790 +1808 @@
             pValue = (XtPointer) RTMemDup(&g_selTarget, sizeof(g_selTarget));
         type = g_fTargetsTimeout ? XT_CONVERT_FAIL : XA_ATOM;
-        count = g_fTargetsFailure ? 0 : 1;
+        count = g_fTargetsFailure ? 0 : RT_ELEMENTS(g_selTarget);
         format = 32;
     }
@@ -1888 +1906 @@
 {
     Atom clipAtom = clipGetAtom(NULL, "CLIPBOARD");
-    g_selTarget = clipGetAtom(NULL, pcszTarget);
+    g_selTarget[0] = clipGetAtom(NULL, pcszTarget);
+    g_selTarget[1] = clipGetAtom(NULL, "text/plain");
+    g_selTarget[2] = clipGetAtom(NULL, "TARGETS");
     g_selType = type;
     g_pSelData = data;