* [PATCH v3 0/2] cocoa: keyboard quality of life
@ 2021-05-04 23:32 gustavo
2021-05-04 23:32 ` [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed gustavo
2021-05-04 23:32 ` [PATCH v3 2/2] ui/cocoa: add option to swap Option and Command, enable by default gustavo
0 siblings, 2 replies; 7+ messages in thread
From: gustavo @ 2021-05-04 23:32 UTC (permalink / raw)
To: qemu-devel
Cc: 'Peter Maydell ', 'Markus Armbruster ',
'Gerd Hoffmann ',
Gustavo Noronha Silva
From: Gustavo Noronha Silva <gustavo@noronha.eti.br>
v3 removes a rogue ; that made its way into v2 and makes the
swap-option-command parameter off by default, so existing
behaviour is maintained, as suggested by BALATON Zoltan.
-----
This series adds two new options to the cocoa display:
- full-grab causes it to use a global tap to steal system combos
away from Mac OS X, so they can be handled by the VM
- swap-option-command does what it says on the tin; while that is
something you can do at the Mac OS X level or even supported by
some keyboards, it is much more convenient to have qemu put
Meta/Super and Alt where they belong if you are running a
non-Mac VM
Both are off by default. For full-grab in particular, it is off also
because unfortunately it needs accessibility permissions for input
grabbing, so it requires more deliberate action by the user anyway.
Gustavo Noronha Silva (2):
ui/cocoa: capture all keys and combos when mouse is grabbed
ui/cocoa: add option to swap Option and Command, enable by default
qapi/ui.json | 22 ++++++++
qemu-options.hx | 4 ++
ui/cocoa.m | 135 ++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 152 insertions(+), 9 deletions(-)
--
2.24.3 (Apple Git-128)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed
2021-05-04 23:32 [PATCH v3 0/2] cocoa: keyboard quality of life gustavo
@ 2021-05-04 23:32 ` gustavo
2021-05-10 9:56 ` 'Gerd Hoffmann '
2021-05-11 3:08 ` Akihiko Odaki
2021-05-04 23:32 ` [PATCH v3 2/2] ui/cocoa: add option to swap Option and Command, enable by default gustavo
1 sibling, 2 replies; 7+ messages in thread
From: gustavo @ 2021-05-04 23:32 UTC (permalink / raw)
To: qemu-devel
Cc: 'Peter Maydell ', 'Markus Armbruster ',
'Gerd Hoffmann ',
Gustavo Noronha Silva
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
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gustavo Noronha Silva <gustavo@noronha.eti.br>
---
qapi/ui.json | 16 +++++++++++
qemu-options.hx | 3 +++
ui/cocoa.m | 71 ++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 89 insertions(+), 1 deletion(-)
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 fd21002bd6..a77505241f 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..0a45ab30e6 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -72,6 +72,7 @@
typedef struct {
int width;
int height;
+ bool full_grab;
} QEMUScreen;
static void cocoa_update(DisplayChangeListener *dcl,
@@ -304,11 +305,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;
@@ -323,6 +326,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled;
*/
- (BOOL) isMouseGrabbed;
- (BOOL) isAbsoluteEnabled;
+- (BOOL) isFullGrabEnabled;
- (float) cdx;
- (float) cdy;
- (QEMUScreen) gscreen;
@@ -331,6 +335,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 isFullGrabEnabled] && [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
{
@@ -344,6 +361,32 @@ - (id)initWithFrame:(NSRect)frameRect
kbd = qkbd_state_init(dcl.con);
}
+
+ 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 self;
+ } 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 self;
+ }
+
+ 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 self;
+ }
+
+ CFRunLoopAddSource(runLoop, tapEventsSrc, kCFRunLoopDefaultMode);
+ CFRelease(tapEventsSrc);
+
return self;
}
@@ -356,6 +399,11 @@ - (void) dealloc
}
qkbd_state_free(kbd);
+
+ if (eventsTap) {
+ CFRelease(eventsTap);
+ }
+
[super dealloc];
}
@@ -593,6 +641,13 @@ - (void) toggleFullScreen:(id)sender
}
}
+- (void) setFullGrab:(id)sender
+{
+ COCOA_DEBUG("QemuCocoaView: setFullGrab\n");
+
+ screen.full_grab = true;
+}
+
- (void) toggleKey: (int)keycode {
qkbd_state_key_event(kbd, keycode, !qkbd_state_key_get(kbd, keycode));
}
@@ -1029,6 +1084,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled {
}
- (BOOL) isMouseGrabbed {return isMouseGrabbed;}
- (BOOL) isAbsoluteEnabled {return isAbsoluteEnabled;}
+- (BOOL) isFullGrabEnabled {return screen.full_grab;}
- (float) cdx {return cdx;}
- (float) cdy {return cdy;}
- (QEMUScreen) gscreen {return screen;}
@@ -1208,6 +1264,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 +1940,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.24.3 (Apple Git-128)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] ui/cocoa: add option to swap Option and Command, enable by default
2021-05-04 23:32 [PATCH v3 0/2] cocoa: keyboard quality of life gustavo
2021-05-04 23:32 ` [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed gustavo
@ 2021-05-04 23:32 ` gustavo
2021-05-10 9:59 ` 'Gerd Hoffmann '
1 sibling, 1 reply; 7+ messages in thread
From: gustavo @ 2021-05-04 23:32 UTC (permalink / raw)
To: qemu-devel
Cc: 'Peter Maydell ', 'Markus Armbruster ',
'Gerd Hoffmann ',
Gustavo Noronha Silva
From: Gustavo Noronha Silva <gustavo@noronha.eti.br>
On Mac OS X the Option key maps to Alt and Command to Super/Meta. This change
swaps them around so that Alt is the key closer to the space bar and Meta/Super
is between Control and Alt, like on non-Mac keyboards.
It is a cocoa display option, disabled by default.
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gustavo Noronha Silva <gustavo@noronha.eti.br>
---
qapi/ui.json | 8 ++++++-
qemu-options.hx | 3 ++-
ui/cocoa.m | 64 ++++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/qapi/ui.json b/qapi/ui.json
index 4ccfae4bbb..ee6fde46d5 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1098,10 +1098,16 @@
# a global grab on key events. (default: off)
# See https://support.apple.com/en-in/guide/mac-help/mh32356/mac
#
+# @swap-option-command: Swap the Option and Command keys so that their key
+# codes match their position on non-Mac keyboards and
+# you can use Meta/Super and Alt where you expect them.
+# (default: off)
+#
# Since: 6.1
##
{ 'struct' : 'DisplayCocoa',
- 'data' : { '*full-grab' : 'bool' } }
+ 'data' : { '*full-grab' : 'bool',
+ '*swap-option-command' : 'bool' } }
##
# @DisplayType:
diff --git a/qemu-options.hx b/qemu-options.hx
index a77505241f..6fcb0b6aaa 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1784,7 +1784,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
"-display curses[,charset=<encoding>]\n"
#endif
#if defined(CONFIG_COCOA)
- "-display cocoa[,full_grab=on|off]\n"
+ "-display cocoa[,full-grab=on|off]\n"
+ " [,swap-option-command=on|off]\n"
#endif
#if defined(CONFIG_OPENGL)
"-display egl-headless[,rendernode=<file>]\n"
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 0a45ab30e6..b8fe64e252 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -73,6 +73,7 @@
int width;
int height;
bool full_grab;
+ bool swap_option_command;
} QEMUScreen;
static void cocoa_update(DisplayChangeListener *dcl,
@@ -327,6 +328,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled;
- (BOOL) isMouseGrabbed;
- (BOOL) isAbsoluteEnabled;
- (BOOL) isFullGrabEnabled;
+- (BOOL) isSwapOptionCommandEnabled;
- (float) cdx;
- (float) cdy;
- (QEMUScreen) gscreen;
@@ -648,6 +650,13 @@ - (void) setFullGrab:(id)sender
screen.full_grab = true;
}
+- (void) setSwapOptionCommand:(id)sender
+{
+ COCOA_DEBUG("QemuCocoaView: setSwapOptionCommand\n");
+
+ screen.swap_option_command = true;
+}
+
- (void) toggleKey: (int)keycode {
qkbd_state_key_event(kbd, keycode, !qkbd_state_key_get(kbd, keycode));
}
@@ -797,12 +806,22 @@ - (bool) handleEventLocked:(NSEvent *)event
qkbd_state_key_event(kbd, Q_KEY_CODE_CTRL_R, false);
}
if (!(modifiers & NSEventModifierFlagOption)) {
- qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false);
- qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false);
+ if ([self isSwapOptionCommandEnabled]) {
+ qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false);
+ qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false);
+ } else {
+ qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false);
+ qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false);
+ }
}
if (!(modifiers & NSEventModifierFlagCommand)) {
- qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false);
- qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false);
+ if ([self isSwapOptionCommandEnabled]) {
+ qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false);
+ qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false);
+ } else {
+ qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false);
+ qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false);
+ }
}
switch ([event type]) {
@@ -834,13 +853,21 @@ - (bool) handleEventLocked:(NSEvent *)event
case kVK_Option:
if (!!(modifiers & NSEventModifierFlagOption)) {
- [self toggleKey:Q_KEY_CODE_ALT];
+ if ([self isSwapOptionCommandEnabled]) {
+ [self toggleKey:Q_KEY_CODE_META_L];
+ } else {
+ [self toggleKey:Q_KEY_CODE_ALT];
+ }
}
break;
case kVK_RightOption:
if (!!(modifiers & NSEventModifierFlagOption)) {
- [self toggleKey:Q_KEY_CODE_ALT_R];
+ if ([self isSwapOptionCommandEnabled]) {
+ [self toggleKey:Q_KEY_CODE_META_R];
+ } else {
+ [self toggleKey:Q_KEY_CODE_ALT_R];
+ }
}
break;
@@ -848,14 +875,22 @@ - (bool) handleEventLocked:(NSEvent *)event
case kVK_Command:
if (isMouseGrabbed &&
!!(modifiers & NSEventModifierFlagCommand)) {
- [self toggleKey:Q_KEY_CODE_META_L];
+ if ([self isSwapOptionCommandEnabled]) {
+ [self toggleKey:Q_KEY_CODE_ALT];
+ } else {
+ [self toggleKey:Q_KEY_CODE_META_L];
+ }
}
break;
case kVK_RightCommand:
if (isMouseGrabbed &&
!!(modifiers & NSEventModifierFlagCommand)) {
- [self toggleKey:Q_KEY_CODE_META_R];
+ if ([self isSwapOptionCommandEnabled]) {
+ [self toggleKey:Q_KEY_CODE_ALT_R];
+ } else {
+ [self toggleKey:Q_KEY_CODE_META_R];
+ }
}
break;
}
@@ -1085,6 +1120,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled {
- (BOOL) isMouseGrabbed {return isMouseGrabbed;}
- (BOOL) isAbsoluteEnabled {return isAbsoluteEnabled;}
- (BOOL) isFullGrabEnabled {return screen.full_grab;}
+- (BOOL) isSwapOptionCommandEnabled {return screen.swap_option_command;}
- (float) cdx {return cdx;}
- (float) cdy {return cdy;}
- (QEMUScreen) gscreen {return screen;}
@@ -1271,6 +1307,13 @@ - (void) setFullGrab:(id)sender
[cocoaView setFullGrab:sender];
}
+- (void) setSwapOptionCommand:(id)sender
+{
+ COCOA_DEBUG("QemuCocoaAppController: setSwapOptionCommand\n");
+
+ [cocoaView setSwapOptionCommand:sender];
+}
+
/* Tries to find then open the specified filename */
- (void) openDocumentation: (NSString *) filename
{
@@ -1953,6 +1996,11 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
[[controller delegate] setFullGrab: nil];
});
}
+ if (opts->u.cocoa.has_swap_option_command && opts->u.cocoa.swap_option_command) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [[controller delegate] setSwapOptionCommand: nil];
+ });
+ }
if (opts->has_show_cursor && opts->show_cursor) {
cursor_hide = 0;
}
--
2.24.3 (Apple Git-128)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed
2021-05-04 23:32 ` [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed gustavo
@ 2021-05-10 9:56 ` 'Gerd Hoffmann '
2021-05-11 3:08 ` Akihiko Odaki
1 sibling, 0 replies; 7+ messages in thread
From: 'Gerd Hoffmann ' @ 2021-05-10 9:56 UTC (permalink / raw)
To: gustavo
Cc: 'Peter Maydell ', qemu-devel, 'Markus Armbruster '
On Tue, May 04, 2021 at 08:32:31PM -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
>
> Acked-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Gustavo Noronha Silva <gustavo@noronha.eti.br>
Ping. Any comment from the macos guys on this one?
thanks,
Gerd
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] ui/cocoa: add option to swap Option and Command, enable by default
2021-05-04 23:32 ` [PATCH v3 2/2] ui/cocoa: add option to swap Option and Command, enable by default gustavo
@ 2021-05-10 9:59 ` 'Gerd Hoffmann '
0 siblings, 0 replies; 7+ messages in thread
From: 'Gerd Hoffmann ' @ 2021-05-10 9:59 UTC (permalink / raw)
To: gustavo
Cc: 'Peter Maydell ', qemu-devel, 'Markus Armbruster '
On Tue, May 04, 2021 at 08:32:32PM -0300, gustavo@noronha.eti.br wrote:
> From: Gustavo Noronha Silva <gustavo@noronha.eti.br>
>
> On Mac OS X the Option key maps to Alt and Command to Super/Meta. This change
> swaps them around so that Alt is the key closer to the space bar and Meta/Super
> is between Control and Alt, like on non-Mac keyboards.
>
> It is a cocoa display option, disabled by default.
This contradicts $subject (pleae fix in case v4 is needed for other
reasons, otherwise I can fix subject on merge).
take care,
Gerd
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed
2021-05-04 23:32 ` [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed gustavo
2021-05-10 9:56 ` 'Gerd Hoffmann '
@ 2021-05-11 3:08 ` Akihiko Odaki
2021-05-11 17:44 ` Gustavo Noronha Silva
1 sibling, 1 reply; 7+ messages in thread
From: Akihiko Odaki @ 2021-05-11 3:08 UTC (permalink / raw)
To: gustavo, qemu-devel
Cc: 'Peter Maydell ', 'Markus Armbruster ',
'Gerd Hoffmann '
On 2021/05/05 8:32, gustavo@noronha.eti.br wrote:> @@ -344,6 +361,32 @@
- (id)initWithFrame:(NSRect)frameRect
> kbd = qkbd_state_init(dcl.con);
>
> }
> +
> + 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 self;
> + } 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 self;
> + }
> +
> + 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 self;
> + }
> +
> + CFRunLoopAddSource(runLoop, tapEventsSrc, kCFRunLoopDefaultMode);
> + CFRelease(tapEventsSrc);
> +
> return self;
> }
>
These statements should be in "if (self)" block which they follow, or it
may rely on "self" even if it failed to allocate and initialize "self".
Regards,
Akihiko Odaki
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed
2021-05-11 3:08 ` Akihiko Odaki
@ 2021-05-11 17:44 ` Gustavo Noronha Silva
0 siblings, 0 replies; 7+ messages in thread
From: Gustavo Noronha Silva @ 2021-05-11 17:44 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
Cc: 'Peter Maydell ', 'Markus Armbruster ',
'Gerd Hoffmann '
Hey,
On Tue, May 11, 2021, at 12:08 AM, Akihiko Odaki wrote:
<snip>
> > + CFRunLoopAddSource(runLoop, tapEventsSrc, kCFRunLoopDefaultMode);
> > + CFRelease(tapEventsSrc);
> > +
> > return self;
> > }
> >
>
> These statements should be in "if (self)" block which they follow, or it
> may rely on "self" even if it failed to allocate and initialize "self".
Good catch! How about an early return if init failed instead, though? I'll send a v4.
Cheers,
Gustavo
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-05-11 17:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-04 23:32 [PATCH v3 0/2] cocoa: keyboard quality of life gustavo
2021-05-04 23:32 ` [PATCH v3 1/2] ui/cocoa: capture all keys and combos when mouse is grabbed gustavo
2021-05-10 9:56 ` 'Gerd Hoffmann '
2021-05-11 3:08 ` Akihiko Odaki
2021-05-11 17:44 ` Gustavo Noronha Silva
2021-05-04 23:32 ` [PATCH v3 2/2] ui/cocoa: add option to swap Option and Command, enable by default gustavo
2021-05-10 9:59 ` 'Gerd Hoffmann '
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).