Commit 0c6c4395 authored by John Arbuckle's avatar John Arbuckle Committed by Peter Maydell
Browse files

ui/cocoa.m: prevent stuck command key when going into full screen mode 



When the user pushes Command-F in QEMU while the mouse is ungrabbed, QEMU
goes into full screen mode. When the user finally releases the command key,
it is sent to the guest as an event. The makes the guest operating system
think the command key is down when it is really up. To prevent this situation
from happening, we simply drop the first command key event after the user has
gone into full screen mode using Command-F.

Signed-off-by: default avatarJohn Arbuckle <programmingkidx@gmail.com>
Message-id: 20180703020017.1032-1-programmingkidx@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 768cef29

ui/cocoa.m

+13 −1
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ QemuCocoaView *cocoaView; 
    int buttons = 0;

    int keycode = 0;

    bool mouse_event = false;

    static bool switched_to_fullscreen = false;

    NSPoint p = [event locationInWindow];



    switch ([event type]) {
@@ -681,9 +682,13 @@ QemuCocoaView *cocoaView; 
                    keycode == Q_KEY_CODE_NUM_LOCK) {

                    [self toggleStatefulModifier:keycode];

                } else if (qemu_console_is_graphic(NULL)) {

                    if (switched_to_fullscreen) {

                        switched_to_fullscreen = false;

                    } else {

                        [self toggleModifier:keycode];

                    }

                }

            }



            break;

        case NSEventTypeKeyDown:
@@ -691,6 +696,13 @@ QemuCocoaView *cocoaView; 


            // forward command key combos to the host UI unless the mouse is grabbed

            if (!isMouseGrabbed && ([event modifierFlags] & NSEventModifierFlagCommand)) {

                /*

                 * Prevent the command key from being stuck down in the guest

                 * when using Command-F to switch to full screen mode.

                 */

                if (keycode == Q_KEY_CODE_F) {

                    switched_to_fullscreen = true;

                }

                [NSApp sendEvent:event];

                return;

            }