Support Triggering Script Execution

README.md

@@ -1,4 +1,15 @@
-# Jitouch
+## A Note on Actively Maintaining Jitouch
+
+Jitouch has not recieved an update since 2023, I aim to atleast fix some of the most glaring issues and bring some development to this project.
+
+### The todo for me currently looks like:
+- stop repeatedly asking for permissions popup
+- proper sonoma support for keyboard shortcuts (input pane broken)
+
+### Currently resolved:
+- add shell script execution
+
+# Original Readme
 
 **Jitouch** is a Mac application that expands the set of multi-touch gestures for MacBook, Magic Mouse, and Magic Trackpad. These thoughtfully designed gestures enable users to perform frequent tasks more easily such as changing tabs in web browsers, closing windows, minimizing windows, changing spaces, and a lot more.
 
@@ -31,5 +42,6 @@ After opening the Jitouch preference pane in System Preferences, a prompt should
 
 Copyright (c) Supasorn Suwajanakorn and Sukolsak Sakshuwong. All rights reserved.  
 Modified work copyright (c) Aaron Kollasch. All rights reserved.
+Modified work copyright (c) Zimeng Xiong. All rights reserved.
 
 Licensed under the [GNU General Public License v3.0](LICENSE).

jitouch/Jitouch/Gesture.m

@@ -923,10 +923,12 @@ static void doCommand(NSString *gesture, int device) {
                     if ([[NSFileManager defaultManager] fileExistsAtPath:openFilePath]) {
                         NSString *extension = [openFilePath pathExtension];
                         if ([extension isEqualToString:@"scpt"] || [extension isEqualToString:@"scptd"]) {
-                            NSString *script = [NSString stringWithFormat:@"osascript \"%@\"", [openFilePath stringByStandardizingPath]];
-                            NSArray *shArgs = [NSArray arrayWithObjects:@"-c", script, @"", nil];
-                            [NSTask launchedTaskWithLaunchPath:@"/bin/sh" arguments:shArgs];
-                        } else {
+                            NSString *scriptPath = [openFilePath stringByStandardizingPath];
+                            [NSTask launchedTaskWithLaunchPath:@"/usr/bin/osascript" arguments:@[scriptPath]];
+                        } else if ([extension isEqualToString:@"sh"]) {
+                            NSString *scriptPath = [openFilePath stringByStandardizingPath];
+                            [NSTask launchedTaskWithLaunchPath:@"/bin/zsh" arguments:@[scriptPath]];
+                        }else {
                                [[NSWorkspace sharedWorkspace] openFile:openFilePath];
                            }
                     } else {

jitouch/Jitouch/Jitouch.xcodeproj/project.pbxproj

@@ -321,11 +321,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "2.82.1";
+				CURRENT_PROJECT_VERSION = "2.82.2";
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
-				DEVELOPMENT_TEAM = 5UQY3B3594;
+				DEVELOPMENT_TEAM = W9C2P3N7Q2;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -338,7 +338,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				INFOPLIST_FILE = Info.plist;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = "2.82.1";
+				MARKETING_VERSION = "2.82.2";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jitouch.Jitouch;
 				PRODUCT_NAME = Jitouch;
@@ -353,15 +353,15 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = Jitouch.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "2.82.1";
+				CURRENT_PROJECT_VERSION = "2.82.2";
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
-				DEVELOPMENT_TEAM = 5UQY3B3594;
+				DEVELOPMENT_TEAM = W9C2P3N7Q2;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -373,10 +373,10 @@
 				GCC_PREFIX_HEADER = Jitouch_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = "2.82.1";
+				MARKETING_VERSION = "2.82.2";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jitouch.Jitouch;
 				PRODUCT_NAME = Jitouch;
-				PROVISIONING_PROFILE_SPECIFIER = "Jitouch Distribution";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				STRIP_INSTALLED_PRODUCT = YES;
 			};
 			name = Release;

prefpane/Base.lproj/JitouchPref.xib

@@ -754,7 +754,7 @@ DQ
                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="340">
                                             <rect key="frame" x="19" y="152" width="592" height="29"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Version 2.82.1" id="351">
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Version 2.82.2" id="351">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

prefpane/Jitouch.prefPane/Contents/Info.plist

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-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>BuildMachineOSBuild</key>
+	<string>24D70</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>Jitouch</string>
+	<key>CFBundleIconFile</key>
+	<string>jitouchicon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.jitouch.Jitouch</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Jitouch</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.82.1</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>2.82.1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>24C94</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>15.2</string>
+	<key>DTSDKBuild</key>
+	<string>24C94</string>
+	<key>DTSDKName</key>
+	<string>macosx15.2</string>
+	<key>DTXcode</key>
+	<string>1620</string>
+	<key>DTXcodeBuild</key>
+	<string>16C5032a</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>11.0</string>
+	<key>NSAppleEventsUsageDescription</key>
+	<string></string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2021 Supasorn Suwajanakorn and Sukolsak Sakshuwong. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>JitouchPref</string>
+	<key>NSPrefPaneIconFile</key>
+	<string>JitouchPref.png</string>
+	<key>NSPrefPaneIconLabel</key>
+	<string>Jitouch</string>
+	<key>NSPrincipalClass</key>
+	<string>JitouchPref</string>
+</dict>
+</plist>

prefpane/Jitouch.prefPane/Contents/Resources/Jitouch.app/Contents/Info.plist

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-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>BuildMachineOSBuild</key>
+	<string>24D70</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>Jitouch</string>
+	<key>CFBundleIconFile</key>
+	<string>jitouchicon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.jitouch.Jitouch</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Jitouch</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.82.1</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>2.82.1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>24C94</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>15.2</string>
+	<key>DTSDKBuild</key>
+	<string>24C94</string>
+	<key>DTSDKName</key>
+	<string>macosx15.2</string>
+	<key>DTXcode</key>
+	<string>1620</string>
+	<key>DTXcodeBuild</key>
+	<string>16C5032a</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.13</string>
+	<key>NSAppleEventsUsageDescription</key>
+	<string></string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2021 Supasorn Suwajanakorn and Sukolsak Sakshuwong. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSUIElement</key>
+	<string>1</string>
+</dict>
+</plist>

prefpane/Jitouch.prefPane/Contents/Resources/Jitouch.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

prefpane/Jitouch.prefPane/Contents/Resources/Jitouch.app/Contents/Resources/instructions.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+body {
+    font-family: -apple-system;
+}
+img {
+    margin: 20px;
+}
+</style>
+</head>
+<body>
+To enable <b>jitouch</b>,<br><br>
+(Steps 1 - 3 may have already been done for you.)
+<ol>
+    <li>Open "System Preferences"<br><img src="step1.png"></li>
+    <li>Click "Security & Privacy"<br><img src="step2.png" width="447" height="411"></li>
+    <li>Go to the "Privacy" tab and select "Accessibility"<br><img src="step3.png" width="447" height="349"></li>
+    <li>Click the lock icon if it is locked<br><img src="step4.png" width="447" height="349"></li>
+    <li>Check "Jitouch" and "System Preferences"<br><img src="step5.png" width="447" height="349"></li>
+    <li>Close the window</li>
+</ol>
+</body>
+</html>