vbox的更動 97826 路徑 trunk/src/VBox/Additions/x11

時間撮記:

2022-12-16 下午02:43:00 (2 年 以前)

作者:

vboxsync

訊息:

DnD/Additions/VBoxClient: Filter out the default X11-specific formats (required for Xdnd, 'TARGET' / 'MULTIPLE') when reporting formats to the host. Those formats are not part of the supported VirtualBox drag'n drop anyway. Related to r154902.

檔案:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (修改) (6 筆差異)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -314 +314 @@
     }
 
+    /**
+     * Returns a filtered X11 atom list.
+     *
+     * @returns Filtered list.
+     * @param   formatList      Atom list to convert.
+     * @param   filterList      Atom list to filter out.
+     */
+    inline VBoxDnDAtomList xAtomListFiltered(const VBoxDnDAtomList &formatList, const VBoxDnDAtomList &filterList)
+    {
+        VBoxDnDAtomList tempList = formatList;
+        tempList.filter(filterList);
+        return tempList;
+    }
+
     RTCString xErrorToString(int xRc) const;
     Window applicationWindowBelowCursor(Window parentWin) const;
@@ -640 +654 @@
      *  Set to -1 if not set yet. */
     int                         m_lastMouseY;
+    /** List of default (Atom) formats required for X11 Xdnd handling.
+     *  This list will be included by \a m_lstAtomFormats. */
+    VBoxDnDAtomList             m_lstAtomFormatsX11;
     /** List of (Atom) formats the current source/target window supports. */
     VBoxDnDAtomList             m_lstAtomFormats;
@@ -735 +752 @@
     , m_enmState(Uninitialized)
 {
+    /* Append default targets we support.
+     * Note: The order is sorted by preference; be careful when changing this. */
+    m_lstAtomFormatsX11.append(xAtom(XA_TARGETS));
+    m_lstAtomFormatsX11.append(xAtom(XA_MULTIPLE));
+    /** @todo Support INC (incremental transfers). */
 }
 
@@ -805 +827 @@
         m_lstAtomActions.clear();
 
-        /* First, clear the formats list. */
+        /* First, clear the formats list and apply the X11-specific default formats,
+         * required for making Xdnd to work. */
         m_lstAtomFormats.clear();
-        /* Append default targets we support.
-         * Note: The order is sorted by preference; be careful when changing this. */
-        m_lstAtomFormats.append(xAtom(XA_TARGETS));
-        m_lstAtomFormats.append(xAtom(XA_MULTIPLE));
-        /** @todo Support INC (incremental transfers). */
+        m_lstAtomFormats.append(m_lstAtomFormatsX11);
 
         m_wndCur                 = 0;
@@ -2335 +2354 @@
     if (RT_SUCCESS(rc2))
     {
-        RTCString strFormatsCur = gX11->xAtomListToString(m_lstAtomFormats);
-        if (!strFormatsCur.isEmpty())
-        {
-            strFormats   = strFormatsCur;
+        /* Filter out the default X11-specific formats (required for Xdnd, 'TARGET' / 'MULTIPLE');
+         * those will not be supported by VirtualBox. */
+        VBoxDnDAtomList const lstAtomFormatsFiltered = gX11->xAtomListFiltered(m_lstAtomFormats, m_lstAtomFormatsX11);
+
+        /* Anything left to report to the host? */
+        if (lstAtomFormatsFiltered.size())
+        {
+            strFormats       = gX11->xAtomListToString(lstAtomFormatsFiltered);
             dndActionDefault = VBOX_DND_ACTION_COPY; /** @todo Handle default action! */
             dndActionList    = VBOX_DND_ACTION_COPY; /** @todo Ditto. */
@@ -2345 +2368 @@
 
         RTCritSectLeave(&m_dataCS);
+    }
+
+    if (g_cVerbosity)
+    {
+        char *pszActions = DnDActionListToStrA(dndActionList);
+        AssertPtrReturn(pszActions, VERR_NO_MEMORY);
+        VBClLogVerbose(1, "Reporting formats '%s' (actions '%s' / %#x, default action is '%s' (%#x)\n",
+                       strFormats.c_str(), pszActions, dndActionList, DnDActionToStr(dndActionDefault), dndActionDefault);
+        RTStrFree(pszActions);
     }