[v2] Adds the ability to use the command key in the guest operating system.

This patch adds the ability to use the command key in the guest
 operating system. Just add -command-key 55 to the command line
 options sent to QEMU to use this feature.

I have checked the patch by sending it thru checkpatch.pl this time. I also
made a bunch of style changes to more closely match QEMU's suggested coding
style.

signed-off-by: John Arbuckle <programmingkidx@gmail.com>

---
 ui/cocoa.m |  114
++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 104 insertions(+), 10 deletions(-)

+ }
+}

 /*
  ------------------------------------------------------
@@ -491,6 +558,11 @@ QemuCocoaView *cocoaView;
     int keycode;
     NSPoint p = [event locationInWindow];

+    // The key used to send QEMU commands (e.g. Quit, Full Screen).
+    // Change this if you don't like using the ALT key.
+    // Possible values: NSShiftKeyMask, NSControlKeyMask,
NSFunctionKeyMask, NSAlternateKeyMask
+    const int substitute_key_mask = NSAlternateKeyMask;
+
     switch ([event type]) {
         case NSFlagsChanged:
             keycode = cocoa_keycode_to_qemu([event keyCode]);
@@ -499,12 +571,13 @@ QemuCocoaView *cocoaView;
                     kbd_put_keycode(keycode);
                     kbd_put_keycode(keycode | 0x80);
                 } else if (qemu_console_is_graphic(NULL)) {
-                    if (keycode & 0x80)
-                        kbd_put_keycode(0xe0);
-                    if (modifiers_state[keycode] == 0) { // keydown
+              if (keycode & 0x80) {            // if keycode >= 0x80, for
those keycodes that need a 0xe0 sent first
+                  kbd_put_keycode(0xe0);
+              }
+                    if (modifiers_state[keycode] == 0) {     // keydown
                         kbd_put_keycode(keycode & 0x7f);
                         modifiers_state[keycode] = 1;
-                    } else { // keyup
+                    } else {                                 // keyup
                         kbd_put_keycode(keycode | 0x80);
                         modifiers_state[keycode] = 0;
                     }
@@ -517,13 +590,33 @@ QemuCocoaView *cocoaView;
             }
             break;
         case NSKeyDown:
+            // if substituting for the host command key and the substitute
key is being held down - have QEMU handle it
+            if((substituting_for_command_key == true) && ([event
modifierFlags] & substitute_key_mask)) {
+               // recreate the event with the command key as the modifier
+               int modifiers = [event modifierFlags];
+               modifiers = modifiers | NSCommandKeyMask;  // set the
command key
+               modifiers = modifiers ^ substitute_key_mask; // unset the
substitute key
+
+               event = [NSEvent keyEventWithType: [event type] location:
[event locationInWindow] modifierFlags: modifiers
+                       timestamp: [event timestamp] windowNumber: [event
windowNumber] context: [event context] characters: [event characters]
+                       charactersIgnoringModifiers: [event
charactersIgnoringModifiers] isARepeat: [event isARepeat] keyCode: [event
keyCode] ];
+               [NSApp sendEvent:event];
+               return;
+            }

-            // forward command Key Combos
-            if ([event modifierFlags] & NSCommandKeyMask) {
+            // if the command key is held down and we want QEMU to handle
the event - not the guest OS
+            else if([event modifierFlags] & NSCommandKeyMask &&
substituting_for_command_key == false) {
                 [NSApp sendEvent:event];
                 return;
             }

+            // if the command key is held down and we want the guest OS to
handle it
+            if(([event modifierFlags] & NSCommandKeyMask) &&
(substituting_for_command_key == true)) {
+                kbd_put_keycode(219); // command key
+                kbd_put_keycode(cocoa_keycode_to_qemu([event keyCode]));
// any other keys
+                return;
+            }
+
             // default
             keycode = cocoa_keycode_to_qemu([event keyCode]);

@@ -584,7 +677,7 @@ QemuCocoaView *cocoaView;
             if (qemu_console_is_graphic(NULL)) {
                 if (keycode & 0x80)
                     kbd_put_keycode(0xe0);
-                kbd_put_keycode(keycode | 0x80); //add 128 to signal
release of key
+                kbd_put_keycode(keycode | 0x80); //add 128 (0x80) to
signal release of key
             }
             break;
         case NSMouseMoved:
@@ -812,6 +905,7 @@ QemuCocoaView *cocoaView;
     COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");

     int status;
+    handleCommandKeyOption(&argc, argv);
     status = qemu_main(argc, argv, *_NSGetEnviron());
     exit(status);
 }
@@ -1046,4 +1140,4 @@ void cocoa_display_init(DisplayState *ds, int
full_screen)

     // register cleanup function
     atexit(cocoa_cleanup);
-}
+}
\ No newline at end of file


[v2] Adds the ability to use the command key in the guest operating system.

Commit Message

Comments

Patch