Add 'screenshot permission' to the accessibility prompt

Author: pjrobertson

Quicksilver/Code-App/QSController.h

@@ -21,7 +21,11 @@
 	IBOutlet NSButton *fullDiskButton;
 	IBOutlet NSButton *contactsButton;
 	IBOutlet NSButton *calendarsButton;
+  IBOutlet NSButton *screenshotButton;
 	IBOutlet NSButton *closeAccessibilityWindowButton;
+    BOOL hasClickedScreenshotButton;
+    BOOL hasScreenshotPermissionOnStartup;
+
 
 	NSTimer *accessibilityChecker;
 }

Quicksilver/Code-App/QSController.m

@@ -14,7 +14,6 @@
 #import "QSScreenshots.h"
 #import "QSDonationController.h"
 
-
 #import "QSIntValueTransformer.h"
 
 #import <PermissionsKit/PermissionsKit.h>
@@ -28,6 +27,7 @@ - (void)handleURL:(NSURL *)url;
 
 static QSController *defaultController = nil;
 
+
 @implementation QSController
 
 @synthesize crashReportPath;
@@ -834,23 +834,36 @@ -(void)checkForAccessibilityPermission {
 }
 
 - (void)checkAccessibilityPermissions {
+		[accessibilityPermissionWindow setLevel:NSNormalWindowLevel];
+
 		// Prompt for accessibility permissions on macOS Mojave and later.
 		BOOL hasAccessibility = [self hasAccessibilityPermission];
 		BOOL hasFullDisk = [MPPermissionsKit authorizationStatusForPermissionType:MPPermissionTypeFullDiskAccess] == MPAuthorizationStatusAuthorized;
 		BOOL hasContacts = [MPPermissionsKit authorizationStatusForPermissionType:MPPermissionTypeContacts] == MPAuthorizationStatusAuthorized;
 		BOOL hasCalendars = [MPPermissionsKit authorizationStatusForPermissionType:MPPermissionTypeCalendar] == MPAuthorizationStatusAuthorized;
 		BOOL hasReminders = [MPPermissionsKit authorizationStatusForPermissionType:MPPermissionTypeReminders] == MPAuthorizationStatusAuthorized;
+		
+		BOOL hasScreenshot;
+		if (hasScreenshotPermissionOnStartup) {
+				hasScreenshot = YES;
+		} else {
+				// only call this if the user has actually clicked the screenshot button
+				// this is a kind of hack, since the API for detecting if screenshot permission is enabled is buggy
+				hasScreenshot = hasClickedScreenshotButton;
+		}
+		
 		[accessibilityButton setEnabled:!hasAccessibility];
 		[fullDiskButton setEnabled:!hasFullDisk];
 		[contactsButton setEnabled:!hasContacts];
 		[calendarsButton setEnabled:!hasCalendars || !hasReminders];
+		[screenshotButton setEnabled:!hasScreenshot];
 
 		[closeAccessibilityWindowButton setEnabled:(hasAccessibility && hasFullDisk)];
 
 		if (hasAccessibility && hasFullDisk && hasCalendars && hasContacts && hasReminders) {
 				[accessibilityPermissionWindow close];
 		} else if (!accessibilityChecker) {
-				accessibilityChecker = [NSTimer scheduledTimerWithTimeInterval:1 repeats:YES block:^(NSTimer * _Nonnull timer) {
+				accessibilityChecker = [NSTimer scheduledTimerWithTimeInterval:0.5 repeats:YES block:^(NSTimer * _Nonnull timer) {
 						[self checkAccessibilityPermissions];
 				}];
 				[[NSRunLoop currentRunLoop] addTimer:accessibilityChecker forMode:NSModalPanelRunLoopMode];
@@ -860,11 +873,16 @@ - (void)checkAccessibilityPermissions {
 -(IBAction)showAccessibilityPrompt:(id)sender {
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(closeAccessibilityPrompt:) name:NSWindowWillCloseNotification object:accessibilityPermissionWindow];
 		[closeAccessibilityWindowButton setEnabled:NO];
-		
 		[accessibilityPermissionWindow setIsVisible:YES];
+		hasClickedScreenshotButton = NO;
+		if (@available(macOS 10.15, *)) {
+				hasScreenshotPermissionOnStartup = CGPreflightScreenCaptureAccess();
+		} else {
+				// below 10.15, no need to give permissions
+				hasScreenshotPermissionOnStartup = YES;
+		}
 		[self checkAccessibilityPermissions];
 		[NSApp runModalForWindow:accessibilityPermissionWindow];
-		
 }
 
 - (IBAction)closeAccessibilityPrompt:(NSNotification *)notif {
@@ -892,7 +910,11 @@ -(IBAction)launchPrivacyPreferences:(id)sender {
 						[MPPermissionsKit requestAuthorizationForPermissionType:MPPermissionTypeReminders withCompletion:^(MPAuthorizationStatus status) {
 						}];
 				}];
-				
+		} else if (sender == screenshotButton) {
+				hasClickedScreenshotButton = YES;
+				if (@available(macOS 10.15, *)) {
+						CGRequestScreenCaptureAccess();
+				}
 		} else {
 				[accessibilityPermissionWindow close];
 		}

Quicksilver/Code-QuickStepCore/QSPlugIn.m

@@ -721,7 +721,10 @@ - (BOOL)_registerPlugIn {
 #endif
 
 	[QSReg registerBundle:bundle];
-
+		NSLog(@"%@", [self name]);
+		if ([[self name] isEqualToString:@"Screen Capture Plugin - Private"]) {
+				NSLog(@"A");
+		}
 	if ([[bundle objectForInfoDictionaryKey:@"NSAppleScriptEnabled"] boolValue])
 		[[NSScriptSuiteRegistry sharedScriptSuiteRegistry] loadSuitesFromBundle:bundle];
 
@@ -748,7 +751,6 @@ - (BOOL)_registerPlugIn {
 #ifdef DEBUG
 			if (DEBUG_PLUGINS) NSLog(@"Forcing Load of Class %@", currPrincipalClass);
 #endif
-
 			if ([currPrincipalClass respondsToSelector:@selector(loadPlugIn)])
 				[currPrincipalClass loadPlugIn];
 		}

Quicksilver/Code-QuickStepFoundation/NSScreen_BLTRExtensions.h

@@ -9,6 +9,7 @@
 #import <Cocoa/Cocoa.h>
 
 @interface NSScreen (BLTRExtensions)
++ (BOOL)screenRecordingPermissionAllowed;
 + (NSScreen *)screenWithNumber:(NSInteger)number;
 - (NSInteger) screenNumber;
 - (NSString *)deviceName;

Quicksilver/Code-QuickStepFoundation/NSScreen_BLTRExtensions.m

@@ -14,9 +14,48 @@
 #include <IOKit/graphics/IOGraphicsTypes.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <objc/objc-runtime.h>
+#import <CoreGraphics/CGDisplayStream.h>
 
 @implementation NSScreen (BLTRExtensions)
 
++ (BOOL)screenRecordingPermissionAllowed {
+		if ([[NSScreen mainScreen] hasScreenRecordingPermission]) {
+				return YES;
+		}
+		// maybe the main screen can't produce a CGDisplayStream, but another screen can
+		// a positive on any screen must mean that the permission is granted; we try on the other screens
+		for (NSScreen *screen in [NSScreen screens]) {
+				if ([screen screenNumber] == [[NSScreen mainScreen] screenNumber]) {
+						continue;
+				}
+				if ([screen hasScreenRecordingPermission]) {
+						return YES;
+				}
+		}
+		return NO;
+}
+
+- (BOOL)hasScreenRecordingPermission {
+		CGDirectDisplayID displayId = (CGDirectDisplayID)[self screenNumber];
+		
+		CGDisplayStreamRef ref = CGDisplayStreamCreateWithDispatchQueue(
+																									 displayId,
+																									 1,
+																									 1,
+																										kCVPixelFormatType_32BGRA,
+																									 nil,
+																									 dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+																										^(CGDisplayStreamFrameStatus status, uint64_t displayTime, IOSurfaceRef frameSurface, CGDisplayStreamUpdateRef updateRef) {
+																												NSLog(@"Next Frame"); // This line is never called.
+																										});
+
+		BOOL hasPermission = (ref != nil);
+		if (ref != nil) {
+				CFRelease(ref);
+		}
+		return hasPermission;
+}
+
 + (NSScreen *)screenWithNumber:(NSInteger)number {
 	for(NSScreen *screen in [self screens]) {
 		if ([screen screenNumber] == number) {