Changeset 92833 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 5:06:38 PM (3 years ago)

Author:

vboxsync

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

148760

Message:

X11: Shared Clipboard: extend list of mime types, bugref:10160.

Add Firefox specific format application/x-moz-nativehtml to the
list of supported formats.

File:

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

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

@@ -121 +121 @@
     { "text/html",                          SHCLX11FMT_HTML,        VBOX_SHCL_FMT_HTML },
     { "text/html;charset=utf-8",            SHCLX11FMT_HTML,        VBOX_SHCL_FMT_HTML },
+    { "application/x-moz-nativehtml",       SHCLX11FMT_HTML,        VBOX_SHCL_FMT_HTML },
 
     { "image/bmp",                          SHCLX11FMT_BMP,         VBOX_SHCL_FMT_BITMAP },
@@ -1721 +1722 @@
     {
         char *pszFmts2 = ShClFormatsToStrA(pCtx->vboxFormats);
-        AssertPtrReturn(pszFmts2, VERR_NO_MEMORY);
-        LogRel(("Shared Clipboard: Converting VBox formats '%s' to '%s' for X11 (idxFmtX11=%u, fmtX11=%u) failed, rc=%Rrc\n",
-                pszFmts2, g_aFormats[idxFmtX11].pcszAtom, idxFmtX11, fmtX11, rc));
-        RTStrFree(pszFmts2);
+        char *pszAtomName = XGetAtomName(XtDisplay(pCtx->pWidget), *atomTarget);
+
+        LogRel(("Shared Clipboard: Converting VBox formats '%s' to '%s' for X11 (idxFmtX11=%u, fmtX11=%u, atomTarget='%s') failed, rc=%Rrc\n",
+                pszFmts2 ? pszFmts2 : "unknown", g_aFormats[idxFmtX11].pcszAtom, idxFmtX11, fmtX11, pszAtomName ? pszAtomName : "unknown", rc));
+
+        if (pszFmts2)
+            RTStrFree(pszFmts2);
+        if (pszAtomName)
+            XFree(pszAtomName);
     }