Changeset 16699 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 11, 2009 8:56:58 PM (16 years ago)

Author:

vboxsync

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

42711

Message:

fe/qt: SetMouseCoalescingEnabled is a NSEvent class method in the Cocoa world.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• darwin/VBoxCocoaApplication.h (modified) (2 diffs)
• darwin/VBoxCocoaApplication.m (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -4063 +4063 @@
  *
  * Called by eventFilter() and darwinGrabKeyboardEvents().
+ *
  * @param   aOn     Switch it on (true) or off (false).
  */
 void VBoxConsoleView::setMouseCoalescingEnabled (bool aOn)
 {
+    /* 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. Only do this if
+       the keyboard/mouse is grabbed (this is when we have a valid
+       event handler). */
+    if (aOn || mKeyboardGrabbed)
 # ifdef QT_MAC_USE_COCOA
-    /** @todo Carbon -> Cocoa: SetMouseCoalescingEnabled() is 32-bit only. */
+        ::VBoxCocoaApplication_setMouseCoalescingEnabled (aOn);
 # else
-    if (aOn)
-        /* Enable mouse event compression if we leave the VM view. This
-           is necessary for having smooth resizing of the VM/other
-           windows. */
-        ::SetMouseCoalescingEnabled (true, NULL);
-    else
-    {
-        /* 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 (mKeyboardGrabbed)
-            ::SetMouseCoalescingEnabled (false, NULL);
-    }
+        ::SetMouseCoalescingEnabled (aOn, NULL);
 # endif
 }

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaApplication.h

@@ -80 +80 @@
 
 /** @name The C/C++ interface.
+ *
+ * @remarks This is a bit illogical as both NSApplication and NSEvent stuff
+ *          ended up here...
  * @{
  */
@@ -87 +90 @@
 unsigned long VBoxCocoaApplication_getEventModifierFlags(const void *pvEvent);
 uint32_t VBoxCocoaApplication_getEventModifierFlagsXlated(const void *pvEvent);
+void VBoxCocoaApplication_setMouseCoalescingEnabled(bool fEnabled);
 const char *VBoxCocoaApplication_eventTypeName(unsigned long eEvtType);
 void VBoxCocoaApplication_printEvent(const char *pszPrefix, const void *pvEvent);
-
-
 /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaApplication.m

@@ -289 +289 @@
 
     return fCarbon;
+}
+
+
+/**
+ * Calls the + (void)setMouseCoalescingEnabled:(BOOL)flag class method.
+ *
+ * @param   fEnabled    Whether to enable or disable coalescing.
+ */
+void VBoxCocoaApplication_setMouseCoalescingEnabled(bool fEnabled)
+{
+    [NSEvent setMouseCoalescingEnabled:fEnabled];
 }