Changeset 30409 in vbox

Timestamp:

Jun 24, 2010 4:11:27 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: First try to fix mac build for r63034.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (4 diffs)
• UIMouseHandler.h (modified) (1 diff)

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

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

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

@@ -29 +29 @@
 #include "UIMachineLogic.h"
 #include "UIMachineView.h"
+
+#ifdef Q_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif /* Q_WS_MAC */
 
 /* Factory function to create mouse-handler: */
@@ -196 +200 @@
            (uisession()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
 }
+
+#ifdef Q_WS_MAC
+void UIMachineView::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 */
 
 /* Machine state-change handler: */
@@ -449 +464 @@
                     /* Enable mouse event compression if we leave the VM view.
                      * This is necessary for having smooth resizing of the VM/other windows: */
-                    ::darwinSetMouseCoalescingEnabled(true);
+                    setMouseCoalescingEnabled(true);
                     break;
                 }
@@ -459 +474 @@
                      * (this is when we have a valid event handler): */
                     if (m_views[uScreenId]->isKeyboardGrabbed())
-                        ::darwinSetMouseCoalescingEnabled(false);
+                        setMouseCoalescingEnabled(false);
                     break;
                 }

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

@@ -62 +62 @@
     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 */
+
 signals: