Changeset 35740 in vbox for trunk/src

Timestamp:

Jan 27, 2011 2:36:03 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Prevent the mouse from leaving the window in capture mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.h (modified) (4 diffs)
• runtime/UIKeyboardHandler.cpp (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (10 diffs)
• runtime/UIMouseHandler.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -332 +332 @@
 
     return size;
+}
+
+bool darwinMouseMoveEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser)
+{
+    NSEvent *pEvent = (NSEvent*)pvCocoaEvent;
+    NSEventType EvtType = [pEvent type];
+    NSWindow *pWin = ::darwinToNativeWindow((QWidget*)pvUser);
+    if (   pWin == [pEvent window]
+        && (   EvtType == NSLeftMouseDown
+            || EvtType == NSLeftMouseUp
+            || EvtType == NSRightMouseDown
+            || EvtType == NSRightMouseUp
+            || EvtType == NSOtherMouseDown
+            || EvtType == NSOtherMouseUp
+            || EvtType == NSLeftMouseDragged
+            || EvtType == NSRightMouseDragged
+            || EvtType == NSOtherMouseDragged
+            || EvtType == NSMouseMoved
+            || EvtType == NSScrollWheel))
+    {
+        float x = [pEvent deltaX];
+        float y = [pEvent deltaY];
+        /* Get the buttons which where pressed when this event occurs. We have
+           to use Carbon here, cause the Cocoa method [NSEvent pressedMouseButtons]
+           is >= 10.6. */
+        if (EvtType == NSScrollWheel)
+        {
+            /* In the scroll wheel case we have to do some magic, cause a
+               normal scroll wheel on a mouse behaves different to a trackpad.
+               The following is used within Qt. We use the same to get a
+               similar behavior. */
+            if ([pEvent respondsToSelector:@selector(deviceDeltaX:)])
+                x = (float)(intptr_t)[pEvent performSelector:@selector(deviceDeltaX)] * 2;
+            else
+                x = qBound(-120, (int)(x * 10000), 120);
+            if ([pEvent respondsToSelector:@selector(deviceDeltaY:)])
+                y = (float)(intptr_t)[pEvent performSelector:@selector(deviceDeltaY)] * 2;
+            else
+                y = qBound(-120, (int)(y * 10000), 120);
+        }
+        uint32 buttonMask = 0;
+        GetEventParameter((EventRef)pvCarbonEvent, kEventParamMouseChord, typeUInt32, 0,
+                          sizeof(buttonMask), 0, &buttonMask);
+        /* Produce a Qt event out of our info. */
+        ::darwinSendDeltaEvents((QWidget*)pvUser, EvtType, [pEvent buttonNumber], buttonMask, x, y);
+        return true;
+    }
+    return false;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -340 +340 @@
 {
     UICocoaApplication::instance()->unregisterForNativeEvents(RT_BIT_32(3) /* NSRightMouseDown */, ::darwinUnifiedToolbarEvents, pWindow);
+}
+
+void darwinMouseGrab(QWidget *pWidget)
+{
+    CGAssociateMouseAndMouseCursorPosition(false);
+    UICocoaApplication::instance()->registerForNativeEvents(RT_BIT_32(1)  | /* NSLeftMouseDown */
+                                                            RT_BIT_32(2)  | /* NSLeftMouseUp */
+                                                            RT_BIT_32(3)  | /* NSRightMouseDown */
+                                                            RT_BIT_32(4)  | /* NSRightMouseUp */
+                                                            RT_BIT_32(5)  | /* NSMouseMoved */
+                                                            RT_BIT_32(6)  | /* NSLeftMouseDragged */
+                                                            RT_BIT_32(7)  | /* NSRightMouseDragged */
+                                                            RT_BIT_32(25) | /* NSOtherMouseDown */
+                                                            RT_BIT_32(26) | /* NSOtherMouseUp */
+                                                            RT_BIT_32(27) | /* NSOtherMouseDragged */
+                                                            RT_BIT_32(22),  /* NSScrollWheel */
+                                                            ::darwinMouseMoveEvents, pWidget);
+}
+
+void darwinMouseRelease(QWidget *pWidget)
+{
+    UICocoaApplication::instance()->unregisterForNativeEvents(RT_BIT_32(1)  | /* NSLeftMouseDown */
+                                                              RT_BIT_32(2)  | /* NSLeftMouseUp */
+                                                              RT_BIT_32(3)  | /* NSRightMouseDown */
+                                                              RT_BIT_32(4)  | /* NSRightMouseUp */
+                                                              RT_BIT_32(5)  | /* NSMouseMoved */
+                                                              RT_BIT_32(6)  | /* NSLeftMouseDragged */
+                                                              RT_BIT_32(7)  | /* NSRightMouseDragged */
+                                                              RT_BIT_32(25) | /* NSOtherMouseDown */
+                                                              RT_BIT_32(26) | /* NSOtherMouseUp */
+                                                              RT_BIT_32(27) | /* NSOtherMouseDragged */
+                                                              RT_BIT_32(22),  /* NSScrollWheel */
+                                                              ::darwinMouseMoveEvents, pWidget);
+    CGAssociateMouseAndMouseCursorPosition(true);
+}
+
+void darwinSendDeltaEvents(QWidget *pWidget, int type, int button, int buttons, int x, int y)
+{
+    QEvent::Type qtType = QEvent::None;
+    Qt::MouseButtons qtButtons = Qt::NoButton;
+    Qt::MouseButton qtButton = Qt::NoButton;
+    Qt::MouseButton qtExtraButton = Qt::NoButton;
+    Qt::Orientation qtOrientation = Qt::Horizontal;
+    int wheelDelta = 0;
+    /* Which button is used in the NSOtherMouse... cases? */
+    if (button == 0)
+        qtExtraButton = Qt::LeftButton;
+    else if (button == 1)
+        qtExtraButton = Qt::RightButton;
+    else if (button == 2)
+        qtExtraButton = Qt::MidButton;
+    else if (button == 3)
+        qtExtraButton = Qt::XButton1;
+    else if (button == 4)
+        qtExtraButton = Qt::XButton2;
+    /* Map the NSEvent to a QEvent and define the Qt::Buttons when necessary. */
+    switch(type)
+    {
+        case 1: /* NSLeftMouseDown */
+        {
+            qtType = QEvent::MouseButtonPress;
+            qtButton = Qt::LeftButton;
+            break;
+        }
+        case 2: /* NSLeftMouseUp */
+        {
+            qtType = QEvent::MouseButtonRelease;
+            qtButton = Qt::LeftButton;
+            break;
+        }
+        case 3: /* NSRightMouseDown */
+        {
+            qtType = QEvent::MouseButtonPress;
+            qtButton = Qt::RightButton;
+            break;
+        }
+        case 4: /* NSRightMouseUp */
+        {
+            qtType = QEvent::MouseButtonRelease;
+            qtButton = Qt::RightButton;
+            break;
+        }
+        case 5: /* NSMouseMoved */
+        {
+            qtType = QEvent::MouseMove;
+            break;
+        }
+        case 6: /* NSLeftMouseDragged */
+        {
+            qtType = QEvent::MouseMove;
+            qtButton = Qt::LeftButton;
+            break;
+        }
+        case 7: /* NSRightMouseDragged */
+        {
+            qtType = QEvent::MouseMove;
+            qtButton = Qt::RightButton;
+            break;
+        }
+        case 22: /* NSScrollWheel */
+        {
+            qtType = QEvent::Wheel;
+            if (y != 0)
+            {
+                wheelDelta = y;
+                qtOrientation = Qt::Vertical;
+            }
+            else if (x != 0)
+            {
+                wheelDelta = x;
+                qtOrientation = Qt::Horizontal;
+            }
+            x = y = 0;
+            break;
+        }
+        case 25: /* NSOtherMouseDown */
+        {
+            qtType = QEvent::MouseButtonPress;
+            qtButton = qtExtraButton;
+            break;
+        }
+        case 26: /* NSOtherMouseUp */
+        {
+            qtType = QEvent::MouseButtonRelease;
+            qtButton = qtExtraButton;
+            break;
+        }
+        case 27: /* NSOtherMouseDragged */
+        {
+            qtType = QEvent::MouseMove;
+            qtButton = qtExtraButton;
+            break;
+        }
+        default: return;
+    }
+    /* Create a Qt::MouseButtons Mask. */
+    if ((buttons & RT_BIT_32(0)) == RT_BIT_32(0))
+        qtButtons |= Qt::LeftButton;
+    if ((buttons & RT_BIT_32(1)) == RT_BIT_32(1))
+        qtButtons |= Qt::RightButton;
+    if ((buttons & RT_BIT_32(2)) == RT_BIT_32(2))
+        qtButtons |= Qt::MidButton;
+    if ((buttons & RT_BIT_32(3)) == RT_BIT_32(3))
+        qtButtons |= Qt::XButton1;
+    if ((buttons & RT_BIT_32(4)) == RT_BIT_32(4))
+        qtButtons |= Qt::XButton2;
+    /* Create a new mouse delta event and send it to the widget. */
+    UIGrabMouseEvent *pEvent = new UIGrabMouseEvent(qtType, qtButton, qtButtons, x, y, wheelDelta, qtOrientation);
+    qApp->sendEvent(pWidget, pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h

@@ -86 +86 @@
 
 bool darwinUnifiedToolbarEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
+bool darwinMouseMoveEvents(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
 void darwinCreateContextMenuEvent(void *pvWin, int x, int y);
 
@@ -91 +92 @@
 
 void darwinRetranslateAppMenu();
+
+void darwinSendDeltaEvents(QWidget *pWidget, int type, int button, int buttons, int x, int y);
 
 QString darwinResolveAlias(const QString &strFile);
@@ -169 +172 @@
 
 #ifndef __OBJC__
+
+#include <QEvent>
+class UIGrabMouseEvent: public QEvent
+{
+public:
+    enum { GrabMouseEvent = QEvent::User + 200 };
+
+    UIGrabMouseEvent(QEvent::Type type, Qt::MouseButton button, Qt::MouseButtons buttons, int x, int y, int wheelDelta, Qt::Orientation o)
+      : QEvent((QEvent::Type)GrabMouseEvent)
+      , m_type(type)
+      , m_button(button)
+      , m_buttons(buttons)
+      , m_x(x)
+      , m_y(y)
+      , m_wheelDelta(wheelDelta)
+      , m_orientation(o)
+    {}
+    QEvent::Type mouseEventType() const { return m_type; }
+    Qt::MouseButton button() const { return m_button; }
+    Qt::MouseButtons buttons() const { return m_buttons; }
+    int xDelta() const { return m_x; }
+    int yDelta() const { return m_y; }
+    int wheelDelta() const { return m_wheelDelta; }
+    Qt::Orientation orientation() const { return m_orientation; }
+
+private:
+    /* Private members */
+    QEvent::Type m_type;
+    Qt::MouseButton m_button;
+    Qt::MouseButtons m_buttons;
+    int m_x;
+    int m_y;
+    int m_wheelDelta;
+    Qt::Orientation m_orientation;
+};
+
 /********************************************************************************
  *
@@ -205 +244 @@
 void darwinRegisterForUnifiedToolbarContextMenuEvents(QMainWindow *pWindow);
 void darwinUnregisterForUnifiedToolbarContextMenuEvents(QMainWindow *pWindow);
+
+void darwinMouseGrab(QWidget *pWidget);
+void darwinMouseRelease(QWidget *pWidget);
 #endif /* !__OBJC__ */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -968 +968 @@
         /* Disable mouse and keyboard event compression/delaying to make sure we *really* get all of the events. */
         ::CGSetLocalEventsSuppressionInterval(0.0);
-        machineLogic()->mouseHandler()->setMouseCoalescingEnabled(false);
+        ::darwinSetMouseCoalescingEnabled(false);
 
         /* Register the event callback/hook and grab the keyboard. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -174 +174 @@
         updateMouseCursorClipping();
 #elif defined (Q_WS_MAC)
-        /* Move the mouse to the center of the visible area: */
-        m_lastMousePos = visibleRectangle.center();
-        QCursor::setPos(m_lastMousePos);
         /* Grab all mouse events: */
-        m_viewports[m_iMouseCaptureViewIndex]->grabMouse();
+        ::darwinMouseGrab(m_viewports[m_iMouseCaptureViewIndex]);
 #else /* Q_WS_MAC */
         /* Remember current mouse position: */
@@ -212 +209 @@
         /* Update mouse clipping: */
         updateMouseCursorClipping();
-#else /* Q_WS_WIN */
+#elif defined(Q_WS_MAC)
+        /* Releasing grabbed mouse from that view: */
+        ::darwinMouseRelease(m_viewports[m_iMouseCaptureViewIndex]);
+#else /* Q_WS_MAC */
         /* Releasing grabbed mouse from that view: */
         m_viewports[m_iMouseCaptureViewIndex]->releaseMouse();
-#endif /* !Q_WS_WIN */
+#endif /* !Q_WS_MAC */
         /* Reset mouse-capture index: */
         m_iMouseCaptureViewIndex = -1;
@@ -245 +245 @@
            (uisession()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
 }
-
-#ifdef Q_WS_MAC
-void UIMouseHandler::setMouseCoalescingEnabled(bool fOn)
-{
-    /* Enable mouse event compression if we leave the VM view.
-     * This is necessary for having smooth resizing of the VM/other windows.
-     * Disable mouse event compression if we enter the VM view.
-     * So all mouse events are registered in the VM. */
-    ::darwinSetMouseCoalescingEnabled(fOn);
-}
-#endif /* Q_WS_MAC */
 
 #ifdef Q_WS_X11
@@ -513 +502 @@
             switch (pEvent->type())
             {
+#ifdef Q_WS_MAC
+                case UIGrabMouseEvent::GrabMouseEvent:
+                {
+                    UIGrabMouseEvent *pDeltaEvent = static_cast<UIGrabMouseEvent*>(pEvent);
+                    QPoint gl = m_lastMousePos;
+                    QPoint p = QPoint(pDeltaEvent->xDelta() + gl.x(),
+                                      pDeltaEvent->yDelta() + gl.y());
+                    if (mouseEvent(pDeltaEvent->mouseEventType(), uScreenId,
+                                   m_viewports[uScreenId]->mapFromGlobal(p), p,
+                                   pDeltaEvent->buttons(),
+                                   pDeltaEvent->wheelDelta(), pDeltaEvent->orientation()))
+                        return true;
+//
+//                    QMouseEvent *pNewMouseEvent = new QMouseEvent(QEvent::MouseMove,
+//                                                                  m_viewports[uScreenId]->mapFromGlobal(p), p,
+//                                                                  Qt::NoButton,
+//                                                                  Qt::NoButton,
+//                                                                  Qt::NoModifier);
+//
+//
+//                    /* Send that event to real destination: */
+//                    QApplication::postEvent(m_viewports[uScreenId], pNewMouseEvent);
+                    return false;
+                    break;
+                }
+#endif /* Q_WS_MAC */
                 case QEvent::MouseMove:
                 case QEvent::MouseButtonRelease:
                 {
+
+                    printf("move event \n");
                     /* Check if we should propagate this event to another window: */
                     QWidget *pHoveredWidget = QApplication::widgetAt(QCursor::pos());
@@ -599 +616 @@
                     /* Enable mouse event compression if we leave the VM view.
                      * This is necessary for having smooth resizing of the VM/other windows: */
-                    setMouseCoalescingEnabled(true);
+                    ::darwinSetMouseCoalescingEnabled(true);
                     break;
                 }
@@ -609 +626 @@
                      * (this is when we have a valid event handler): */
                     if (machineLogic()->keyboardHandler()->isKeyboardGrabbed())
-                        setMouseCoalescingEnabled(false);
+                        darwinSetMouseCoalescingEnabled(false);
                     break;
                 }
@@ -681 +698 @@
         ::UpdateWindow(m_viewports[uScreenId]->winId());
 #endif
-
         CMouse mouse = session().GetConsole().GetMouse();
         mouse.PutMouseEvent(globalPos.x() - m_lastMousePos.x(),
@@ -687 +703 @@
                             iWheelVertical, iWheelHorizontal, iMouseButtonsState);
 
-#ifdef Q_WS_MAC
-        /* Keep the mouse from leaving the widget.
-         * This is a bit tricky to get right because if it escapes we won't necessarily
-         * get mouse events any longer and can warp it back. So, we keep safety zone
-         * of up to 300 pixels around the borders of the widget to prevent this from
-         * happening. Also, the mouse is warped back to the center of the widget.
-         * (Note, relativePos seems to be unreliable, it caused endless recursion here at one points...)
-         * (Note, synergy and other remote clients might not like this cursor warping.) */
-        QRect rect = m_viewports[uScreenId]->visibleRegion().boundingRect();
-        QPoint pw = m_viewports[uScreenId]->mapToGlobal(m_viewports[uScreenId]->pos());
-        rect.translate(pw.x(), pw.y());
-
-        QRect dpRect = QApplication::desktop()->screenGeometry(m_viewports[uScreenId]);
-        if (rect.intersects(dpRect))
-            rect = rect.intersect(dpRect);
-
-        int iWsafe = rect.width() / 6;
-        rect.setWidth(rect.width() - iWsafe * 2);
-        rect.setLeft(rect.left() + iWsafe);
-
-        int iHsafe = rect.height() / 6;
-        rect.setWidth(rect.height() - iHsafe * 2);
-        rect.setTop(rect.top() + iHsafe);
-
-        if (rect.contains(globalPos, true))
-            m_lastMousePos = globalPos;
-        else
-        {
-            m_lastMousePos = rect.center();
-            QCursor::setPos(m_lastMousePos);
-        }
-#else /* Q_WS_MAC */
-
+#ifdef Q_WS_WIN
         /* Bringing mouse to the opposite side to simulate the endless moving: */
 
-# ifdef Q_WS_WIN
         /* Acquiring visible viewport rectangle in local coordinates: */
         QRect viewportRectangle = m_viewports[uScreenId]->visibleRegion().boundingRect();
@@ -755 +738 @@
         }
         else
-        {
             m_lastMousePos = globalPos;
-        }
-# else /* Q_WS_WIN */
+#else /* Q_WS_WIN */
         int iWe = QApplication::desktop()->width() - 1;
         int iHe = QApplication::desktop()->height() - 1;
@@ -774 +755 @@
         {
             m_lastMousePos =  p;
+            /* No need for cursor updating on the Mac, there is no one. */
+# ifndef Q_WS_MAC
             QCursor::setPos(m_lastMousePos);
+# endif /* Q_WS_MAC */
         }
         else
-        {
             m_lastMousePos = globalPos;
-        }
-# endif /* !Q_WS_WIN */
-#endif /* !Q_WS_MAC */
+#endif /* !Q_WS_WIN */
         return true; /* stop further event handling */
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h

@@ -66 +66 @@
     int mouseState() const;
 
-#ifdef Q_WS_MAC
-    /* Enable mouse event compression if we leave the VM view.
-     * This is necessary for having smooth resizing of the VM/other windows.
-     * Disable mouse event compression if we enter the VM view.
-     * So all mouse events are registered in the VM. */
-    void setMouseCoalescingEnabled(bool fOn);
-#endif /* Q_WS_MAC */
-
 #ifdef Q_WS_X11
     bool x11EventFilter(XEvent *pEvent, ulong uScreenId);