feat: add app icon and customizable English input method selection

makerjackie · claude · makerjackie · commit f0147af6439c · 2025-08-09T23:41:19.000+08:00
Major improvements: - Add professional app icon with keyboard theme highlighting ESC/Shift keys - Implement English input method selection (ABC, Unicode Hex Input, etc.) - Add separate CJKV input method selection for better organization - Fix alt+key shortcuts conflict by allowing non-ABC English input methods Features added: - New menu option "选择英文输入法" for English input method selection - Enhanced InputMethodManager with separate English/CJKV method discovery - Updated UserPreferences to store selected English input method - Improved StatusBarManager with organized menu structure UI/UX improvements: - Updated usage instructions with new functionality description - Better menu organization separating English and CJKV input method selection - Professional app icon (AppIcon.icns) integrated into build process Technical improvements: - Refactored KeyboardManager to use configurable English input source - Enhanced build script to automatically include app icons - Added comprehensive CLAUDE.md for future development guidance - Version bump to 0.6.5 This resolves issues with alt+key shortcuts when using ABC input method and provides users full control over their preferred English input method. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/AppDelegate.swift b/AppDelegate.swift
@@ -133,18 +133,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, KeyboardManagerDelegate {
         let alert = NSAlert()
         alert.messageText = "MacVimSwitch 使用说明"
         alert.informativeText = """
-            重要示：
+            重要提示：
             1. 先关闭输入法中的"使用 Shift 切换中英文"选项，否则会产生冲突
             2. 具体操作：打开输入法偏好设置 → 关闭"使用 Shift 切换中英文"
 
             功能说明：
-            1. 按 ESC 键会自动切换到英文输入法 ABC（仅在指定的应用中生效）
+            1. 按 ESC 键会自动切换到选定的英文输入法（仅在指定的应用中生效）
             2. 按 Shift 键可以在中英文输入法之间切换（可在菜单栏中关闭）
             3. 提示：在 Mac 上，CapsLock 短按可以切换输入法，长按才是锁定大写
+            4. 现在您可以选择英文输入法（默认ABC）和中文输入法
 
             配置说明：
-            1. 点击菜单栏图标 → 启用的应用，可以选择需要启用ESC切换功能的应用
-            2. 如果没有看到某个应用，可以点击"刷新应用列表"更新
+            1. 点击菜单栏图标 → 选择英文输入法，可以选择您优先的英文输入法
+            2. 点击菜单栏图标 → 选择中文输入法，可以选择您优先的中文输入法
+            3. 点击菜单栏图标 → 启用的应用，可以选择需要启用ESC切换功能的应用
+            4. 如果没有看到某个应用，可以点击"刷新应用列表"更新
             """
         alert.alertStyle = .warning
         alert.addButton(withTitle: "我已了解")
diff --git a/AppIcon.icns b/AppIcon.icns
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -0,0 +1,85 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+MacVimSwitch is a macOS utility that automatically switches input sources for Vim users and those frequently switching between CJKV input methods. It's a menu bar application written in Swift that monitors keyboard events and manages input method switching.
+
+## Build and Development Commands
+
+### Building the Application
+```bash
+./build.sh                    # Build universal binary (ARM64 + x86_64)
+./build.sh --create-dmg       # Build and create DMG for distribution
+```
+
+**Note**: The build script will automatically include the app icon (AppIcon.icns) if present in the project root.
+
+### Testing and Running
+```bash
+# Kill existing instance
+pkill -f MacVimSwitch
+
+# Run directly from command line
+./dist/MacVimSwitch.app/Contents/MacOS/macvimswitch
+
+# Or open the app (requires multiple steps for permissions)
+open dist/MacVimSwitch.app
+```
+
+### Permission Reset (for testing)
+```bash
+tccutil reset All com.jackiexiao.macvimswitch
+```
+
+## Architecture
+
+### Core Components
+- **main.swift**: Entry point, handles accessibility permissions and app lifecycle
+- **AppDelegate.swift**: Main application delegate, manages system apps list and user preferences
+- **StatusBarManager.swift**: Handles menu bar UI and user interactions
+- **InputMethodManager.swift**: Core input method discovery and categorization (English vs CJKV)
+- **UserPreferences.swift**: Manages app settings including English input method selection
+- **LaunchManager.swift**: Handles launch at login functionality
+- **inputsource.swift**: Low-level input source switching and KeyboardManager (based on macism)
+
+### Key Architecture Patterns
+- **Delegate Pattern**: Used between KeyboardManager and AppDelegate for state updates
+- **Singleton Pattern**: KeyboardManager and UserPreferences use shared instances
+- **Observer Pattern**: Monitors system events for keyboard input and app switching
+- **Strategy Pattern**: Different switching strategies for English vs CJKV input methods
+
+### Build System
+- Uses Swift compiler directly (swiftc) with custom build script
+- Creates universal binary supporting both Intel and Apple Silicon
+- Self-signed with custom entitlements for accessibility and automation permissions
+- Automated releases via GitHub Actions workflow
+
+### Dependencies and Frameworks
+- **Cocoa**: Main UI framework
+- **Carbon**: Low-level system event handling
+- **Foundation**: Core system utilities
+- No external package dependencies (pure Swift/Objective-C)
+
+### Bundle Structure
+- Bundle ID: `com.jackiexiao.macvimswitch`
+- Minimum macOS version: 11.0
+- LSUIElement: true (background app without dock icon)
+- Requires accessibility permissions for keyboard monitoring
+
+## Important Development Notes
+
+### Accessibility Permissions
+The app requires accessibility permissions to monitor keyboard events. First run will prompt for these permissions automatically.
+
+### Input Method Selection Features
+- **English Input Method Selection**: Users can choose from available English input methods (ABC, Unicode Hex Input, etc.) via menu bar
+- **CJKV Input Method Selection**: Users can choose from available Chinese/Japanese/Korean/Vietnamese input methods
+- **Default Behavior**: ESC switches to selected English input method, Shift toggles between English and selected CJKV method
+
+### Default Enabled Applications
+By default, ESC key switching is enabled for: Terminal, VSCode, MacVim, Windsurf, Obsidian, Warp, Cursor
+
+### Input Method Integration
+Uses macism-based approach for input source switching, integrating with macOS keyboard shortcuts for "Select the previous input source"
diff --git a/Info.plist b/Info.plist
@@ -9,9 +9,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.6.4</string>
+    <string>0.6.5</string>
     <key>CFBundleVersion</key>
-    <string>0.6.4</string>
+    <string>0.6.5</string>
     <key>LSMinimumSystemVersion</key>
     <string>11.0</string>
     <key>LSUIElement</key>
diff --git a/InputMethodManager.swift b/InputMethodManager.swift
@@ -48,8 +48,132 @@ class InputMethodManager {
                 continue
             }
 
-            // 排除 ABC 输入法和已经添加过的输入法名称
-            if sourceId != KeyboardManager.shared.abcInputSource && !seenNames.contains(name) {
+            // 排除已经添加过的输入法名称
+            if !seenNames.contains(name) {
+                methods.append((sourceId, name))
+                seenNames.insert(name)
+            }
+        }
+
+        return methods.sorted { $0.1 < $1.1 }
+    }
+    
+    func getAvailableEnglishInputMethods() -> [(String, String)]? {
+        guard let inputSources = TISCreateInputSourceList(nil, true)?.takeRetainedValue() as? [TISInputSource] else {
+            return nil
+        }
+
+        var methods: [(String, String)] = []
+        var seenNames = Set<String>()
+
+        for source in inputSources {
+            // 获取输入法类别
+            guard let categoryRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceCategory),
+                  let category = (Unmanaged<CFString>.fromOpaque(categoryRef).takeUnretainedValue() as NSString) as String?,
+                  category == kTISCategoryKeyboardInputSource as String else {
+                continue
+            }
+
+            // 检查输入法是否启用
+            guard let enabledRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceIsEnabled) else {
+                continue
+            }
+            let enabled = CFBooleanGetValue(Unmanaged<CFBoolean>.fromOpaque(enabledRef).takeUnretainedValue())
+            guard enabled else { continue }
+
+            // 检查是否是主要输入源
+            guard let isPrimaryRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceIsSelectCapable) else {
+                continue
+            }
+            let isPrimary = CFBooleanGetValue(Unmanaged<CFBoolean>.fromOpaque(isPrimaryRef).takeUnretainedValue())
+            guard isPrimary else { continue }
+
+            // 获取输入法 ID
+            guard let sourceIdRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceID),
+                  let sourceId = (Unmanaged<CFString>.fromOpaque(sourceIdRef).takeUnretainedValue() as NSString) as String? else {
+                continue
+            }
+
+            // 获取输入法名称
+            guard let nameRef = TISGetInputSourceProperty(source, kTISPropertyLocalizedName),
+                  let name = (Unmanaged<CFString>.fromOpaque(nameRef).takeUnretainedValue() as NSString) as String? else {
+                continue
+            }
+
+            // 获取语言信息
+            guard let languagesRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceLanguages),
+                  let languages = (Unmanaged<CFArray>.fromOpaque(languagesRef).takeUnretainedValue() as NSArray) as? [String] else {
+                continue
+            }
+
+            // 只包含英文输入法（不包含CJKV语言）
+            let isCJKV = languages.contains { lang in
+                lang.hasPrefix("zh") || lang == "ko" || lang == "ja" || lang == "vi"
+            }
+            
+            if !isCJKV && !seenNames.contains(name) {
+                methods.append((sourceId, name))
+                seenNames.insert(name)
+            }
+        }
+
+        return methods.sorted { $0.1 < $1.1 }
+    }
+    
+    func getAvailableCJKVInputMethods() -> [(String, String)]? {
+        guard let inputSources = TISCreateInputSourceList(nil, true)?.takeRetainedValue() as? [TISInputSource] else {
+            return nil
+        }
+
+        var methods: [(String, String)] = []
+        var seenNames = Set<String>()
+
+        for source in inputSources {
+            // 获取输入法类别
+            guard let categoryRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceCategory),
+                  let category = (Unmanaged<CFString>.fromOpaque(categoryRef).takeUnretainedValue() as NSString) as String?,
+                  category == kTISCategoryKeyboardInputSource as String else {
+                continue
+            }
+
+            // 检查输入法是否启用
+            guard let enabledRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceIsEnabled) else {
+                continue
+            }
+            let enabled = CFBooleanGetValue(Unmanaged<CFBoolean>.fromOpaque(enabledRef).takeUnretainedValue())
+            guard enabled else { continue }
+
+            // 检查是否是主要输入源
+            guard let isPrimaryRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceIsSelectCapable) else {
+                continue
+            }
+            let isPrimary = CFBooleanGetValue(Unmanaged<CFBoolean>.fromOpaque(isPrimaryRef).takeUnretainedValue())
+            guard isPrimary else { continue }
+
+            // 获取输入法 ID
+            guard let sourceIdRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceID),
+                  let sourceId = (Unmanaged<CFString>.fromOpaque(sourceIdRef).takeUnretainedValue() as NSString) as String? else {
+                continue
+            }
+
+            // 获取输入法名称
+            guard let nameRef = TISGetInputSourceProperty(source, kTISPropertyLocalizedName),
+                  let name = (Unmanaged<CFString>.fromOpaque(nameRef).takeUnretainedValue() as NSString) as String? else {
+                continue
+            }
+
+            // 获取语言信息
+            guard let languagesRef = TISGetInputSourceProperty(source, kTISPropertyInputSourceLanguages),
+                  let languages = (Unmanaged<CFArray>.fromOpaque(languagesRef).takeUnretainedValue() as NSArray) as? [String] else {
+                continue
+            }
+
+            // 只包含CJKV输入法
+            let isCJKV = languages.contains { lang in
+                lang.hasPrefix("zh") || lang == "ko" || lang == "ja" || lang == "vi"
+            }
+            
+            if isCJKV && !seenNames.contains(name) {
                 methods.append((sourceId, name))
                 seenNames.insert(name)
             }
diff --git a/StatusBarManager.swift b/StatusBarManager.swift
@@ -44,30 +44,59 @@ class StatusBarManager {
         let inputMethodItem = NSMenuItem(title: "选择中文输入法", action: nil, keyEquivalent: "")
         inputMethodItem.submenu = inputMethodMenu
 
-        // 获取所有输入法并添加到子菜单
-        if let inputMethods = InputMethodManager.shared.getAvailableInputMethods() {
-            print("当前保存的输入法: \(KeyboardManager.shared.lastInputSource ?? "nil")")
-            print("UserPreferences中的输入法: \(UserPreferences.shared.selectedInputMethod ?? "nil")")
+        // 获取所有CJKV输入法并添加到子菜单
+        if let inputMethods = InputMethodManager.shared.getAvailableCJKVInputMethods() {
+            print("当前保存的中文输入法: \(KeyboardManager.shared.lastInputSource ?? "nil")")
+            print("UserPreferences中的中文输入法: \(UserPreferences.shared.selectedInputMethod ?? "nil")")
             
             for (sourceId, name) in inputMethods {
-                print("添加输入法菜单项: \(name) (\(sourceId))")
+                print("添加CJKV输入法菜单项: \(name) (\(sourceId))")
                 let item = NSMenuItem(
                     title: name,
-                    action: #selector(selectInputMethod(_:)),
+                    action: #selector(selectCJKVInputMethod(_:)),
                     keyEquivalent: ""
                 )
                 item.target = self
                 item.representedObject = sourceId
                 // 检查是否是当前选中的输入法
                 if sourceId == KeyboardManager.shared.lastInputSource {
-                    print("设置选中状态: \(name) (\(sourceId))")
+                    print("设置中文输入法选中状态: \(name) (\(sourceId))")
                     item.state = .on
                 }
                 inputMethodMenu.addItem(item)
             }
         }
 
         newMenu.addItem(inputMethodItem)
+        
+        // 添加英文输入法选择子菜单
+        let englishInputMethodMenu = NSMenu()
+        let englishInputMethodItem = NSMenuItem(title: "选择英文输入法", action: nil, keyEquivalent: "")
+        englishInputMethodItem.submenu = englishInputMethodMenu
+
+        // 获取所有英文输入法并添加到子菜单
+        if let englishInputMethods = InputMethodManager.shared.getAvailableEnglishInputMethods() {
+            print("当前保存的英文输入法: \(KeyboardManager.shared.englishInputSource)")
+            
+            for (sourceId, name) in englishInputMethods {
+                print("添加英文输入法菜单项: \(name) (\(sourceId))")
+                let item = NSMenuItem(
+                    title: name,
+                    action: #selector(selectEnglishInputMethod(_:)),
+                    keyEquivalent: ""
+                )
+                item.target = self
+                item.representedObject = sourceId
+                // 检查是否是当前选中的输入法
+                if sourceId == KeyboardManager.shared.englishInputSource {
+                    print("设置英文输入法选中状态: \(name) (\(sourceId))")
+                    item.state = .on
+                }
+                englishInputMethodMenu.addItem(item)
+            }
+        }
+
+        newMenu.addItem(englishInputMethodItem)
         newMenu.addItem(NSMenuItem.separator())
 
         // 添加应用列表子菜单
@@ -141,12 +170,19 @@ class StatusBarManager {
         createAndShowMenu()
     }
 
-    @objc private func selectInputMethod(_ sender: NSMenuItem) {
+    @objc private func selectCJKVInputMethod(_ sender: NSMenuItem) {
         guard let sourceId = sender.representedObject as? String else { return }
-        print("[StatusBarManager] 选择输入法: \(sourceId)")
+        print("[StatusBarManager] 选择CJKV输入法: \(sourceId)")
         KeyboardManager.shared.setLastInputSource(sourceId)
         createAndShowMenu()  // 重新创建菜单以更新选中状态
     }
+    
+    @objc private func selectEnglishInputMethod(_ sender: NSMenuItem) {
+        guard let sourceId = sender.representedObject as? String else { return }
+        print("[StatusBarManager] 选择英文输入法: \(sourceId)")
+        KeyboardManager.shared.englishInputSource = sourceId
+        createAndShowMenu()  // 重新创建菜单以更新选中状态
+    }
 
     @objc private func toggleLaunchAtLogin() {
         if LaunchManager.shared.toggleLaunchAtLogin() {
diff --git a/UserPreferences.swift b/UserPreferences.swift
@@ -8,6 +8,7 @@ class UserPreferences {
     private struct Keys {
         static let allowedApps = "allowedApps"
         static let selectedInputMethod = "selectedInputMethod"
+        static let selectedEnglishInputMethod = "selectedEnglishInputMethod"
         static let useShiftSwitch = "useShiftSwitch"
         static let launchAtLogin = "launchAtLogin"
     }
@@ -33,6 +34,16 @@ class UserPreferences {
         }
     }
     
+    // 选择的英文输入法
+    var selectedEnglishInputMethod: String {
+        get {
+            defaults.string(forKey: Keys.selectedEnglishInputMethod) ?? "com.apple.keylayout.ABC"
+        }
+        set {
+            defaults.set(newValue, forKey: Keys.selectedEnglishInputMethod)
+        }
+    }
+    
     // 是否使用 shift 切换输入法
     var useShiftSwitch: Bool {
         get {
@@ -70,5 +81,9 @@ class UserPreferences {
         if defaults.object(forKey: Keys.useShiftSwitch) == nil {
             useShiftSwitch = true
         }
+        
+        if defaults.object(forKey: Keys.selectedEnglishInputMethod) == nil {
+            selectedEnglishInputMethod = "com.apple.keylayout.ABC"
+        }
     }
 }
diff --git a/build.sh b/build.sh
diff --git a/inputsource.swift b/inputsource.swift

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ class UserPreferences {`
`8`	`8`	`private struct Keys {`
`9`	`9`	`static let allowedApps = "allowedApps"`
`10`	`10`	`static let selectedInputMethod = "selectedInputMethod"`
	`11`	`+ static let selectedEnglishInputMethod = "selectedEnglishInputMethod"`
`11`	`12`	`static let useShiftSwitch = "useShiftSwitch"`
`12`	`13`	`static let launchAtLogin = "launchAtLogin"`
`13`	`14`	`}`
`@@ -33,6 +34,16 @@ class UserPreferences {`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`
	`37`	`+ // 选择的英文输入法`
	`38`	`+ var selectedEnglishInputMethod: String {`
	`39`	`+ get {`
	`40`	`+ defaults.string(forKey: Keys.selectedEnglishInputMethod) ?? "com.apple.keylayout.ABC"`
	`41`	`+ }`
	`42`	`+ set {`
	`43`	`+ defaults.set(newValue, forKey: Keys.selectedEnglishInputMethod)`
	`44`	`+ }`
	`45`	`+ }`
	`46`	`+`
`36`	`47`	`// 是否使用 shift 切换输入法`
`37`	`48`	`var useShiftSwitch: Bool {`
`38`	`49`	`get {`
`@@ -70,5 +81,9 @@ class UserPreferences {`
`70`	`81`	`if defaults.object(forKey: Keys.useShiftSwitch) == nil {`
`71`	`82`	`useShiftSwitch = true`
`72`	`83`	`}`
	`84`	`+`
	`85`	`+ if defaults.object(forKey: Keys.selectedEnglishInputMethod) == nil {`
	`86`	`+ selectedEnglishInputMethod = "com.apple.keylayout.ABC"`
	`87`	`+ }`
`73`	`88`	`}`
`74`	`89`	`}`