| Message ID | 20180703020017.1032-1-programmingkidx@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] ui/cocoa.m: prevent stuck command key when going into full screen mode | expand |
On 3 July 2018 at 03:00, John Arbuckle <programmingkidx@gmail.com> wrote: > 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: John Arbuckle <programmingkidx@gmail.com> > --- I feel like there might be a more elegant way to handle this (surely the NSEventTypeFlagsChanged event can have some way to query the current state of the modifier flags even if it's got a keycode value? the current code which has different approaches for "have a keycode" vs not seems a bit fragile), but this fix should work. Applied to master for 3.0, thanks. -- PMM
diff --git a/ui/cocoa.m b/ui/cocoa.m index 2991ed4..9be4811 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -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,7 +682,11 @@ QemuCocoaView *cocoaView; keycode == Q_KEY_CODE_NUM_LOCK) { [self toggleStatefulModifier:keycode]; } else if (qemu_console_is_graphic(NULL)) { - [self toggleModifier:keycode]; + if (switched_to_fullscreen) { + switched_to_fullscreen = false; + } else { + [self toggleModifier:keycode]; + } } } @@ -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; }
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: John Arbuckle <programmingkidx@gmail.com> --- v2 changes: Code changes now confined to the handleEvent: method. ui/cocoa.m | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)