nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 17:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introducing MPModifiedKey to encapulate keyCode and modifier flags

Browse Source
This commit is contained in:
michael starke
2017-01-25 13:15:24 +01:00
parent e8d5e30142
commit 72574e730a
6 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MacPass/MPAutotypeKeyPress.m
View File

@@ -32,16 +32,15 @@ static CGEventFlags _updateModifierMaskForCurrentDefaults(CGEventFlags modifiers
}
- (instancetype)initWithModifierMask:(CGEventFlags)modiferMask character:(NSString *)character {
CGEventFlags modifiers;
CGKeyCode mappedKey = [MPKeyMapper keyCodeForCharacter:character modifier:&modifiers];
if(mappedKey == kMPUnknownKeyCode) {
MPModifiedKey mappedKey = [MPKeyMapper modifiedKeyForCharacter:character];
if(mappedKey.keyCode == kMPUnknownKeyCode) {
self = nil;
}
else {
if(modifiers && (modiferMask != modifiers)) {
if(mappedKey.modifier && (modiferMask != mappedKey.modifier)) {
NSLog(@"Supplied modifiers for character %@ do not match required modifiers", character);
}
self = [self initWithModifierMask:modiferMask keyCode:mappedKey];
self = [self initWithModifierMask:modiferMask keyCode:mappedKey.modifier];
}
return self;
}