Changeset 78319 in vbox for trunk/src/VBox

Timestamp:

Apr 26, 2019 10:18:29 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: revert r129302.
bugref:9376: Complete hardware cursor implementation in VMSVGA
This caused bad regressions in mouse handling, and is not actually needed yet.
We can revisit it when we do need it.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (3 diffs)

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

@@ -635 +635 @@
                     break;
                 }
-#endif /* VBOX_WS_MAC */
-#ifdef VBOX_WS_MAC
-                case QEvent::Enter:
-                {
-                    /* Disable mouse event compression if we enter the VM view.
-                     * So all mouse events are registered in the VM.
-                     * Only do this if the keyboard/mouse is grabbed
-                     * (this is when we have a valid event handler): */
-                    if (machineLogic()->keyboardHandler()->isKeyboardGrabbed())
-                        darwinSetMouseCoalescingEnabled(false);
-                    break;
-                }
-#endif /* VBOX_WS_MAC */
-                case QEvent::Leave:
-#ifdef VBOX_WS_MAC
-                {
-                    /* Enable mouse event compression if we leave the VM view.
-                     * This is necessary for having smooth resizing of the VM/other windows: */
-                    ::darwinSetMouseCoalescingEnabled(true);
-
-                    /* This event should be also processed using next 'case': */
-                }
-                RT_FALL_THRU();
 #endif /* VBOX_WS_MAC */
                 case QEvent::MouseMove:
@@ -739 +716 @@
                     }
 
-                    /* Send a pointer-out-of-range event if necessary: */
-                    if (!pHoveredWidget &&
-                        uisession()->isMouseSupportsAbsolute() &&
-                        uisession()->isMouseIntegrated())
-                    {
-                        mouse().PutMouseEventAbsolute(0x7FFFFFFF, 0x7FFFFFFF, 0, 0, 0);
-                        break;
-                    }
-
                     /* This event should be also processed using next 'case': */
                 }
@@ -808 +776 @@
                     break;
                 }
+#ifdef VBOX_WS_MAC
+                case QEvent::Leave:
+                {
+                    /* Enable mouse event compression if we leave the VM view.
+                     * This is necessary for having smooth resizing of the VM/other windows: */
+                    ::darwinSetMouseCoalescingEnabled(true);
+                    break;
+                }
+                case QEvent::Enter:
+                {
+                    /* Disable mouse event compression if we enter the VM view.
+                     * So all mouse events are registered in the VM.
+                     * Only do this if the keyboard/mouse is grabbed
+                     * (this is when we have a valid event handler): */
+                    if (machineLogic()->keyboardHandler()->isKeyboardGrabbed())
+                        darwinSetMouseCoalescingEnabled(false);
+                    break;
+                }
+#endif /* VBOX_WS_MAC */
 #ifdef VBOX_WS_WIN
                 case QEvent::Resize: