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

fix typo in generating lookup keys for vk code based shortcuts

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-13 19:21:49 +05:30
parent ce63ddfe54
commit 79fd01093a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glfw/cocoa_init.m
View File

@ -536,7 +536,7 @@ build_global_shortcuts_lookup(void) {
if (!p || ![p isKindOfClass:[NSArray class]] || [(NSArray*)p count] < 2) continue; if (!p || ![p isKindOfClass:[NSArray class]] || [(NSArray*)p count] < 2) continue;
NSArray<NSNumber*> *parameters = p; NSArray<NSNumber*> *parameters = p;
NSInteger ch = [parameters[0] isKindOfClass:[NSNumber class]] ? [parameters[0] integerValue] : 0xffff; NSInteger ch = [parameters[0] isKindOfClass:[NSNumber class]] ? [parameters[0] integerValue] : 0xffff;
NSInteger vk = [parameters[1] isKindOfClass:[NSNumber class]] ? [parameters[0] integerValue] : 0xffff; NSInteger vk = [parameters[1] isKindOfClass:[NSNumber class]] ? [parameters[1] integerValue] : 0xffff;
NSEventModifierFlags mods = ([parameters count] > 2 && [parameters[2] isKindOfClass:[NSNumber class]]) ? [parameters[2] unsignedIntegerValue] : 0; NSEventModifierFlags mods = ([parameters count] > 2 && [parameters[2] isKindOfClass:[NSNumber class]]) ? [parameters[2] unsignedIntegerValue] : 0;
static char buf[64]; static char buf[64];
if (ch == 0xffff) { if (ch == 0xffff) {
@ -548,6 +548,7 @@ build_global_shortcuts_lookup(void) {
} }
} }
global_shortcuts = [[NSDictionary dictionaryWithDictionary:temp] retain]; global_shortcuts = [[NSDictionary dictionaryWithDictionary:temp] retain];
/* NSLog(@"global_shortcuts: %@", global_shortcuts); */
} }
static int static int
@ -555,7 +556,6 @@ is_active_apple_global_shortcut(NSEvent *event) {
// TODO: watch for settings change and rebuild global_shortcuts using key/value observing on NSUserDefaults // TODO: watch for settings change and rebuild global_shortcuts using key/value observing on NSUserDefaults
if (global_shortcuts == nil) build_global_shortcuts_lookup(); if (global_shortcuts == nil) build_global_shortcuts_lookup();
NSEventModifierFlags modifierFlags = [event modifierFlags] & (NSEventModifierFlagShift | NSEventModifierFlagOption | NSEventModifierFlagCommand | NSEventModifierFlagControl); NSEventModifierFlags modifierFlags = [event modifierFlags] & (NSEventModifierFlagShift | NSEventModifierFlagOption | NSEventModifierFlagCommand | NSEventModifierFlagControl);
/* NSLog(@"global_shortcuts: %@", global_shortcuts); */
static char lookup_key[64]; static char lookup_key[64];
if ([event.charactersIgnoringModifiers length] == 1) { if ([event.charactersIgnoringModifiers length] == 1) {
const unichar ch = [event.charactersIgnoringModifiers characterAtIndex:0]; const unichar ch = [event.charactersIgnoringModifiers characterAtIndex:0];