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

Pass through more modifier+tab variants

Browse Source
This commit is contained in:
Kovid Goyal 2021-10-17 11:31:54 +05:30
parent 426815f7ab
commit f9944e6140
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
glfw/cocoa_init.m
View File

@ -454,12 +454,30 @@ void* _glfwLoadLocalVulkanLoaderNS(void)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
static bool static bool
is_ctrl_tab(NSEvent *event, NSEventModifierFlags modifierFlags) { is_modified_tab(NSEvent *event, NSEventModifierFlags modifierFlags) {
switch (modifierFlags) {
// No need to handle shift+tab, [shift]+option+tab
case NSEventModifierFlagShift:
case NSEventModifierFlagOption:
case (NSEventModifierFlagShift | NSEventModifierFlagOption):
// Do not intercept cmd+tab, shift+cmd+tab
case NSEventModifierFlagCommand:
case (NSEventModifierFlagShift | NSEventModifierFlagCommand):
return false;
default:
break;
}
// ctrl+whatever+tab, option+cmd+tab
if ( if (
(modifierFlags == NSEventModifierFlagControl && (
[event.charactersIgnoringModifiers isEqualToString:@"\t"]) || (modifierFlags & NSEventModifierFlagControl) ||
(modifierFlags == (NSEventModifierFlagControl | NSEventModifierFlagShift) && modifierFlags == (NSEventModifierFlagOption | NSEventModifierFlagCommand)
[event.charactersIgnoringModifiers isEqualToString:@"\x19"]) ) && [event.charactersIgnoringModifiers isEqualToString:@"\t"]
) return true;
// shift+whatever+tab
if (
(modifierFlags & NSEventModifierFlagShift) &&
[event.charactersIgnoringModifiers isEqualToString:@"\x19"]
) return true; ) return true;
return false; return false;
} }
@ -543,7 +561,7 @@ int _glfwPlatformInit(void)
NSEvent* (^keydown_block)(NSEvent*) = ^ NSEvent* (NSEvent* event) NSEvent* (^keydown_block)(NSEvent*) = ^ NSEvent* (NSEvent* event)
{ {
NSEventModifierFlags modifierFlags = [event modifierFlags] & (NSEventModifierFlagShift | NSEventModifierFlagOption | NSEventModifierFlagCommand | NSEventModifierFlagControl); NSEventModifierFlags modifierFlags = [event modifierFlags] & (NSEventModifierFlagShift | NSEventModifierFlagOption | NSEventModifierFlagCommand | NSEventModifierFlagControl);
if (is_modified_special_key(event, modifierFlags) || is_ctrl_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) { if (is_modified_special_key(event, modifierFlags) || is_modified_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) {
// Cocoa swallows various key presses, so route them explicitly // Cocoa swallows various key presses, so route them explicitly
[[NSApp keyWindow].contentView keyDown:event]; [[NSApp keyWindow].contentView keyDown:event];
return nil; return nil;
@ -561,7 +579,7 @@ 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_modified_special_key(event, modifierFlags) || is_ctrl_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) { if (is_modified_special_key(event, modifierFlags) || is_modified_tab(event, modifierFlags) || is_cmd_period(event, modifierFlags)) {
// Cocoa swallows various key presses, so route them explicitly // Cocoa swallows various key presses, so route them explicitly
[[NSApp keyWindow].contentView keyUp:event]; [[NSApp keyWindow].contentView keyUp:event];
return nil; return nil;