Commit 5929e36c authored by John Arbuckle's avatar John Arbuckle Committed by Peter Maydell
Browse files

ui/cocoa.m: move ungrab to ctrl-alt-g 



Currently the cocoa user interface relis on the user pushing
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: default avatarJohn Arbuckle <programmingkidx@gmail.com>
Message-id: 20171102213907.11443-1-programmingkidx@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 9c3a418e

ui/cocoa.m

+18 −13
Original line number Diff line number Diff line
@@ -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) {

                NSString *keychar = [event charactersIgnoringModifiers];

                if ([keychar length] == 1) {

                    char key = [keychar characterAtIndex:0];

                    switch (key) {



                        // enable graphic console

                    case Q_KEY_CODE_1 ... Q_KEY_CODE_9: // '1' to '9' keys

                        console_select(keycode - Q_KEY_CODE_1);

                        break;

                        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) {