Changeset 50593 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Feb 26, 2014 8:44:58 AM (11 years ago)

Author:

vboxsync

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

92464

Message:

DnD: Bugfixes for Linux hosts.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (21 diffs)

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

@@ -1034 +1034 @@
 }
 
-
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-/*
- * Guest -> Host
- */
-
 int DragInstance::ghIsDnDPending(void)
 {
@@ -1084 +1079 @@
                 else
                 {
-                    xrc = XGetWindowProperty(m_pDisplay, wndOwner, xAtom(XA_XdndTypeList), 0, VBOX_MAX_XPROPERTIES, False, XA_ATOM, &type, &f, &n, &a, &ret);
+                    xrc = XGetWindowProperty(m_pDisplay, wndOwner, 
+                                             xAtom(XA_XdndTypeList), 
+                                             0, VBOX_MAX_XPROPERTIES, 
+                                             False, XA_ATOM, &type, &f, &n, &a, &ret);
                     if (   xrc == Success
                         && n > 0
@@ -1098 +1096 @@
                     }
                 }
+
                 /* Fetch the possible list of actions, if this property is set. */
-                xrc = XGetWindowProperty(m_pDisplay, wndOwner, xAtom(XA_XdndActionList), 0, VBOX_MAX_XPROPERTIES, False, XA_ATOM, &type, &f, &n, &a, &ret);
+                xrc = XGetWindowProperty(m_pDisplay, wndOwner, 
+                                         xAtom(XA_XdndActionList), 
+                                         0, VBOX_MAX_XPROPERTIES, 
+                                         False, XA_ATOM, &type, &f, &n, &a, &ret);
                 if (   xrc == Success
                     && n > 0
@@ -1110 +1112 @@
                         m_actions.append(data[i]);
                     }
+
                     XFree(ret);
                 }
@@ -1115 +1118 @@
                 m_state = Dragging;
                 m_mode  = GH;
+
                 /* Acknowledge the event by sending a Status msg back to the
                  * window. */
@@ -1152 +1156 @@
             }
         }
+
         hideProxyWin();
 
-        rc = VbglR3DnDGHAcknowledgePending(DND_COPY_ACTION, toHGCMActions(m_actions),
+        rc = VbglR3DnDGHAcknowledgePending(m_uClientID, DND_COPY_ACTION, toHGCMActions(m_actions),
                                            gX11->xAtomListToString(m_formats).c_str());
     }
@@ -1162 +1167 @@
 }
 
-int DragInstance::ghDropped(const RTCString &strFormat, uint32_t action)
-{
-    LogFlowThisFunc(("format='%s' action=%d\n", strFormat.c_str(), action));
+int DragInstance::ghDropped(const RTCString &strFormat, uint32_t uAction)
+{
+    LogFlowThisFunc(("strFormat=%s, uAction=%RU32\n", 
+                     strFormat.c_str(), uAction));
+
     int rc = VINF_SUCCESS;
 
@@ -1171 +1178 @@
     showProxyWin(rx, ry);
     XFlush(m_pDisplay);
+
     /* We send a fake release event to the current window, cause
      * this should have the grab. */
     sendButtonEvent(m_wndCur, rx, ry, 1, false);
+
     /* The fake button release event, should lead to an XdndDrop event from the
      * source. Because of the showing of the proxy window, sometimes other Xdnd
@@ -1181 +1190 @@
     XClientMessageEvent *clme = 0;
     RT_ZERO(e);
-    int tries = 3;
-    do
+
+    int cRetries = 3;
+    for (int i = 0; i < cRetries; i++) 
     {
         if (m_pParent->waitForXMsg(e, ClientMessage))
@@ -1192 +1202 @@
             }
         }
-    } while (tries--);
+    }
+
     if (clme)
     {
@@ -1202 +1213 @@
             Window srcWin = m_wndCur;//clme->data.l[0];
             Atom aFormat  = gX11->stringToxAtom(strFormat.c_str());
-            XConvertSelection(m_pDisplay, xAtom(XA_XdndSelection), aFormat, xAtom(XA_XdndSelection), m_wndProxy, clme->data.l[2]);
+
+            XConvertSelection(m_pDisplay, xAtom(XA_XdndSelection), 
+                              aFormat, xAtom(XA_XdndSelection), 
+                              m_wndProxy, clme->data.l[2]);
+
             /* Wait for the selection notify event. */
             RT_ZERO(e);
@@ -1215 +1230 @@
                 {
                     LogFlowThisFunc(("Selection notfiy (from: %x)\n", m_wndCur));
+
                     Atom type;
                     int format;
@@ -1242 +1258 @@
                                 memcpy(ucData1, ucData, cbData);
                                 ucData1[cbData++] = '\0';
+
                                 /* Got the data and its fully transfered. */
-                                rc = VbglR3DnDGHSendData(ucData1, cbData);
+                                rc = VbglR3DnDGHSendData(m_uClientID, strFormat.c_str(), 
+                                                         ucData1, cbData);
                                 RTMemFree(ucData1);
                             }
@@ -1250 +1268 @@
                         }
                         else
+                        {
                             /* Just send the data to the host. */
-                            rc = VbglR3DnDGHSendData(ucData, cbData);
+                            rc = VbglR3DnDGHSendData(m_uClientID, strFormat.c_str(),
+                                                     ucData, cbData);
+                        }
 
                         LogFlowThisFunc(("send responce\n"));
@@ -1264 +1285 @@
                         m.data.l[0]    = m_wndProxy;
                         m.data.l[1]    = RT_SUCCESS(rc) ?                   1 : 0;    /* Confirm or deny success */
-                        m.data.l[2]    = RT_SUCCESS(rc) ? toX11Action(action) : None; /* Action used on success */
+                        m.data.l[2]    = RT_SUCCESS(rc) ? toX11Action(uAction) : None; /* Action used on success */
 
                         int xrc = XSendEvent(m_pDisplay, srcWin, True, NoEventMask, reinterpret_cast<XEvent*>(&m));
@@ -1274 +1295 @@
                         if (type == xAtom(XA_INCR))
                         {
-                            /* Todo: */
+                            /** @todo Support incremental transfers. */
                             AssertMsgFailed(("Incrementally transfers are not supported, yet\n"));
                             rc = VERR_NOT_IMPLEMENTED;
@@ -1283 +1304 @@
                             rc = VERR_INVALID_PARAMETER;
                         }
+
                         /* Cancel this. */
                         XClientMessageEvent m;
@@ -1294 +1316 @@
                         m.data.l[1]    = 0;
                         m.data.l[2]    = None;
+
                         int xrc = XSendEvent(m_pDisplay, srcWin, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
                         if (RT_UNLIKELY(xrc == 0))
@@ -1299 +1322 @@
                         m_wndCur = 0;
                     }
+
                     /* Cleanup */
                     if (ucData)
@@ -1315 +1339 @@
         rc = VERR_TIMEOUT;
 
-    /* Inform the host on error */
+    /* Inform the host on error. */
     if (RT_FAILURE(rc))
-        VbglR3DnDGHSendError(rc);
+        VbglR3DnDGHSendError(m_uClientID, rc);
 
     /* At this point, we have either successfully transfered any data or not.
@@ -1326 +1350 @@
     return rc;
 }
-
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */