Changeset 25211 in vbox

Timestamp:

Dec 7, 2009 2:47:25 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Reenable CMD+Key combinations, even if the Host-Key isn't CMD (public #5684).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -138 +138 @@
         ::VBoxCocoaApplication_printEvent ("view: ", pvCocoaEvent);
 #endif
-
-    /*
-     * Not sure but this seems an triggered event if the spotlight searchbar is
-     * displayed. So flag that the host key isn't pressed alone.
-     */
-    if (   eventClass == 'cgs '
-        && view->mIsHostkeyPressed
-        && ::GetEventKind (inEvent) == 0x15)
-        view->mIsHostkeyAlone = false;
+    /* Check if this is an application key combo. In that case we will not pass
+       the event to the guest, but let the host process it. */
+    if (VBoxCocoaApplication_isApplicationCommand(pvCocoaEvent))
+        return false;
 
     /*
@@ -154 +149 @@
     {
         if (view->darwinKeyboardEvent (pvCocoaEvent, inEvent))
-            return true;
-    }
-    /*
-     * Command-H and Command-Q aren't properly disabled yet, and it's still
-     * possible to use the left command key to invoke them when the keyboard
-     * is captured. We discard the events these if the keyboard is captured
-     * as a half measure to prevent unexpected behaviour. However, we don't
-     * get any key down/up events, so these combinations are dead to the guest...
-     */
-    else if (eventClass == kEventClassCommand)
-    {
-        if (view->mKbdCaptured)
             return true;
     }

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

@@ -91 +91 @@
 void VBoxCocoaApplication_setMouseCoalescingEnabled(bool fEnabled);
 const char *VBoxCocoaApplication_eventTypeName(unsigned long eEvtType);
+bool VBoxCocoaApplication_isApplicationCommand(const void *pvEvent);
 void VBoxCocoaApplication_printEvent(const char *pszPrefix, const void *pvEvent);
 /** @} */

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

@@ -340 +340 @@
 }
 
+/**
+ * Check for some default application key combinations a Mac user expect, like
+ * CMD+Q or CMD+H.
+ *
+ * @returns true if such a key combo was hit, false otherwise.
+ * @param   eEvtType        The Cocoa event type.
+ */
+bool VBoxCocoaApplication_isApplicationCommand(const void *pvEvent)
+{
+    NSEvent     *pEvent = (NSEvent *)pvEvent;
+    NSEventType  eEvtType = [pEvent type];
+    bool         fGlobalHotkey = false;
+
+    switch (eEvtType)
+    {
+        case NSKeyDown:
+        case NSKeyUp:
+        {
+            NSUInteger fEvtMask = [pEvent modifierFlags];
+            unsigned short KeyCode = [pEvent keyCode];
+            if (   fEvtMask & (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)  // L+CMD
+                || fEvtMask & (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK)) // R+CMD
+            {
+                if (   KeyCode == 0x0c  // CMD+Q (Quit)
+                    || KeyCode == 0x04) // CMD+H (Hide)
+                    fGlobalHotkey = true;
+            } 
+            else if (   fEvtMask & (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICELALTKEYMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)  // L+ALT+CMD
+                     || fEvtMask & (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICERCMDKEYMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK)) // R+ALT+CMD
+            {
+                if (KeyCode == 0x04)    // ALT+CMD+H (Hide-Others)
+                    fGlobalHotkey = true;
+            }
+            break;
+        }
+        default: break;
+    }
+    return fGlobalHotkey;
+}
 
 /**