[Qemu-devel] [PATCH] ui/cocoa.m: change mouse grab to control-alt-g

[Programmingkid]

The GTK interface uses Control-Alt-G to ungrab the mouse. This patch changes 
the ungrab keys in the Cocoa interface to be consistent with the GTK interface. 
This patch has the added benefit of being able to send Control-Alt key 
combinations to the guest (like Control-Alt-Delete used in Windows).

Signed-off-by: John Arbuckle <address@hidden>
---
 ui/cocoa.m | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 93e56d0..d64c7b9 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -609,10 +609,6 @@ QemuCocoaView *cocoaView;
                 }
             }
 
-            // release Mouse grab when pressing ctrl+alt
-            if (([event modifierFlags] & NSEventModifierFlagControl) && 
([event modifierFlags] & NSEventModifierFlagOption)) {
-                [self ungrabMouse];
-            }
             break;
         case NSEventTypeKeyDown:
             keycode = cocoa_keycode_to_qemu([event keyCode]);
@@ -625,7 +621,7 @@ QemuCocoaView *cocoaView;
 
             // default
 
-            // handle control + alt Key Combos (ctrl+alt is reserved for QEMU)
+            // handle control + alt Key Combos (ctrl+alt+[1..9,g] is reserved 
for QEMU)
             if (([event modifierFlags] & NSEventModifierFlagControl) && 
([event modifierFlags] & NSEventModifierFlagOption)) {
                 switch (keycode) {
 
@@ -633,6 +629,18 @@ QemuCocoaView *cocoaView;
                     case Q_KEY_CODE_1 ... Q_KEY_CODE_9: // '1' to '9' keys
                         console_select(keycode - 11);
                         break;
+
+                    // release the mouse grab
+                    case Q_KEY_CODE_G:
+                        [self ungrabMouse];
+                        break;
+
+                    // send to the guest
+                    default:
+                        qemu_input_event_send_key_qcode(dcl->con, 
Q_KEY_CODE_CTRL, true);
+                        qemu_input_event_send_key_qcode(dcl->con, 
Q_KEY_CODE_ALT, true);
+                        qemu_input_event_send_key_qcode(dcl->con, keycode, 
true);
+                        break;
                 }
 
             // handle keys for graphic console
@@ -806,9 +814,9 @@ QemuCocoaView *cocoaView;
 
     if (!isFullscreen) {
         if (qemu_name)
-            [normalWindow setTitle:[NSString stringWithFormat:@"QEMU %s - 
(Press ctrl + alt to release Mouse)", qemu_name]];
+            [normalWindow setTitle:[NSString stringWithFormat:@"QEMU %s - 
(Press ctrl + alt + g to release Mouse)", qemu_name]];
         else
-            [normalWindow setTitle:@"QEMU - (Press ctrl + alt to release 
Mouse)"];
+            [normalWindow setTitle:@"QEMU - (Press ctrl + alt + g to release 
Mouse)"];
     }
     [self hideCursor];
     if (!isAbsoluteEnabled) {
-- 
2.7.2