KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

macOS: Fix ctrl or cmd with Esc or Function keys not working

Browse Source 
Fixes #4109
This commit is contained in:
Kovid Goyal 2021-10-10 21:39:20 +05:30
parent 5e033773dd
commit 2b9408c217
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -77,6 +77,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
- Fix soft hyphens not being preserved when round tripping text through the - Fix soft hyphens not being preserved when round tripping text through the
terminal terminal
- macOS: Fix :kbd:`ctrl or cmd` with :kbd:`Esc or Function keys` not working
(:iss:`4109`)
0.23.1 [2021-08-17] 0.23.1 [2021-08-17]
---------------------- ----------------------

26
glfw/cocoa_init.m
View File

@ -471,6 +471,22 @@ is_cmd_period(NSEvent *event, NSEventModifierFlags modifierFlags) {
return false; return false;
} }
static bool
is_modified_special_key(NSEvent *event, NSEventModifierFlags modifierFlags) {
if ((modifierFlags & (NSEventModifierFlagControl | NSEventModifierFlagCommand)) && [event.charactersIgnoringModifiers length] == 1) {
switch ([event.charactersIgnoringModifiers characterAtIndex:0]) {
case 0x1b: // Esc
case NSF1FunctionKey: case NSF2FunctionKey: case NSF3FunctionKey:
case NSF4FunctionKey: case NSF5FunctionKey: case NSF6FunctionKey: case NSF7FunctionKey:
case NSF8FunctionKey: case NSF9FunctionKey: case NSF10FunctionKey: case NSF11FunctionKey:
case NSF12FunctionKey: case NSF13FunctionKey: case NSF14FunctionKey: case NSF15FunctionKey:
case NSF16FunctionKey: case NSF17FunctionKey: case NSF18FunctionKey: case NSF19FunctionKey:
return true;
}
}
return false;
}
GLFWAPI GLFWapplicationshouldhandlereopenfun glfwSetApplicationShouldHandleReopen(GLFWapplicationshouldhandlereopenfun callback) { GLFWAPI GLFWapplicationshouldhandlereopenfun glfwSetApplicationShouldHandleReopen(GLFWapplicationshouldhandlereopenfun callback) {
GLFWapplicationshouldhandlereopenfun previous = handle_reopen_callback; GLFWapplicationshouldhandlereopenfun previous = handle_reopen_callback;
handle_reopen_callback = callback; handle_reopen_callback = callback;
@ -511,9 +527,10 @@ int _glfwPlatformInit(void)
NSEvent* (^keydown_block)(NSEvent*) = ^ NSEvent* (NSEvent* event) NSEvent* (^keydown_block)(NSEvent*) = ^ NSEvent* (NSEvent* event)
{ {
NSEventModifierFlags modifierFlags = [event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask; NSEventModifierFlags modifierFlags = [event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask;
if (is_ctrl_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) { if (is_modified_special_key(event, modifierFlags) || is_ctrl_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) {
// Cocoa swallows Ctrl+Tab to cycle between views // Cocoa swallows various key presses, so route them explicitly
[[NSApp keyWindow].contentView keyDown:event]; [[NSApp keyWindow].contentView keyDown:event];
return nil;
} }
return event; return event;
@ -528,9 +545,10 @@ int _glfwPlatformInit(void)
// down the command key don't get sent to the key window. // down the command key don't get sent to the key window.
[[NSApp keyWindow] sendEvent:event]; [[NSApp keyWindow] sendEvent:event];
} }
if (is_ctrl_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) { if (is_modified_special_key(event, modifierFlags) || is_ctrl_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) {
// Cocoa swallows Ctrl+Tab to cycle between views // Cocoa swallows various key presses, so route them explicitly
[[NSApp keyWindow].contentView keyUp:event]; [[NSApp keyWindow].contentView keyUp:event];
return nil;
} }
return event; return event;