> On Nov 7, 2017, at 5:16 AM, Peter Maydell <peter.mayd...@linaro.org> wrote:
>
> From: John Arbuckle <programmingk...@gmail.com>
>
> Currently the cocoa user interface relis on the user pushing
I would change "relis" to "relies" here.
> control-alt to ungrab the mouse. This is patch changes the key
> combination to control-alt-g to be in line with the GTK user
> interface.
>
> Signed-off-by: John Arbuckle <programmingk...@gmail.com>
> Message-id: 20171102213907.11443-1-programmingk...@gmail.com
> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> ---
> ui/cocoa.m | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 2f76dac..f39c792 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -674,10 +674,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]);
> @@ -690,14 +686,23 @@ 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) {
> -
> - // enable graphic console
> - case Q_KEY_CODE_1 ... Q_KEY_CODE_9: // '1' to '9' keys
> - console_select(keycode - Q_KEY_CODE_1);
> - break;
> + NSString *keychar = [event charactersIgnoringModifiers];
> + if ([keychar length] == 1) {
> + char key = [keychar characterAtIndex:0];
> + switch (key) {
> +
> + // enable graphic console
> + case '1' ... '9':
> + console_select(key - '0' - 1); /* ascii math */
> + return;
> +
> + // release the mouse grab
> + case 'g':
> + [self ungrabMouse];
> + return;
> + }
> }
>
> // handle keys for graphic console
> @@ -840,9 +845,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.4
>
