现在可以设置 Esc 在哪些应用中生效,默认 在vscode, terminal, obsidian, cursor, windsurf 中生效

makerjackie · makerjackie · commit f3cd7a735829 · 2025-01-18T21:28:27.000+08:00
参考 issue: #2
diff --git a/AppDelegate.swift b/AppDelegate.swift
@@ -2,31 +2,147 @@ import Cocoa
 
 class AppDelegate: NSObject, NSApplicationDelegate, KeyboardManagerDelegate {
     let statusBarManager = StatusBarManager()
-    
+    // 存储允许的应用bundle identifiers
+    var allowedApps: Set<String> = []
+    // 用于存储系统中的应用列表
+    var systemApps: [(name: String, bundleId: String)] = []
+
     func applicationDidFinishLaunching(_ notification: Notification) {
+        print("应用程序开始初始化...")
+
         // 确保应用程序被激活
         NSApp.activate(ignoringOtherApps: true)
+        print("应用程序已激活")
 
         // 确保应用不会随终端退出
         ProcessInfo.processInfo.enableSuddenTermination()
+        print("已启用突然终止")
+
+        // 加载默认配置
+        loadDefaultConfig()
+        print("已加载默认配置")
+
+        // 加载系统应用列表
+        loadSystemApps()
+        print("已加载系统应用列表，共 \(systemApps.count) 个应用")
 
         // 设置代理
         KeyboardManager.shared.delegate = self
+        statusBarManager.appDelegate = self
+        print("已设置键盘管理器代理")
 
-        // 先设置状态栏
+        // 设置状态栏和菜单
+        print("开始设置状态栏和菜单...")
         DispatchQueue.main.async { [weak self] in
             self?.statusBarManager.setupStatusBarItem()
+            print("状态栏和菜单设置完成")
         }
 
-        // 然后启动键盘管理器
+        // 启动键盘管理器
+        print("开始启动键盘管理器...")
         KeyboardManager.shared.start()
+        print("键盘管理器启动完成")
 
         // 显示初始使用提示
         DispatchQueue.main.async { [weak self] in
             self?.showInitialInstructions()
+            print("初始使用提示已显示")
+        }
+
+        print("应用程序初始化完成")
+    }
+
+    // 加载默认配置
+    private func loadDefaultConfig() {
+        allowedApps = Set([
+            "com.apple.Terminal",
+            "com.microsoft.VSCode",
+            "com.vim.MacVim",
+            "com.exafunction.windsurf",
+            "md.obsidian",
+            "dev.warp.Warp-Stable",
+            "com.todesktop.230313mzl4w4u92"
+        ])
+    }
+
+    // 加载系统应用列表
+    private func loadSystemApps() {
+        let workspace = NSWorkspace.shared
+
+        // 获取常用应用程序目录
+        let appDirs = [
+            "/Applications",
+            "~/Applications",
+            "/System/Applications"
+        ].map { NSString(string: $0).expandingTildeInPath }
+
+        var apps: [(name: String, bundleId: String)] = []
+
+        // 遍历应用程序目录
+        for dir in appDirs {
+            if let contents = try? FileManager.default.contentsOfDirectory(atPath: dir) {
+                for item in contents {
+                    if item.hasSuffix(".app") {
+                        let path = (dir as NSString).appendingPathComponent(item)
+                        if let bundle = Bundle(path: path),
+                           let bundleId = bundle.bundleIdentifier,
+                           let appName = bundle.infoDictionary?["CFBundleName"] as? String {
+                            apps.append((name: appName, bundleId: bundleId))
+                        }
+                    }
+                }
+            }
+        }
+
+        // 添加当前正在运行的应用
+        let runningApps = workspace.runningApplications
+        for app in runningApps {
+            if let bundleId = app.bundleIdentifier,
+               let appName = app.localizedName,
+               !apps.contains(where: { $0.bundleId == bundleId }) {
+                apps.append((name: appName, bundleId: bundleId))
+            }
+        }
+
+        // 按应用名称排序
+        systemApps = apps.sorted { $0.name < $1.name }
+    }
+
+    @objc func toggleApp(_ sender: NSMenuItem) {
+        guard let bundleId = sender.representedObject as? String else { return }
+
+        if allowedApps.contains(bundleId) {
+            allowedApps.remove(bundleId)
+            sender.state = .off
+        } else {
+            allowedApps.insert(bundleId)
+            sender.state = .on
+        }
+    }
+
+    @objc func refreshAppList() {
+        loadSystemApps()
+        statusBarManager.createAndShowMenu()
+    }
+
+    // 检查当前应用是否允许使用ESC切换输入法
+    private func isCurrentAppAllowed() -> Bool {
+        if let frontmostApp = NSWorkspace.shared.frontmostApplication {
+            return allowedApps.contains(frontmostApp.bundleIdentifier ?? "")
         }
+        return false
     }
-    
+
+    // 在切换输入法前检查当前应用
+    func shouldSwitchInputSource() -> Bool {
+        return isCurrentAppAllowed()
+    }
+
+    // 实现代理方法
+    func keyboardManagerDidUpdateState() {
+        statusBarManager.updateStatusBarIcon()
+    }
+
     private func showInitialInstructions() {
         let alert = NSAlert()
         alert.messageText = "MacVimSwitch 使用说明"
@@ -36,34 +152,19 @@ class AppDelegate: NSObject, NSApplicationDelegate, KeyboardManagerDelegate {
             2. 具体操作：打开输入法偏好设置 → 关闭"使用 Shift 切换中英文"
 
             功能说明：
-            1. 按 ESC 键会自动切换到英文输入法 ABC
+            1. 按 ESC 键会自动切换到英文输入法 ABC（仅在指定的应用中生效）
             2. 按 Shift 键可以在中英文输入法之间切换（可在菜单栏中关闭）
             3. 提示：在 Mac 上，CapsLock 短按可以切换输入法，长按才是锁定大写
+
+            配置说明：
+            1. 点击菜单栏图标 → 启用的应用，可以选择需要启用ESC切换功能的应用
+            2. 如果没有看到某个应用，可以点击"刷新应用列表"更新
             """
         alert.alertStyle = .warning
         alert.addButton(withTitle: "我已了解")
 
         DispatchQueue.main.async {
-            let window = NSWindow(
-                contentRect: NSRect(x: 0, y: 0, width: 100, height: 100),
-                styleMask: [.titled],
-                backing: .buffered,
-                defer: false
-            )
-            window.level = .floating
-
-            NSApp.activate(ignoringOtherApps: true)
             alert.runModal()
         }
     }
-    
-    // 实现代理方法
-    func keyboardManagerDidUpdateState() {
-        statusBarManager.updateStatusBarIcon()
-        statusBarManager.createAndShowMenu()
-    }
-
-    func applicationWillTerminate(_ notification: Notification) {
-        KeyboardManager.shared.disableEventTap()
-    }
 }
diff --git a/README.md b/README.md
@@ -42,6 +42,7 @@ Download from [GitHub Releases](https://github.com/Jackiexiao/macvimswitch/relea
      - View instructions
      - Select your preferred Chinese input method
      - Enable/Disable Shift key switching
+     - Select the applications that you want to enable `Esc` to switch input source, by default, vscode, terminal, obsidian, cursor, windsurf, warp are enabled.
      - Enable/Disable launch at login
      - Quit the application
 
diff --git a/README_CN.md b/README_CN.md
@@ -43,6 +43,7 @@ MacVimSwitch 是一个 macOS 输入法切换工具，专为 Vim 用户和经常
      - 查看使用说明
      - 选择偏好的中文输入法
      - 开启/关闭 Shift 键切换功能
+     - 选择 Esc 生效的应用（可多选，默认在 Terminal、VSCode、MacVim、windsurf、obsidian、warp 中生效）
      - 开启/关闭开机自动启动
      - 退出应用程序
 
@@ -97,8 +98,13 @@ git push origin main
 
 本地构建和测试：
 ```bash
-swiftc macvimswitch.swift -o macvimswitch
-./macvimswitch
+./build.sh
+# 打开第一次，辅助功能先把之前的 MacVimSwitch 删除，看起来好像必须得这么做
+open dist/MacVimSwitch.app
+# 打开第二次，启动辅助功能
+open dist/MacVimSwitch.app
+# 打开第三次，相当于重启应用，这个时候你才能正确获取授权
+open dist/MacVimSwitch.app
 ```
 
 构建发布版本：
@@ -125,7 +131,7 @@ tccutil reset All com.jackiexiao.macvimswitch # Reset permissions
 MacVimSwitch 相比其他输入法切换方案有以下优势：
 
 1. 通用兼容性
-   - 可在所有应用程序中使用（VSCode、终端、Obsidian、Cursor 等）
+   - 可在所有应用程序中使用（VSCode、终端、Obsidian、Cursor、Warp、Windsurf 等）
    - 无需针对不同应用进行配置
    - 不需要为不同编辑器安装插件
 
diff --git a/StatusBarManager.swift b/StatusBarManager.swift
@@ -3,7 +3,8 @@ import Cocoa
 class StatusBarManager {
     let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
     private var menu: NSMenu?
-    
+    weak var appDelegate: AppDelegate?
+
     func setupStatusBarItem() {
         if let button = statusItem.button {
             updateStatusBarIcon()
@@ -13,7 +14,7 @@ class StatusBarManager {
             print("错误：无法创建状态栏按钮")
         }
     }
-    
+
     func updateStatusBarIcon() {
         guard let button = statusItem.button else {
             print("Status item button not found")
@@ -28,7 +29,7 @@ class StatusBarManager {
 
         button.isEnabled = true
     }
-    
+
     func createAndShowMenu() {
         let newMenu = NSMenu()
 
@@ -63,6 +64,31 @@ class StatusBarManager {
         newMenu.addItem(inputMethodItem)
         newMenu.addItem(NSMenuItem.separator())
 
+        // 添加应用列表子菜单
+        if let delegate = appDelegate {
+            let appsMenu = NSMenu()
+            let appsMenuItem = NSMenuItem(title: "Esc生效的应用", action: nil, keyEquivalent: "")
+            appsMenuItem.submenu = appsMenu
+
+            // 添加所有应用到子菜单
+            for app in delegate.systemApps {
+                let item = NSMenuItem(title: app.name, action: #selector(AppDelegate.toggleApp(_:)), keyEquivalent: "")
+                item.state = delegate.allowedApps.contains(app.bundleId) ? .on : .off
+                item.representedObject = app.bundleId
+                item.target = delegate
+                appsMenu.addItem(item)
+            }
+
+            // 添加刷新应用列表选项
+            appsMenu.addItem(NSMenuItem.separator())
+            let refreshItem = NSMenuItem(title: "刷新应用列表", action: #selector(AppDelegate.refreshAppList), keyEquivalent: "r")
+            refreshItem.target = delegate
+            appsMenu.addItem(refreshItem)
+
+            newMenu.addItem(appsMenuItem)
+            newMenu.addItem(NSMenuItem.separator())
+        }
+
         // 修改 Shift 切换选项的文字
         let shiftSwitchItem = NSMenuItem(
             title: "使用 Shift 切换入法",
@@ -86,35 +112,39 @@ class StatusBarManager {
         newMenu.addItem(launchAtLoginItem)
 
         newMenu.addItem(NSMenuItem.separator())
-        newMenu.addItem(NSMenuItem(title: "退出", action: #selector(quitApp), keyEquivalent: "q"))
+
+        // 添加退出选项
+        let quitItem = NSMenuItem(title: "退出", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")
+        quitItem.target = NSApp
+        newMenu.addItem(quitItem)
 
         statusItem.menu = newMenu
         self.menu = newMenu
     }
-    
+
     @objc private func openHomepage() {
         if let url = URL(string: "https://github.com/Jackiexiao/macvimswitch") {
             NSWorkspace.shared.open(url)
         }
     }
-    
+
     @objc private func toggleShiftSwitch() {
         KeyboardManager.shared.useShiftSwitch = !KeyboardManager.shared.useShiftSwitch
         updateStatusBarIcon()
         createAndShowMenu()
     }
-    
+
     @objc private func selectInputMethod(_ sender: NSMenuItem) {
         guard let sourceId = sender.representedObject as? String else { return }
         KeyboardManager.shared.setLastInputSource(sourceId)
         createAndShowMenu()
     }
-    
+
     @objc private func toggleLaunchAtLogin() {
         LaunchManager.shared.toggleLaunchAtLogin()
         createAndShowMenu()
     }
-    
+
     @objc private func quitApp() {
         KeyboardManager.shared.disableEventTap()
         NSApplication.shared.terminate(self)
diff --git a/inputsource.swift b/inputsource.swift
