Merge branch 'feature' into main

ruittenb · ruittenb · commit c3aca92e5202 · 2024-12-30T14:40:48.000+01:00
diff --git a/Spaceman.xcodeproj/project.pbxproj b/Spaceman.xcodeproj/project.pbxproj
@@ -465,7 +465,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.18;
+				CURRENT_PROJECT_VERSION = 1.6.19;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -480,7 +480,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.18;
+				MARKETING_VERSION = 1.6.19;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -499,7 +499,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.18;
+				CURRENT_PROJECT_VERSION = 1.6.19;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -514,7 +514,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.18;
+				MARKETING_VERSION = 1.6.19;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Spaceman/Helpers/SpaceSwitcher.swift b/Spaceman/Helpers/SpaceSwitcher.swift
@@ -27,11 +27,15 @@ class SpaceSwitcher {
             if let scriptObject = NSAppleScript(source: appleScript) {
                 scriptObject.executeAndReturnError(&error)
                 if error != nil {
+                    let errorNumber: Int = error?[NSAppleScript.errorNumber] as! Int
                     let errorBriefMessage: String = error?[NSAppleScript.errorBriefMessage] as! String
                     let settingsName = self.systemSettingsName()
+                    // -1002: Error: Spaceman is not allowed to send keystrokes. (needs Accessibility permission)
+                    // -1743: Error: Not authorized to send Apple events to System Events. (needs Automation permission)
+                    let permissionType = errorNumber == 1002 ? "Accessibility" : "Automation"
                     self.alert(
-                        msg: "Error: \(errorBriefMessage)\n\nPlease grant Accessibility permissions to Spaceman in \(settingsName) → Privacy and Security.",
-                        withSettingsButton: true)
+                        msg: "Error: \(errorBriefMessage)\n\nPlease grant \(permissionType) permissions to Spaceman in \(settingsName) → Privacy and Security.",
+                        permissionTypeName: permissionType)
                 }
             }
         }
@@ -56,21 +60,21 @@ class SpaceSwitcher {
         }
     }
     
-    private func alert(msg: String, withSettingsButton: Bool) {
+    private func alert(msg: String, permissionTypeName: String) {
         DispatchQueue.main.async {
             let alert = NSAlert.init()
             alert.messageText = "Spaceman"
             alert.informativeText = "\(msg)"
             alert.addButton(withTitle: "Dismiss")
-            if withSettingsButton {
+            if permissionTypeName != "" {
                 let settingsName = self.systemSettingsName()
                 alert.addButton(withTitle: "\(settingsName)...")
             }
             let response = alert.runModal()
             if (response == .alertSecondButtonReturn) {
                 let task = Process()
                 task.launchPath = "/usr/bin/open"
-                task.arguments = ["x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"]
+                task.arguments = ["x-apple.systempreferences:com.apple.preference.security?Privacy_\(permissionTypeName)"]
                 try? task.run()
             }
         }
diff --git a/Spaceman/Info.plist b/Spaceman/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppleEventsUsageDescription</key>
+	<string>This app uses AppleScript to switch desktops</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
diff --git a/publicity/yabai-spaceman-kaders.png b/publicity/yabai-spaceman-kaders.png

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,15 @@ class SpaceSwitcher {`
`27`	`27`	`if let scriptObject = NSAppleScript(source: appleScript) {`
`28`	`28`	`scriptObject.executeAndReturnError(&error)`
`29`	`29`	`if error != nil {`
	`30`	`+ let errorNumber: Int = error?[NSAppleScript.errorNumber] as! Int`
`30`	`31`	`let errorBriefMessage: String = error?[NSAppleScript.errorBriefMessage] as! String`
`31`	`32`	`let settingsName = self.systemSettingsName()`
	`33`	`+ // -1002: Error: Spaceman is not allowed to send keystrokes. (needs Accessibility permission)`
	`34`	`+ // -1743: Error: Not authorized to send Apple events to System Events. (needs Automation permission)`
	`35`	`+ let permissionType = errorNumber == 1002 ? "Accessibility" : "Automation"`
`32`	`36`	`self.alert(`
`33`		`- msg: "Error: \(errorBriefMessage)\n\nPlease grant Accessibility permissions to Spaceman in \(settingsName) → Privacy and Security.",`
`34`		`- withSettingsButton: true)`
	`37`	`+ msg: "Error: \(errorBriefMessage)\n\nPlease grant \(permissionType) permissions to Spaceman in \(settingsName) → Privacy and Security.",`
	`38`	`+ permissionTypeName: permissionType)`
`35`	`39`	`}`
`36`	`40`	`}`
`37`	`41`	`}`
`@@ -56,21 +60,21 @@ class SpaceSwitcher {`
`56`	`60`	`}`
`57`	`61`	`}`
`58`	`62`
`59`		`- private func alert(msg: String, withSettingsButton: Bool) {`
	`63`	`+ private func alert(msg: String, permissionTypeName: String) {`
`60`	`64`	`DispatchQueue.main.async {`
`61`	`65`	`let alert = NSAlert.init()`
`62`	`66`	`alert.messageText = "Spaceman"`
`63`	`67`	`alert.informativeText = "\(msg)"`
`64`	`68`	`alert.addButton(withTitle: "Dismiss")`
`65`		`- if withSettingsButton {`
	`69`	`+ if permissionTypeName != "" {`
`66`	`70`	`let settingsName = self.systemSettingsName()`
`67`	`71`	`alert.addButton(withTitle: "\(settingsName)...")`
`68`	`72`	`}`
`69`	`73`	`let response = alert.runModal()`
`70`	`74`	`if (response == .alertSecondButtonReturn) {`
`71`	`75`	`let task = Process()`
`72`	`76`	`task.launchPath = "/usr/bin/open"`
`73`		`- task.arguments = ["x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"]`
	`77`	`+ task.arguments = ["x-apple.systempreferences:com.apple.preference.security?Privacy_\(permissionTypeName)"]`
`74`	`78`	`try? task.run()`
`75`	`79`	`}`
`76`	`80`	`}`