Changeset 63579 in vbox

Timestamp:

Aug 17, 2016 3:45:21 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7846: Runtime UI: Implementing mouse native event filter allowing us among other potential things to prevent unwanted translation of Meta+LMB events to RMB events under OSX host.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/CocoaEventHelper.h (modified) (1 diff)
• platform/darwin/CocoaEventHelper.mm (modified) (2 diffs)
• runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (3 diffs)
• runtime/UIMouseHandler.cpp (modified) (3 diffs)
• runtime/UIMouseHandler.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.h

@@ -36 +36 @@
 const char *darwinEventTypeName(unsigned long eEvtType);
 void darwinPrintEvent(const char *pszPrefix, ConstNativeNSEventRef pEvent);
+void darwinPostStrippedMouseEvent(ConstNativeNSEventRef pEvent);
 
 RT_C_DECLS_END

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm

@@ -21 +21 @@
 
 /* Global includes */
+#import <Cocoa/Cocoa.h>
 #import <AppKit/NSEvent.h>
 #include <Carbon/Carbon.h>
@@ -293 +294 @@
 }
 
+void darwinPostStrippedMouseEvent(ConstNativeNSEventRef pEvent)
+{
+    /* Create and post new stripped event: */
+    NSEvent *pNewEvent = [NSEvent mouseEventWithType:[pEvent type]
+                                            location:[pEvent locationInWindow]
+                                       modifierFlags:0
+                                           timestamp:[pEvent timestamp] // [NSDate timeIntervalSinceReferenceDate] ?
+                                        windowNumber:[pEvent windowNumber]
+                                             context:[pEvent context]
+                                         eventNumber:[pEvent eventNumber]
+                                          clickCount:[pEvent clickCount]
+                                            pressure:[pEvent pressure]];
+    [NSApp postEvent:pNewEvent atStart:YES];
+}
+

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

@@ -593 +593 @@
     /* Depending on event kind: */
     const UInt32 uEventKind = ::GetEventKind(event);
-    switch(uEventKind)
+    switch (uEventKind)
     {
         /* Watch for simple key-events: */
@@ -1045 +1045 @@
     /* Depending on event kind: */
     const UInt32 uEventKind = ::GetEventKind(event);
-    switch(uEventKind)
+    switch (uEventKind)
     {
         /* Watch for simple key-events: */

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

@@ -1786 +1786 @@
      * Returning @c false means passing event to Qt. */
     bool fResult = false; /* Pass to Qt by default. */
-    switch(::GetEventClass(event))
+    switch (::GetEventClass(event))
     {
         /* Watch for keyboard-events: */
         case kEventClassKeyboard:
         {
-            switch(::GetEventKind(event))
+            switch (::GetEventKind(event))
             {
                 /* Watch for key-events: */
@@ -1915 +1915 @@
     EventRef event = static_cast<EventRef>(darwinCocoaToCarbonEvent(pMessage));
 
-    switch(::GetEventClass(event))
+    switch (::GetEventClass(event))
     {
         /* Watch for keyboard-events: */
         case kEventClassKeyboard:
         {
-            switch(::GetEventKind(event))
+            switch (::GetEventKind(event))
             {
                 /* Watch for key-events: */
@@ -1936 +1936 @@
             break;
         }
+        /* Watch for mouse-events: */
+        case kEventClassMouse:
+        {
+            switch (::GetEventKind(event))
+            {
+                /* Watch for button-events: */
+                case kEventMouseDown:
+                case kEventMouseUp:
+                {
+                    /* Delegate button-event handling to the mouse-handler: */
+                    return machineLogic()->mouseHandler()->nativeEventFilter(pMessage, screenId());
+                }
+                default:
+                    break;
+            }
+            break;
+        }
         default:
             break;

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

@@ -55 +55 @@
 #include <QTouchEvent>
 
+/* GUI includes: */
+#if defined(VBOX_WS_MAC) && QT_VERSION >= 0x050000
+# include "CocoaEventHelper.h"
+#endif
+
 /* COM includes: */
 #include "CMouse.h"
@@ -264 +269 @@
 }
 
-#ifdef VBOX_WS_X11
-# if QT_VERSION < 0x050000
+#if QT_VERSION < 0x050000
+# ifdef VBOX_WS_X11
+
 bool UIMouseHandler::x11EventFilter(XEvent *pEvent, ulong /* uScreenId */)
 {
@@ -293 +299 @@
     return fResult;
 }
-# endif /* QT_VERSION < 0x050000 */
-#endif /* VBOX_WS_X11 */
+
+# endif /* VBOX_WS_X11 */
+#else /* QT_VERSION >= 0x050000 */
+
+bool UIMouseHandler::nativeEventFilter(void *pMessage, ulong uScreenId)
+{
+    /* Make sure view with passed index exists: */
+    if (!m_views.contains(uScreenId))
+        return false;
+
+    /* Check if some system event should be filtered out.
+     * Returning @c true means filtering-out,
+     * Returning @c false means passing event to Qt. */
+    bool fResult = false; /* Pass to Qt by default. */
+
+# if defined(VBOX_WS_MAC)
+
+    /* Acquire carbon event reference from the cocoa one: */
+    EventRef event = static_cast<EventRef>(darwinCocoaToCarbonEvent(pMessage));
+
+    /* Depending on event kind: */
+    const UInt32 uEventKind = ::GetEventKind(event);
+    switch (uEventKind)
+    {
+        /* Watch for button-events: */
+        case kEventMouseDown:
+        case kEventMouseUp:
+        {
+            /* Acquire button number: */
+            EventMouseButton enmButton = 0;
+            ::GetEventParameter(event, kEventParamMouseButton, typeMouseButton,
+                                NULL, sizeof(enmButton), NULL, &enmButton);
+            /* If the event comes for primary mouse button: */
+            if (enmButton == kEventMouseButtonPrimary)
+            {
+                /* Acquire modifiers: */
+                UInt32 uKeyModifiers = ~0U;
+                ::GetEventParameter(event, kEventParamKeyModifiers, typeUInt32,
+                                    NULL, sizeof(uKeyModifiers), NULL, &uKeyModifiers);
+                /* If the event comes with Control modifier: */
+                if (uKeyModifiers == controlKey)
+                {
+                    /* Replacing it with the stripped one: */
+                    darwinPostStrippedMouseEvent(pMessage);
+                    /* And filter out initial one: */
+                    return true;
+                }
+            }
+        }
+    }
+
+# elif defined(VBOX_WS_WIN)
+
+    /* Nothing for now. */
+
+# elif defined(VBOX_WS_X11)
+
+    /* Nothing for now. */
+
+# else
+
+#  warning "port me!"
+
+# endif
+
+    /* Return result: */
+    return fResult;
+}
+
+#endif /* QT_VERSION >= 0x050000 */
 
 /* Machine state-change handler: */

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

@@ -75 +75 @@
     int state() const;
 
-#ifdef VBOX_WS_X11
-# if QT_VERSION < 0x050000
-    /** X11: Qt4: Handles all native events. */
+#if QT_VERSION < 0x050000
+# ifdef VBOX_WS_X11
+    /** Qt4: X11: Performs pre-processing of all the native events. */
     bool x11EventFilter(XEvent *pEvent, ulong uScreenId);
-# endif /* QT_VERSION < 0x050000 */
-#endif /* VBOX_WS_X11 */
+# endif
+#else
+    /** Qt5: Performs pre-processing of all the native events. */
+    bool nativeEventFilter(void *pMessage, ulong uScreenId);
+#endif
 
 protected slots: