Changeset 50734 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Mar 10, 2014 1:54:03 PM (11 years ago)

Author:

vboxsync

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

92721

Message:

DnD: Bugfixes.

File:

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

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

@@ -45 +45 @@
  * their behavior. Don't have this enabled in release builds! */
 #ifdef DEBUG
-# define VBOX_DND_DEBUG_WND
+//# define VBOX_DND_DEBUG_WND
 #endif
 
@@ -76 +76 @@
  * the data in the specified mime-type. This data is send back to the host.
  * After that we send a XdndLeave event to the source window.
- * Todo:
- * - this isn't finished, yet. Currently the mouse isn't correctly released
- *   in the guest (both, when the drop was successfully or canceled).
- * - cancel (e.g. with the ESC key) doesn't work
+ * 
+ * To-do:
+ * - Cancelling (e.g. with ESC key) doesn't work.
  *
- * Todo:
- * - XdndProxy window support
- * - INCR support
- * - make this much more robust for crashes of the other party
- * - really check for the Xdnd version and the supported features
+ * To-do:
+ * - INCR (incremental transfers) support.
+ * - Make this much more robust for crashes of the other party.
+ * - Really check for the Xdnd version and the supported features.
  */
 
@@ -390 +388 @@
     void mouseButtonSet(Window wndDest, int rx, int ry, int iButton, bool fPress) const;
     int proxyWinShow(int *piRootX = NULL, int *piRootY = NULL, bool fMouseMove = false) const;
-    int proxyWinHide(void) const;
+    int proxyWinHide(void);
     void registerForEvents(Window w) const;
 
@@ -569 +567 @@
     m_curVer = -1;
     m_state  = Initialized;
+    m_eventQueue.clear();
 }
 
@@ -740 +739 @@
         case GH:
         {
-            //if (m_state == Dropped) 
-            //{
-                LogFlowThisFunc(("Enqueuing ClientMessage\n"));
-
-                m_eventQueue.append(e);
-                rc = RTSemEventSignal(m_hEventSem);
-            //}
-
-            //rc = VINF_SUCCESS;
+            LogFlowThisFunc(("Enqueuing ClientMessage\n"));
+
+            m_eventQueue.append(e);
+            rc = RTSemEventSignal(m_hEventSem);
             break;
         }
@@ -885 +879 @@
                     memcpy(&m_eventHgSelection, &e, sizeof(XEvent));
 
-                    const char *pcszFormat = xAtomToString(e.xselectionrequest.target).c_str();
-                    AssertPtr(pcszFormat);
-                    rc = VbglR3DnDHGRequestData(m_uClientID, pcszFormat);
+                    RTCString strFormat = xAtomToString(e.xselectionrequest.target);
+                    Assert(strFormat.isNotEmpty());
+                    rc = VbglR3DnDHGRequestData(m_uClientID, strFormat.c_str());
                     LogFlowThisFunc(("Requesting data from host as \"%s\", rc=%Rrc\n", 
-                                     pcszFormat, rc));
+                                     strFormat.c_str(), rc));
                 }
             }
@@ -936 +930 @@
     switch (e.type)
     {
+        case ButtonPress:
+            LogFlowThisFunc(("ButtonPress\n")); 
+            rc = VINF_SUCCESS;
+            break;
+
+        case ButtonRelease:
+            LogFlowThisFunc(("ButtonRelease\n")); 
+            rc = VINF_SUCCESS;
+            break;
+
+        case ClientMessage:    
+            rc = onX11ClientMessage(e); 
+            break;
+
+        case SelectionClear:
+           LogFlowThisFunc(("SelectionClear\n"));
+           reset();
+           rc = VINF_SUCCESS;
+           break;
+
         case SelectionNotify:
             rc = onX11SelectionNotify(e); 
@@ -943 +957 @@
             rc = onX11SelectionRequest(e); 
             break;
-
-        case ClientMessage:    
-            rc = onX11ClientMessage(e); 
-            break;
-
-        case SelectionClear:
-           LogFlowThisFunc(("SelectionClear\n")); 
-           rc = VINF_SUCCESS;
-           break;
 
         /*case MotionNotify: 
@@ -1135 +1140 @@
                                  0, 2, False, AnyPropertyType,
                                  &atmp, &fmt, &cItems, &cbRemaining, &pcData);
+
         if (RT_UNLIKELY(xrc != Success))
             LogFlowThisFunc(("Error in getting the window property: %s\n", gX11->xErrorToString(xrc).c_str()));
@@ -1146 +1152 @@
                 LogFlowThisFunc(("wndCursor=%#x, XdndAware=%u\n", newVer));
             }
+
             XFree(pcData);
         }
@@ -1153 +1160 @@
      * Is the window under the cursor another one than our current one?
      */
-    if (wndCursor != m_wndCur && m_curVer != -1)
+    if (   wndCursor != m_wndCur 
+        && m_curVer != -1)
     {
         LogFlowThisFunc(("Leaving window=%#x\n", m_wndCur));
@@ -1212 +1220 @@
          */
         Atom pa = toX11Action(uAction);
-        LogFlowThisFunc(("strAction='%s' ", xAtomToString(pa).c_str()));
+        LogFlowThisFunc(("strAction=%s\n", xAtomToString(pa).c_str()));
 
         XClientMessageEvent m;
@@ -1231 +1239 @@
     }
 
-    if (wndCursor == None && newVer == -1)
+    if (   wndCursor == None 
+        && newVer    == -1)
     {
         /* No window to process, so send a ignore ack event to the host. */
@@ -1356 +1365 @@
             AssertPtr(pEventClient);
 
-            LogFlowThisFunc(("Next X event is: %s\n", 
+            LogFlowThisFunc(("Received event=%s\n", 
                              gX11->xAtomToString(pEventClient->message_type).c_str()));
 
@@ -1370 +1379 @@
                 m_state = Dragging;
                 m_wndCur = wndSelection;
+                Assert(m_wndCur == pEventClient->data.l[0]);
 
                 LogFlowThisFunc(("XA_XdndEnter\n"));
@@ -1438 +1448 @@
                 XClientMessageEvent m;
                 RT_ZERO(m);
-
                 m.type         = ClientMessage;
                 m.display      = m_pDisplay;
-                m.window       = pEventClient->data.l[0];
+                m.window       = m_wndCur;
                 m.message_type = xAtom(XA_XdndStatus);
                 m.format       = 32;
                 m.data.l[0]    = m_wndProxy;
-                m.data.l[1]    = 1;
-                m.data.l[4]    = xAtom(XA_XdndActionCopy);
-
-                xRc = XSendEvent(m_pDisplay, pEventClient->data.l[0], 
+                m.data.l[1]    = RT_BIT(0); /* Accept the drop. */
+                m.data.l[4]    = xAtom(XA_XdndActionCopy); /** @todo Make the accepted action configurable. */
+
+                xRc = XSendEvent(m_pDisplay, m_wndCur, 
                                  False, 0, reinterpret_cast<XEvent*>(&m));
                 if (RT_UNLIKELY(xRc == 0))
@@ -1464 +1473 @@
                 m.type         = ClientMessage;
                 m.display      = m_pDisplay;
-                m.window       = pEventClient->data.l[0];
+                m.window       = m_wndCur;
                 m.message_type = xAtom(XA_XdndStatus);
                 m.format       = 32;
                 m.data.l[0]    = m_wndProxy;
-                m.data.l[1]    = 1;
-                m.data.l[4]    = pEventClient->data.l[4];
-
-                xRc = XSendEvent(m_pDisplay, pEventClient->data.l[0], 
+                m.data.l[1]    = RT_BIT(0); /* Accept the drop. */
+                m.data.l[4]    = xAtom(XA_XdndActionCopy); /** @todo Make the accepted action configurable. */
+
+                xRc = XSendEvent(m_pDisplay, m_wndCur, 
                                  False, 0, reinterpret_cast<XEvent*>(&m));
                 if (RT_UNLIKELY(xRc == 0))
@@ -1482 +1491 @@
         }
 
-        proxyWinHide();
-
         /* Do we need to acknowledge at least one format to the host? */
         if (!m_formats.isEmpty())
@@ -1527 +1534 @@
     /* We send a fake release event to the current window, cause
      * this should have the grab. */
-    mouseButtonSet(m_wndCur, iRootX, iRootY, 
+    mouseButtonSet(m_wndCur /* Source window */, iRootX, iRootY, 
                    1 /* Button */, false /* Release button */);
 
@@ -1542 +1549 @@
         /* Request to convert the selection in the specific format and
          * place it to our proxy window as property. */
-        Window srcWin = m_wndCur;//clme->data.l[0];
+        Window wndSource = evDnDDrop.data.l[0]; /* Source window which sent the message. */
+        Assert(wndSource == m_wndCur);
         Atom aFormat  = gX11->stringToxAtom(strFormat.c_str());
 
@@ -1554 +1562 @@
         if (waitForX11Msg(evSelNotify, SelectionNotify))
         {
+            bool fCancel = false;
+
             /* Make some paranoid checks. */
             if (   evSelNotify.xselection.type      == SelectionNotify
@@ -1616 +1626 @@
                                      strFormat.c_str(), rc));
 
-                    /* Confirm the result of the transfer to the source window. */
-                    XClientMessageEvent m;
-                    RT_ZERO(m);
-                    m.type         = ClientMessage;
-                    m.display      = m_pDisplay;
-                    m.window       = srcWin;
-                    m.message_type = xAtom(XA_XdndFinished);
-                    m.format       = 32;
-                    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(uAction) : None; /* Action used on success */
-
-                    int xrc = XSendEvent(m_pDisplay, srcWin, True, NoEventMask, reinterpret_cast<XEvent*>(&m));
-                    if (RT_UNLIKELY(xrc == 0))
-                        LogFlowThisFunc(("Error sending xEvent\n"));
+                    if (RT_SUCCESS(rc))
+                    {
+                        /* Confirm the result of the transfer to the source window. */
+                        XClientMessageEvent m;
+                        RT_ZERO(m);
+                        m.type         = ClientMessage;
+                        m.display      = m_pDisplay;
+                        m.window       = m_wndProxy;
+                        m.message_type = xAtom(XA_XdndFinished);
+                        m.format       = 32;
+                        m.data.l[0]    = m_wndProxy; /* Target window. */
+                        m.data.l[1]    = 0; /* Don't accept the drop to not make the guest stuck. */
+                        m.data.l[2]    = RT_SUCCESS(rc) ? toX11Action(uAction) : None; /* Action used on success */
+
+                        int xrc = XSendEvent(m_pDisplay, wndSource, True, NoEventMask, reinterpret_cast<XEvent*>(&m));
+                        if (RT_UNLIKELY(xrc == 0))
+                            LogFlowThisFunc(("Error sending xEvent\n"));
+                    }
+                    else
+                        fCancel = true;
                 }
                 else
@@ -1642 +1657 @@
                     else
                     {
-                        AssertMsgFailed(("Not supported data type\n"));
+                        AssertMsgFailed(("Not supported data type (%s)\n", 
+                                         gX11->xAtomToString(aPropType).c_str()));
                         rc = VERR_INVALID_PARAMETER;
                     }
+
+                    fCancel = true;
+                }
+
+                if (fCancel) 
+                {
+                    LogFlowFunc(("Cancelling drop ...\n"));
 
                     /* Cancel this. */
@@ -1651 +1674 @@
                     m.type         = ClientMessage;
                     m.display      = m_pDisplay;
-                    m.window       = srcWin;
+                    m.window       = m_wndProxy;
                     m.message_type = xAtom(XA_XdndFinished);
                     m.format       = 32;
-                    m.data.l[0]    = m_wndProxy;
-                    m.data.l[1]    = 0;
-                    m.data.l[2]    = None;
-
-                    int xrc = XSendEvent(m_pDisplay, srcWin, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
+                    m.data.l[0]    = m_wndProxy; /* Target window. */
+                    m.data.l[1]    = 0; /* Don't accept the drop to not make the guest stuck. */
+
+                    int xrc = XSendEvent(m_pDisplay, wndSource, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
                     if (RT_UNLIKELY(xrc == 0))
-                        LogFlowThisFunc(("Error sending xEvent\n"));
-                    m_wndCur = 0;
+                        LogFlowThisFunc(("Error sending cancel event\n"));
                 }
 
@@ -1848 +1869 @@
 }
 
-int DragInstance::proxyWinHide(void) const
-{
-    LogFlowThisFuncEnter();
-    return 0;
+int DragInstance::proxyWinHide(void)
+{
+    LogFlowFuncEnter();
 
     XUnmapWindow(m_pDisplay, m_wndProxy);
+    m_eventQueue.clear();
 
     return VINF_SUCCESS; /** @todo Add error checking. */