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

Ensure global_shosrtcuts is initialized

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-13 15:10:19 +05:30
parent 682eb7d802
commit 34d7643bed
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
glfw/cocoa_init.m
View File

@ -519,33 +519,35 @@ static void
build_global_shortcuts_lookup(void) { build_global_shortcuts_lookup(void) {
NSMutableDictionary *temp = [NSMutableDictionary dictionaryWithCapacity:128]; // will be autoreleased NSMutableDictionary *temp = [NSMutableDictionary dictionaryWithCapacity:128]; // will be autoreleased
NSDictionary *apple_settings = [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"com.apple.symbolichotkeys"]; NSDictionary *apple_settings = [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"com.apple.symbolichotkeys"];
if (!apple_settings) return; if (apple_settings) {
NSDictionary *symbolic_hotkeys = [apple_settings objectForKey:@"AppleSymbolicHotKeys"]; NSDictionary *symbolic_hotkeys = [apple_settings objectForKey:@"AppleSymbolicHotKeys"];
if (!symbolic_hotkeys) return; if (symbolic_hotkeys) {
[symbolic_hotkeys enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) { [symbolic_hotkeys enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
(void)stop; (void)stop;
if ([key isKindOfClass:[NSString class]] && [obj isKindOfClass:[NSDictionary class]]) { if ([key isKindOfClass:[NSString class]] && [obj isKindOfClass:[NSDictionary class]]) {
NSInteger sc = [(NSString*)key integerValue]; NSInteger sc = [(NSString*)key integerValue];
NSDictionary *sc_value = obj; NSDictionary *sc_value = obj;
id enabled = [sc_value objectForKey:@"enabled"]; id enabled = [sc_value objectForKey:@"enabled"];
if (!enabled || ![enabled isKindOfClass:[NSNumber class]] || ![(NSNumber*)enabled boolValue]) return; if (!enabled || ![enabled isKindOfClass:[NSNumber class]] || ![(NSNumber*)enabled boolValue]) return;
id v = [sc_value objectForKey:@"value"]; id v = [sc_value objectForKey:@"value"];
if (!v || ![v isKindOfClass:[NSDictionary class]]) return; if (!v || ![v isKindOfClass:[NSDictionary class]]) return;
NSDictionary *value = v; NSDictionary *value = v;
id p = [value objectForKey:@"parameters"]; id p = [value objectForKey:@"parameters"];
if (!p || ![p isKindOfClass:[NSArray class]]) return; if (!p || ![p isKindOfClass:[NSArray class]]) return;
NSArray<NSNumber*> *parameters = p; NSArray<NSNumber*> *parameters = p;
NSInteger ch = [parameters[0] integerValue]; NSInteger ch = [parameters[0] integerValue];
NSInteger vk = [parameters[1] integerValue]; NSInteger vk = [parameters[1] integerValue];
NSEventModifierFlags mods = [parameters[2] unsignedIntegerValue]; NSEventModifierFlags mods = [parameters[2] unsignedIntegerValue];
static char buf[64]; static char buf[64];
if (ch == 0xffff) { if (ch == 0xffff) {
if (vk == 0xffff) return; if (vk == 0xffff) return;
snprintf(buf, sizeof(buf) - 1, "v:%lx:%ld", (unsigned long)mods, (long)vk); snprintf(buf, sizeof(buf) - 1, "v:%lx:%ld", (unsigned long)mods, (long)vk);
} else snprintf(buf, sizeof(buf) - 1, "c:%lx:%ld", (unsigned long)mods, (long)ch); } else snprintf(buf, sizeof(buf) - 1, "c:%lx:%ld", (unsigned long)mods, (long)ch);
temp[@(buf)] = @(sc); temp[@(buf)] = @(sc);
}
}];
} }
}]; }
global_shortcuts = [[NSDictionary dictionaryWithDictionary:temp] retain]; global_shortcuts = [[NSDictionary dictionaryWithDictionary:temp] retain];
} }