nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-22 21:09:33 +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

11
MacPass/MPKeyMapper.m
View File

@@ -22,7 +22,7 @@
#import "MPKeyMapper.h"
#import <Carbon/Carbon.h>
#define MPSafeSetPointer(pointer, value) if(pointer != 0) { *pointer = value; }
#define MPArrayCount(array) (sizeof(array) / sizeof(array[0]))
uint16_t const kMPUnknownKeyCode = UINT16_MAX;
@@ -106,12 +106,11 @@ uint16_t const kMPUnknownKeyCode = UINT16_MAX;
/* Loop through every keycode (0 - 127) to find its current mapping. */
/* Loop throuhg every control key compbination for every virtual key */
for(CGKeyCode keyCode = 0; keyCode < 128; ++keyCode) {
for(int modifierIndex = 0; modifierIndex < sizeof(modifierCombinations); modifierIndex++) {
for(int modifierIndex = 0; modifierIndex < MPArrayCount(modifierCombinations); modifierIndex++) {
MPModifiedKey mKey = MPMakeModifiedKey(modifierCombinations[modifierIndex], keyCode);
NSString *string = [self stringForModifiedKey:mKey];
if(string != nil && string.length > 0 && nil == tempCharToCodeDict[string]) {
NSValue *value = [NSValue valueWithBytes:&mKey objCType:@encode(MPModifiedKey)];
tempCharToCodeDict[string] = value;
tempCharToCodeDict[string] = [NSValue valueWithModifiedKey:mKey];
}
}
}
@@ -123,9 +122,7 @@ uint16_t const kMPUnknownKeyCode = UINT16_MAX;
if(!result) {
return MPMakeModifiedKey(0, kMPUnknownKeyCode);
}
MPModifiedKey mKey;
[result getValue:&mKey];
return mKey;
return result.modifiedKeyValue;
}
@end