Changeset 1320 in vbox

Timestamp:

Mar 8, 2007 6:59:53 AM (18 years ago)

Author:

vboxsync

Message:

Hack to ignore Command-H and Command-Q when the keyboard is captured. (todo: proper fix / translate the events into key down/up.)

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (4 diffs)

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

@@ -118 +118 @@
     {
         if (view->darwinKeyboardEvent (inEvent))
+            return 0;
+    }
+    /*
+     * 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->kbd_captured)
             return 0;
     }
@@ -659 +671 @@
     else if (on)
         darwinGrabKeyboardEvents (false);
-#endif 
+#endif
 
     return ok;
@@ -1432 +1444 @@
         ::CGSetLocalEventsSuppressionInterval (0.0);    //??
 
-        EventTypeSpec eventTypes[4];
+        EventTypeSpec eventTypes[6];
         eventTypes[0].eventClass = kEventClassKeyboard;
         eventTypes[0].eventKind  = kEventRawKeyDown;
@@ -1441 +1453 @@
         eventTypes[3].eventClass = kEventClassKeyboard;
         eventTypes[3].eventKind  = kEventRawKeyModifiersChanged;
+        /* For ignorning Command-H and Command-Q which aren't affected by the
+         * global hotkey stuff: */
+        eventTypes[4].eventClass = kEventClassCommand;
+        eventTypes[4].eventKind  = kEventCommandProcess;
+        eventTypes[5].eventClass = kEventClassCommand;
+        eventTypes[5].eventKind  = kEventCommandUpdateStatus;
 
         EventHandlerUPP eventHandler = ::NewEventHandlerUPP (VBoxConsoleView::darwinEventHandlerProc);