Changeset 46335 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

May 30, 2013 7:48:09 PM (12 years ago)

Author:

vboxsync

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

86113

Message:

GuestHost/SharedClipboard/X11: some separation of logic and host API.

File:

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

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

@@ -130 +130 @@
     for (unsigned i = 0; i < RT_ELEMENTS(g_aFormats); ++i)
         if (clipAtomForX11Format(pCtx, i) == atomFormat)
+            return i;
+    return NIL_CLIPX11FORMAT;
+}
+
+/** Lookup the X11 format matching a given X11 atom text.
+ * @returns the format on success, NIL_CLIPX11FORMAT on failure
+ * @param   widget a valid Xt widget
+ */
+static CLIPX11FORMAT clipFindX11FormatByAtomText(CLIPBACKEND *pCtx, const char *pcsz)
+{
+    for (unsigned i = 0; i < RT_ELEMENTS(g_aFormats); ++i)
+        if (!strcmp(g_aFormats[i].pcszAtom, pcsz))
             return i;
     return NIL_CLIPX11FORMAT;
@@ -338 +350 @@
  */
 static CLIPX11FORMAT clipGetTextFormatFromTargets(CLIPBACKEND *pCtx,
-                                                  Atom *pTargets,
+                                                  CLIPX11FORMAT *pTargets,
                                                   size_t cTargets)
 {
@@ -347 +359 @@
     for (unsigned i = 0; i < cTargets; ++i)
     {
-        CLIPX11FORMAT format = clipFindX11FormatByAtom(pCtx, pTargets[i]);
+        CLIPX11FORMAT format = pTargets[i];
         if (format != NIL_CLIPX11FORMAT)
         {
@@ -366 +378 @@
 {
     bool success = true;
-    Atom targets[2];
+    CLIPX11FORMAT targets[2];
     CLIPX11FORMAT x11Format;
-    targets[0] = clipGetAtom(pCtx, "text/plain");
-    targets[1] = clipGetAtom(pCtx, "TARGETS");
-    x11Format = clipGetTextFormatFromTargets(pCtx, targets, 3);
+    targets[0] = clipFindX11FormatByAtomText(pCtx, "text/plain");
+    targets[1] = clipFindX11FormatByAtomText(pCtx, "image/bmp");
+    x11Format = clipGetTextFormatFromTargets(pCtx, targets, 2);
     if (clipRealFormatForX11Format(x11Format) != TEXT)
         success = false;
-    targets[0] = clipGetAtom(pCtx, "UTF8_STRING");
-    targets[1] = clipGetAtom(pCtx, "text/plain");
-    x11Format = clipGetTextFormatFromTargets(pCtx, targets, 3);
+    targets[0] = clipFindX11FormatByAtomText(pCtx, "UTF8_STRING");
+    targets[1] = clipFindX11FormatByAtomText(pCtx, "text/plain");
+    x11Format = clipGetTextFormatFromTargets(pCtx, targets, 2);
     if (clipRealFormatForX11Format(x11Format) != UTF8)
         success = false;
@@ -391 +403 @@
  */
 static CLIPX11FORMAT clipGetBitmapFormatFromTargets(CLIPBACKEND *pCtx,
-                                                    Atom *pTargets,
+                                                    CLIPX11FORMAT *pTargets,
                                                     size_t cTargets)
 {
@@ -400 +412 @@
     for (unsigned i = 0; i < cTargets; ++i)
     {
-        CLIPX11FORMAT format = clipFindX11FormatByAtom(pCtx, pTargets[i]);
+        CLIPX11FORMAT format = pTargets[i];
         if (format != NIL_CLIPX11FORMAT)
         {
@@ -423 +435 @@
  * @param  cTargets  the size of the list in @a pTargets
  */
-static void clipGetFormatsFromTargets(CLIPBACKEND *pCtx, Atom *pTargets,
-                                      size_t cTargets)
+static void clipGetFormatsFromTargets(CLIPBACKEND *pCtx,
+                                      CLIPX11FORMAT *pTargets, size_t cTargets)
 {
     AssertPtrReturnVoid(pCtx);
@@ -434 +446 @@
     {
         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]);
-                LogRel2(("%s: found target %s\n", __PRETTY_FUNCTION__, pszName));
-                XFree(pszName);
-            }
-#endif
     }
     pCtx->X11BitmapFormat = INVALID;  /* not yet supported */
@@ -460 +462 @@
  * @param  cTargets  the size of the array @a pTargets
  */
-static void clipUpdateX11Targets(CLIPBACKEND *pCtx, Atom *pTargets,
+static void clipUpdateX11Targets(CLIPBACKEND *pCtx, CLIPX11FORMAT *pTargets,
                                  size_t cTargets)
 {
@@ -475 +477 @@
  * @note  callback for XtGetSelectionValue
  */
-static void clipConvertX11Targets(Widget, XtPointer pClientData,
+static void clipConvertX11Targets(Widget widget, XtPointer pClientData,
                                   Atom * /* selection */, Atom *atomType,
                                   XtPointer pValue, long unsigned int *pcLen,
@@ -484 +486 @@
     LogRel2(("clipConvertX11Targets: pValue=%p, *pcLen=%u, *atomType=%d, XT_CONVERT_FAIL=%d\n",
              pValue, *pcLen, *atomType, XT_CONVERT_FAIL));
+    CLIPX11FORMAT *pFormats = NULL;
+    if (*pcLen)
+    {
+        pFormats = (CLIPX11FORMAT *)RTMemAllocZ(*pcLen * sizeof(CLIPX11FORMAT));
+        if (!pFormats)
+        {
+            XtFree((char *)pValue);
+            return;
+        }
+    }
+    if (pValue)
+    {
+        Atom *pAtoms = (Atom *)pValue;
+        unsigned i, j;
+#if defined(DEBUG) && !defined(TESTCASE)
+        for (i = 0; i < *pcLen; ++i)
+            if (pAtoms[i])
+            {
+                char *pszName = XGetAtomName(XtDisplay(widget), pAtoms[i]);
+                LogRel2(("%s: found target %s\n", __PRETTY_FUNCTION__,
+                         pszName));
+                XFree(pszName);
+            }
+#endif
+        for (i = 0; i < *pcLen; ++i)
+            for (j = 0; j < RT_ELEMENTS(g_aFormats); ++j)
+            {
+                Atom target = XInternAtom(XtDisplay(widget),
+                                          g_aFormats[j].pcszAtom, False);
+                if (*(pAtoms + i) == target)
+                    pFormats[i] = j;
+            }
+    }
     pCtx->fBusy = false;
     if (pCtx->fUpdateNeeded)
@@ -497 +532 @@
         {
             clipReportEmptyX11CB(pCtx);
+            RTMemFree(pFormats);
             return;
         }
-        clipUpdateX11Targets(pCtx, (Atom *)pValue, *pcLen);
-    }
+        clipUpdateX11Targets(pCtx, pFormats, *pcLen);
+    }
+    RTMemFree(pFormats);
     XtFree(reinterpret_cast<char *>(pValue));
 }
@@ -1917 +1954 @@
 static void clipSendTargetUpdate(CLIPBACKEND *pCtx)
 {
-    clipUpdateX11Targets(pCtx, g_selTarget, RT_ELEMENTS(g_selTarget));
+    CLIPX11FORMAT selTarget[RT_ELEMENTS(g_selTarget)];
+    unsigned i, j;
+    RT_ZERO(selTarget);
+    for (i = 0; i < RT_ELEMENTS(g_selTarget); ++i)
+        for (j = 0; j < RT_ELEMENTS(g_aFormats); ++j)
+            if (XInternAtom(NULL, g_aFormats[j].pcszAtom, 0) == g_selTarget[i])
+                selTarget[i] = j;
+    clipUpdateX11Targets(pCtx, selTarget, RT_ELEMENTS(selTarget));
 }