diff --git a/installer/installer/Info.plist b/installer/installer/Info.plist index b04e346..0f40656 100644 --- a/installer/installer/Info.plist +++ b/installer/installer/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.1 + 1.0.2 CFBundleSignature ???? CFBundleVersion - 1.0.1 + 1.0.2 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/loginItem/loginItem/Info.plist b/loginItem/loginItem/Info.plist index 6afc8c4..0a31deb 100644 --- a/loginItem/loginItem/Info.plist +++ b/loginItem/loginItem/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.1 + 1.0.2 CFBundleSignature ???? CFBundleVersion - 1.0.1 + 1.0.2 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement diff --git a/mainApp/mainApp/Info.plist b/mainApp/mainApp/Info.plist index 64a9b99..1d068f7 100644 --- a/mainApp/mainApp/Info.plist +++ b/mainApp/mainApp/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.1 + 1.0.2 CFBundleURLTypes @@ -32,7 +32,7 @@ CFBundleVersion - 1.0.1 + 1.0.2 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement diff --git a/mainApp/mainApp/ScanRow.m b/mainApp/mainApp/ScanRow.m index bae58c8..64d2efc 100755 --- a/mainApp/mainApp/ScanRow.m +++ b/mainApp/mainApp/ScanRow.m @@ -17,7 +17,10 @@ NSRect selectionRect = {0}; //selection path - NSBezierPath *selectionPath = nil; + NSBezierPath* selectionPath = nil; + + //selection color + NSColor* selectionColor = nil; //highlight selected rows if(self.selectionHighlightStyle != NSTableViewSelectionHighlightStyleNone) @@ -25,9 +28,13 @@ //make selection rect selectionRect = NSInsetRect(self.bounds, 2.5, 2.5); - NSColor *selectionColor = [NSColor systemGrayColor]; + //default color + selectionColor = [NSColor systemGrayColor]; - if (@available(macOS 10.14, *)) { + //10.4, set to unemphasized + if (@available(macOS 10.14, *)) + { + //set selectionColor = [NSColor unemphasizedSelectedContentBackgroundColor]; } @@ -38,7 +45,7 @@ [selectionColor setFill]; //create selection path - // ->with rounded corners + // with rounded corners selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:5 yRadius:5]; //fill diff --git a/shared/EventTaps.m b/shared/EventTaps.m index 6e67033..c2dfaf4 100644 --- a/shared/EventTaps.m +++ b/shared/EventTaps.m @@ -16,30 +16,6 @@ @synthesize previousTaps; -//init method -// set some intial flags, init daemon comms, etc. --(id)init -{ - //super - self = [super init]; - if(self != nil) - { - /* - //alloc set - currentTaps = [NSMutableSet set]; - - //init current taps - for(NSDictionary* tap in [self enumerate]) - { - //add - [currentTaps addObject:tap[@"tapID"]]; - } - */ - } - - return self; -} - //enumerate event taps // activated keyboard taps -(NSMutableDictionary*)enumerate @@ -189,28 +165,33 @@ bail: //register 'kCGNotifyEventTapAdded' notification notify_register_dispatch(kCGNotifyEventTapAdded, ¬ifyToken, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^(int token) { - //grab current taps - // ...should now include any new ones - currentTaps = [self enumerate]; - - //identify any new taps - // invoke callback for those... - for(NSNumber* tapID in currentTaps.allKeys) + //sync to assure thread safety + @synchronized(self) { - //not new? - if(nil != self.previousTaps[tapID]) + //grab current taps + // ...should now include any new ones + currentTaps = [self enumerate]; + + //identify any new taps + // invoke callback for those... + for(NSNumber* tapID in currentTaps.allKeys) { - //skip - continue; + //not new? + if(nil != self.previousTaps[tapID]) + { + //skip + continue; + } + + //new! + callback(currentTaps[tapID]); } - //new! - callback(currentTaps[tapID]); - } - - //update taps - self.previousTaps = currentTaps; + //update taps + self.previousTaps = currentTaps; + } //sync + }); //run loop @@ -219,5 +200,4 @@ bail: return; } - @end