| Message ID | 20210511185538.29344-2-gustavo@noronha.eti.br |
|---|---|
| State | New |
| Headers | show |
| Series | cocoa: keyboard quality of life | expand |
On Tue, May 11, 2021 at 03:55:37PM -0300, gustavo@noronha.eti.br wrote: > From: Gustavo Noronha Silva <gustavo@noronha.eti.br> > > Applications such as Gnome may use Alt-Tab and Super-Tab for different > purposes, some use Ctrl-arrows so we want to allow qemu to handle > everything when it captures the mouse/keyboard. > > However, Mac OS handles some combos like Command-Tab and Ctrl-arrows > at an earlier part of the event handling chain, not letting qemu see it. > > We add a global Event Tap that allows qemu to see all events when the > mouse is grabbed. Note that this requires additional permissions. > > See: > > https://developer.apple.com/documentation/coregraphics/1454426-cgeventtapcreate?language=objc#discussion > https://support.apple.com/en-in/guide/mac-help/mh32356/mac Ping. Reviews from cocoa guys please? thanks, Gerd
On Tue, May 18, 2021, at 7:14 AM, 'Gerd Hoffmann ' wrote: > On Tue, May 11, 2021 at 03:55:37PM -0300, gustavo@noronha.eti.br wrote: > > From: Gustavo Noronha Silva <gustavo@noronha.eti.br> > > > > Applications such as Gnome may use Alt-Tab and Super-Tab for different > > purposes, some use Ctrl-arrows so we want to allow qemu to handle > > everything when it captures the mouse/keyboard. > > > > However, Mac OS handles some combos like Command-Tab and Ctrl-arrows > > at an earlier part of the event handling chain, not letting qemu see it. > > > > We add a global Event Tap that allows qemu to see all events when the > > mouse is grabbed. Note that this requires additional permissions. > > > > See: > > > > https://developer.apple.com/documentation/coregraphics/1454426-cgeventtapcreate?language=objc#discussion > > https://support.apple.com/en-in/guide/mac-help/mh32356/mac > > Ping. Reviews from cocoa guys please? Ping 2? =)
Ping 3? =) On Wed, May 26, 2021, at 12:13 PM, Gustavo Noronha Silva wrote: > On Tue, May 18, 2021, at 7:14 AM, 'Gerd Hoffmann ' wrote: > > On Tue, May 11, 2021 at 03:55:37PM -0300, gustavo@noronha.eti.br wrote: > > > From: Gustavo Noronha Silva <gustavo@noronha.eti.br> > > > > > > Applications such as Gnome may use Alt-Tab and Super-Tab for different > > > purposes, some use Ctrl-arrows so we want to allow qemu to handle > > > everything when it captures the mouse/keyboard. > > > > > > However, Mac OS handles some combos like Command-Tab and Ctrl-arrows > > > at an earlier part of the event handling chain, not letting qemu see it. > > > > > > We add a global Event Tap that allows qemu to see all events when the > > > mouse is grabbed. Note that this requires additional permissions. > > > > > > See: > > > > > > https://developer.apple.com/documentation/coregraphics/1454426-cgeventtapcreate?language=objc#discussion > > > https://support.apple.com/en-in/guide/mac-help/mh32356/mac > > > > Ping. Reviews from cocoa guys please? > > Ping 2? =)
2021年5月12日(水) 3:56 <gustavo@noronha.eti.br>: > @@ -1877,11 +1934,17 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) > qemu_sem_wait(&app_started_sem); > COCOA_DEBUG("cocoa_display_init: app start completed\n"); > > + QemuCocoaAppController* controller = (QemuCocoaAppController *)[NSApplication sharedApplication]; > /* if fullscreen mode is to be used */ > if (opts->has_full_screen && opts->full_screen) { > dispatch_async(dispatch_get_main_queue(), ^{ > [NSApp activateIgnoringOtherApps: YES]; > - [(QemuCocoaAppController *)[[NSApplication sharedApplication] delegate] toggleFullScreen: nil]; > + [[controller delegate] toggleFullScreen: nil]; > + }); > + } > + if (opts->u.cocoa.has_full_grab && opts->u.cocoa.full_grab) { > + dispatch_async(dispatch_get_main_queue(), ^{ > + [[controller delegate] setFullGrab: nil]; > }); > } > if (opts->has_show_cursor && opts->show_cursor) { > -- > 2.30.1 (Apple Git-130) > Hi, I found a problem which I didn't notice when I reviewed this patch before. [NSApplication sharedApplication] is casted to QemuCocoaAppController *, but its type is QemuApplication. Perhaps it should be: QemuCocoaAppController* controller = (QemuCocoaAppController *)[[NSApplication sharedApplication] delegate]; and the following [controller delegate] should be replaced with controller. Regards, Akihiko Odaki
diff --git a/qapi/ui.json b/qapi/ui.json index 1052ca9c38..4ccfae4bbb 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1088,6 +1088,21 @@ { 'struct' : 'DisplayCurses', 'data' : { '*charset' : 'str' } } +## +# @DisplayCocoa: +# +# Cocoa display options. +# +# @full-grab: Capture all key presses, including system combos. This +# requires accessibility permissions, since it performs +# a global grab on key events. (default: off) +# See https://support.apple.com/en-in/guide/mac-help/mh32356/mac +# +# Since: 6.1 +## +{ 'struct' : 'DisplayCocoa', + 'data' : { '*full-grab' : 'bool' } } + ## # @DisplayType: # @@ -1153,6 +1168,7 @@ '*gl' : 'DisplayGLMode' }, 'discriminator' : 'type', 'data' : { 'gtk' : 'DisplayGTK', + 'cocoa' : 'DisplayCocoa', 'curses' : 'DisplayCurses', 'egl-headless' : 'DisplayEGLHeadless'} } diff --git a/qemu-options.hx b/qemu-options.hx index 7c825f81fc..eeaa5c73e9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1783,6 +1783,9 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #if defined(CONFIG_CURSES) "-display curses[,charset=<encoding>]\n" #endif +#if defined(CONFIG_COCOA) + "-display cocoa[,full_grab=on|off]\n" +#endif #if defined(CONFIG_OPENGL) "-display egl-headless[,rendernode=<file>]\n" #endif diff --git a/ui/cocoa.m b/ui/cocoa.m index 37e1fb52eb..236352deac 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -304,11 +304,13 @@ @interface QemuCocoaView : NSView BOOL isMouseGrabbed; BOOL isFullscreen; BOOL isAbsoluteEnabled; + CFMachPortRef eventsTap; } - (void) switchSurface:(pixman_image_t *)image; - (void) grabMouse; - (void) ungrabMouse; - (void) toggleFullScreen:(id)sender; +- (void) setFullGrab:(id)sender; - (void) handleMonitorInput:(NSEvent *)event; - (bool) handleEvent:(NSEvent *)event; - (bool) handleEventLocked:(NSEvent *)event; @@ -331,6 +333,19 @@ - (void) raiseAllKeys; QemuCocoaView *cocoaView; +static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEventRef cgEvent, void *userInfo) +{ + QemuCocoaView *cocoaView = (QemuCocoaView*) userInfo; + NSEvent* event = [NSEvent eventWithCGEvent:cgEvent]; + if ([cocoaView isMouseGrabbed] && [cocoaView handleEvent:event]) { + COCOA_DEBUG("Global events tap: qemu handled the event, capturing!\n"); + return NULL; + } + COCOA_DEBUG("Global events tap: qemu did not handle the event, letting it through...\n"); + + return cgEvent; +} + @implementation QemuCocoaView - (id)initWithFrame:(NSRect)frameRect { @@ -356,6 +371,11 @@ - (void) dealloc } qkbd_state_free(kbd); + + if (eventsTap) { + CFRelease(eventsTap); + } + [super dealloc]; } @@ -593,6 +613,36 @@ - (void) toggleFullScreen:(id)sender } } +- (void) setFullGrab:(id)sender +{ + COCOA_DEBUG("QemuCocoaView: setFullGrab\n"); + + CGEventMask mask = CGEventMaskBit(kCGEventKeyDown) | CGEventMaskBit(kCGEventKeyUp) | CGEventMaskBit(kCGEventFlagsChanged); + eventsTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault, + mask, handleTapEvent, self); + if (!eventsTap) { + warn_report("Could not create event tap, system key combos will not be captured.\n"); + return; + } else { + COCOA_DEBUG("Global events tap created! Will capture system key combos.\n"); + } + + CFRunLoopRef runLoop = CFRunLoopGetCurrent(); + if (!runLoop) { + warn_report("Could not obtain current CF RunLoop, system key combos will not be captured.\n"); + return; + } + + CFRunLoopSourceRef tapEventsSrc = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, eventsTap, 0); + if (!tapEventsSrc ) { + warn_report("Could not obtain current CF RunLoop, system key combos will not be captured.\n"); + return; + } + + CFRunLoopAddSource(runLoop, tapEventsSrc, kCFRunLoopDefaultMode); + CFRelease(tapEventsSrc); +} + - (void) toggleKey: (int)keycode { qkbd_state_key_event(kbd, keycode, !qkbd_state_key_get(kbd, keycode)); } @@ -1208,6 +1258,13 @@ - (void)toggleFullScreen:(id)sender [cocoaView toggleFullScreen:sender]; } +- (void) setFullGrab:(id)sender +{ + COCOA_DEBUG("QemuCocoaAppController: setFullGrab\n"); + + [cocoaView setFullGrab:sender]; +} + /* Tries to find then open the specified filename */ - (void) openDocumentation: (NSString *) filename { @@ -1877,11 +1934,17 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) qemu_sem_wait(&app_started_sem); COCOA_DEBUG("cocoa_display_init: app start completed\n"); + QemuCocoaAppController* controller = (QemuCocoaAppController *)[NSApplication sharedApplication]; /* if fullscreen mode is to be used */ if (opts->has_full_screen && opts->full_screen) { dispatch_async(dispatch_get_main_queue(), ^{ [NSApp activateIgnoringOtherApps: YES]; - [(QemuCocoaAppController *)[[NSApplication sharedApplication] delegate] toggleFullScreen: nil]; + [[controller delegate] toggleFullScreen: nil]; + }); + } + if (opts->u.cocoa.has_full_grab && opts->u.cocoa.full_grab) { + dispatch_async(dispatch_get_main_queue(), ^{ + [[controller delegate] setFullGrab: nil]; }); } if (opts->has_show_cursor && opts->show_cursor) {