discover system input method switching shortcut

Author: brettferdosi

README.md

@@ -12,21 +12,21 @@ Currently, only Persian is supported, but it is straightforward to add other lan
 
 `goftam.app` must be placed in `/Library/Input Methods` to install it for all users or `~/Library/Input Methods` to install it for a particular user.
 
-**Install option 1: run the installer**
+**Install option 1: run the installer (easiset)**
 
-Download the most recent installer (`GoftamInstaller.pkg`) from [releases](https://github.com/brettferdosi/goftam/releases) and run it. You will have to follow Apple's instructions for [opening an app from an unidentified developer](https://support.apple.com/guide/mac-help/open-a-mac-app-from-an-unidentified-developer-mh40616/mac). It will install Goftam for all users, but you can move `goftam.app` to a particular user's directory after installation if desired. If there is already a version of `goftam.app` on your system, the installer will detect and overwrite it.
+Download the most recent installer (`GoftamInstaller.pkg`) from [releases](https://github.com/brettferdosi/goftam/releases) and run it. You will have to follow Apple's instructions for [opening an app from an unidentified developer](https://support.apple.com/guide/mac-help/open-a-mac-app-from-an-unidentified-developer-mh40616/mac) (basically, control-click the installer, click *Open*, then click *Open* again). It will install Goftam for all users, but you can move `goftam.app` to a particular user's directory after installation if desired. If there is already a version of `goftam.app` on your system, the installer will detect and overwrite it.
 
 **Install option 2: build from source**
 
 Clone this git repository and run `xcodebuild -project goftam.xcodeproj`. `goftam.app` will be placed into `build/Release`, and you can move it to the appropriate directory depending on whether you want to install Goftam for all users or a particular user.
 
 **Enabling Goftam**
 
-Open System Preferences > Keyboard and click the + button to add input sources. Add Goftam Bypass, which is categorized as an English input method, and additional Goftam inputs as desired, which are categorized by their target languages (e.g. Goftam Persian is categorized as a Persian input method). You can then enable Goftam inputs by selecting them from the input menu bar button.
+Open System Preferences > Keyboard and click the + button to add input sources. Add Goftam inputs, which are categorized by their target languages (e.g. Goftam Persian is categorized as a Persian input method), as desired. You can then enable Goftam inputs by selecting them from the input menu bar button.
 
 <img src="https://github.com/brettferdosi/goftam/raw/doc/menubar.png" width="500px">
 
-If selecting one of the Goftam input methods does not work immediately after installing it, you may need to log out then back in.
+If selecting a Goftam input method does not work immediately after installing it, you may need to log out then back in.
 
 **Uninstalling Goftam**
 
@@ -38,9 +38,9 @@ With a Goftam input enabled, the input keyboard layout is set to the most recent
 
 Typing a punctuation mark or symbol commits the in-progress composition by selecting the currently highlighted candidate, and the (potentially translated) symbol is then inserted. Typing a numeric digit while there is no composition in progress inserts a translated version of the digit.
 
-Goftam supports a bypass mode that inputs keystrokes directly without transliteration. Press `shift-commmand-space`  while you have a text box selected to toggle transliteration bypass. In bypass mode, the Goftam icon in the menu bar becomes faded.
+Typing `shift-space` will insert a [zero-width non-joiner character](https://en.wikipedia.org/wiki/Zero-width_non-joiner), which is useful for various scripts and languages.
 
-In non-bypass input modes, typing `shift-space` will insert a [zero-width non-joiner character](https://en.wikipedia.org/wiki/Zero-width_non-joiner), which is useful for various scripts and languages.
+To switch between input modes quickly, you can use the *Select the previous input source* system keyboard shortcut. This is `control-space` by default.
 
 ## Goftam Persian
 

Resources/Assets.xcassets/BypassMenuIcon.imageset/Contents.json

@@ -1,4 +1,3 @@
 goftampersian = "Goftam Persian";
-goftambypass = "Goftam Bypass";
 
 CFBundleName = "Goftam";

Resources/Assets.xcassets/BypassMenuIcon.imageset/bypassmenuicon.png

@@ -67,28 +67,10 @@
 				<key>tsInputModeIsVisibleKey</key>
 				<true/>
 			</dict>
-			<key>goftambypass</key>
-			<dict>
-				<key>TISIntendedLanguage</key>
-				<string>en</string>
-				<key>TISInputSourceID</key>
-				<string>$(PRODUCT_BUNDLE_IDENTIFIER).bypass</string>
-				<key>tsInputModeScriptKey</key>
-				<string>smRoman</string>
-				<key>tsInputModeMenuIconFileKey</key>
-				<string>BypassMenuIcon</string>
-				<key>tsInputModeAlternateMenuIconFileKey</key>
-				<string>BypassMenuIcon</string>
-				<key>tsInputModeDefaultStateKey</key>
-				<true/>
-				<key>tsInputModeIsVisibleKey</key>
-				<true/>
-			</dict>
 		</dict>
 		<key>tsVisibleInputModeOrderedArrayKey</key>
 		<array>
 			<string>goftampersian</string>
-			<string>goftambypass</string>
 		</array>
 	</dict>
 	<key>tsInputMethodCharacterRepertoireKey</key>

Resources/Assets.xcassets/BypassMenuIcon.imageset/bypassmenuicon@2x.png

@@ -23,28 +23,18 @@ var wordStore: GoftamWordStore = GoftamWordStore()
 var transliterators: Dictionary<String, GoftamTransliterator> =
     [PersianGoftamTransliterator.transliteratorName: PersianGoftamTransliterator()]
 
-// BFG: different default behavior when more languages added?
 var activeTransliterator: GoftamTransliterator =
     transliterators[PersianGoftamTransliterator.transliteratorName]!
 
-// bypass control
-var bypassTransliteration: Bool = false
-var bypassTransliteratorName: String = "goftambypass"
-
-// select the transliterator to use (or enable bypass mode) by
-// its input mode name (from ComponentInputModeDict in Info.plist)
+// select the transliterator to use by its input mode
+// name (from ComponentInputModeDict in Info.plist)
 func selectTransliterator(_ mode: String) {
     goftamLog(logLevel: .VERBOSE, "mode \(mode)")
-    if mode == bypassTransliteratorName {
-        bypassTransliteration = true
-    } else {
-        guard let transliterator = transliterators[mode] else {
-            goftamLog("invalid transliterator selected")
-            abort()
-        }
-        bypassTransliteration = false
-        activeTransliterator = transliterator
+    guard let transliterator = transliterators[mode] else {
+        goftamLog("invalid transliterator selected")
+        abort()
     }
+    activeTransliterator = transliterator
 }
 
 // logging

Resources/Base.lproj/InfoPlist.strings

@@ -66,10 +66,8 @@ class GoftamIMKInputController: IMKInputController {
     override func menu() -> NSMenu! {
         goftamLog(logLevel: .VERBOSE, "")
         let menu = NSMenu()
-        if !bypassTransliteration {
-            menu.addItem(NSMenuItem(title: "Clear History", action: #selector(clearHistory(_:)), keyEquivalent: ""))
-        }
-        menu.addItem(NSMenuItem(title: "About", action: #selector(showAboutPanel(_:)), keyEquivalent: "")) // todo build id
+        menu.addItem(NSMenuItem(title: "Clear History", action: #selector(clearHistory(_:)), keyEquivalent: ""))
+        menu.addItem(NSMenuItem(title: "About", action: #selector(showAboutPanel(_:)), keyEquivalent: ""))
         return menu
     }
 
@@ -274,25 +272,6 @@ class GoftamIMKInputController: IMKInputController {
         }
         let char = event.characters!.first!
 
-        // shift-command-space toggles transliteration bypass
-        if (char == " ") && event.modifierFlags.contains([.shift, .command]) {
-            // sender.selectMode() will call :selectValue() above with
-            // the appropriate tag. if either the bypass input mode
-            // or the main language input modes are not loaded, then
-            // this design will fail gracefully because selectMode()
-            // will not result in a :selectValue() call.
-            if bypassTransliteration {
-                sender.selectMode(type(of: activeTransliterator).transliteratorName)
-            } else {
-                sender.selectMode(bypassTransliteratorName)
-            }
-            return true
-        }
-
-        if bypassTransliteration {
-            return false
-        }
-
         // if a command sequence was not handled by the application, ignore it
         if event.modifierFlags.contains(.command) {
             return false

Resources/Info.plist

@@ -12,7 +12,6 @@
 		8B49FC4C2469FDB700B08771 /* GoftamTransliterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B49FC4B2469FDB700B08771 /* GoftamTransliterator.swift */; };
 		8B523E79246DB8DB00B4A04C /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 8B523E78246DB8DB00B4A04C /* Base.lproj */; };
 		8B523E7C246DB90200B4A04C /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 8B523E7A246DB90100B4A04C /* LICENSE */; };
-		8B523E7D246DB90200B4A04C /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 8B523E7B246DB90200B4A04C /* README.md */; };
 		8BA9129F245CC84D00C9A683 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BA9129E245CC84D00C9A683 /* AppDelegate.swift */; };
 		8BA912A1245CC85000C9A683 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8BA912A0245CC85000C9A683 /* Assets.xcassets */; };
 		8BA912B1245CCA4F00C9A683 /* GoftamIMKInputController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BA912B0245CCA4F00C9A683 /* GoftamIMKInputController.swift */; };
@@ -160,7 +159,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				8B47A60624798B39004A391C /* MainMenu.xib in Resources */,
-				8B523E7D246DB90200B4A04C /* README.md in Resources */,
 				8BA912A1245CC85000C9A683 /* Assets.xcassets in Resources */,
 				8B523E79246DB8DB00B4A04C /* Base.lproj in Resources */,
 				8BC92BD7246F345B00D171C4 /* goftam.sqlite in Resources */,