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

extracted MPModifiedKey, fixed autotype obfuscation to correctly use modifiers

Browse Source
This commit is contained in:
michael starke
2017-01-26 12:34:12 +01:00
parent 1bf75fd0b1
commit fef22bce05
9 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MacPass/MPAutotypeKeyPress.m
View File

@@ -22,14 +22,18 @@ static CGEventFlags _updateModifierMaskForCurrentDefaults(CGEventFlags modifiers
return modifiers;
}
- (instancetype)initWithModifierMask:(CGEventFlags)modiferMask keyCode:(CGKeyCode)code {
- (instancetype)initWithModifiedKey:(MPModifiedKey)key {
self = [super init];
if(self) {
_modifierMask = _updateModifierMaskForCurrentDefaults(modiferMask);
_keyCode = code;
_key = key;
_key.modifier = _updateModifierMaskForCurrentDefaults(_key.modifier);
}
return self;
}
- (instancetype)initWithModifierMask:(CGEventFlags)modiferMask keyCode:(CGKeyCode)code {
self = [self initWithModifiedKey:MPMakeModifiedKey(modiferMask, code)];
return self;
}
- (instancetype)initWithModifierMask:(CGEventFlags)modiferMask character:(NSString *)character {
MPModifiedKey mappedKey = [MPKeyMapper modifiedKeyForCharacter:character];
@@ -40,13 +44,13 @@ static CGEventFlags _updateModifierMaskForCurrentDefaults(CGEventFlags modifiers
if(mappedKey.modifier && (modiferMask != mappedKey.modifier)) {
NSLog(@"Supplied modifiers for character %@ do not match required modifiers", character);
}
self = [self initWithModifierMask:modiferMask keyCode:mappedKey.modifier];
self = [self initWithModifierMask:modiferMask keyCode:mappedKey.keyCode];
}
return self;
}
- (NSString *)description {
return [[NSString alloc] initWithFormat:@"%@: modifierMaks:%llu keyCode:%d", [self class], self.modifierMask, self.keyCode];
return [[NSString alloc] initWithFormat:@"%@: modifierMaks:%llu keyCode:%d", [self class], self.key.modifier, self.key.keyCode];
}
- (void)execute {
@@ -54,7 +58,7 @@ static CGEventFlags _updateModifierMaskForCurrentDefaults(CGEventFlags modifiers
return; // no valid command. Stop.
}
//CGKeyCode mappedKey = [self _transformKeyCode];
[self sendPressKey:self.keyCode modifierFlags:self.modifierMask];
[self sendPressKey:self.key];
}
- (BOOL)isValid {