register as English and enable password capability (#254)

This reverts commit 815e06c.

Author: eagleoflqj

cmake/MacOSXBundleInfo.plist.in

@@ -33,9 +33,6 @@
     <dict>
       <key>org.fcitx.inputmethod.fcitx5</key>
       <dict>
-        <!-- register as Chinese to disable on login/Terminal sudo password input -->
-        <key>TISIntendedLanguage</key>
-        <string>zh-Hans</string>
         <key>tsInputModeMenuIconFileKey</key>
         <string>menu_icon.pdf</string>
         <key>tsInputModeAlternateMenuIconFileKey</key>

macosfrontend/macosfrontend-public.h

@@ -8,7 +8,8 @@ typedef std::array<uint8_t, 16> ICUUID;
 
 // Though being UInt, 32b is enough for modifiers
 std::string process_key(ICUUID uuid, uint32_t unicode, uint32_t osxModifiers,
-                        uint16_t osxKeycode, bool isRelease) noexcept;
+                        uint16_t osxKeycode, bool isRelease,
+                        bool isPassword) noexcept;
 
 ICUUID create_input_context(const char *appId, id client) noexcept;
 void destroy_input_context(ICUUID uuid) noexcept;

macosfrontend/macosfrontend.cpp

@@ -78,12 +78,17 @@ void MacosFrontend::save() {
     safeSaveAsIni(config_, ConfPath);
 }
 
-std::string MacosFrontend::keyEvent(ICUUID uuid, const Key &key,
-                                    bool isRelease) {
+std::string MacosFrontend::keyEvent(ICUUID uuid, const Key &key, bool isRelease,
+                                    bool isPassword) {
     auto *ic = this->findIC(uuid);
     if (!ic) {
         return "{}";
     }
+    CapabilityFlags flags = CapabilityFlag::Preedit;
+    if (isPassword) {
+        flags |= CapabilityFlag::Password;
+    }
+    ic->setCapabilityFlags(flags);
     ic->focusIn();
     KeyEvent keyEvent(ic, key, isRelease);
     ic->isSyncEvent = true;
@@ -271,12 +276,13 @@ MacosInputContext::getCursorCoordinates(bool followCursor) {
 FCITX_ADDON_FACTORY_V2(macosfrontend, fcitx::MacosFrontendFactory);
 
 std::string process_key(ICUUID uuid, uint32_t unicode, uint32_t osxModifiers,
-                        uint16_t osxKeycode, bool isRelease) noexcept {
+                        uint16_t osxKeycode, bool isRelease,
+                        bool isPassword) noexcept {
     const fcitx::Key parsedKey =
         osx_key_to_fcitx_key(unicode, osxModifiers, osxKeycode);
     return with_fcitx([=](Fcitx &fcitx) {
         auto that = dynamic_cast<fcitx::MacosFrontend *>(fcitx.frontend());
-        return that->keyEvent(uuid, parsedKey, isRelease);
+        return that->keyEvent(uuid, parsedKey, isRelease, isPassword);
     });
 }
 

macosfrontend/macosfrontend.h

@@ -23,10 +23,6 @@
 #define TERMINAL_USE_EN                                                        \
     R"JSON({"appPath": "/System/Applications/Utilities/Terminal.app", "appId": "com.apple.Terminal", "imName": "keyboard-us"})JSON"
 
-// User deletes ABC to enable Fcitx5 on password input.
-#define PASSWORDS_USE_EN                                                       \
-    R"JSON({"appPath": "/System/Applications/Passwords.app", "appId": "com.apple.Passwords", "imName": "keyboard-us"})JSON"
-
 namespace fcitx {
 
 class MacosInputContext;
@@ -42,10 +38,8 @@ struct AppIMAnnotation {
 FCITX_CONFIGURATION(
     MacosFrontendConfig,
     OptionWithAnnotation<std::vector<std::string>, AppIMAnnotation>
-        appDefaultIM{this,
-                     "AppDefaultIM",
-                     _("App default IM"),
-                     {TERMINAL_USE_EN, PASSWORDS_USE_EN}};
+        appDefaultIM{
+            this, "AppDefaultIM", _("App default IM"), {TERMINAL_USE_EN}};
     Option<bool> simulateKeyRelease{this, "SimulateKeyRelease",
                                     _("Simulate key release")};
     Option<int, IntConstrain> simulateKeyReleaseDelay{
@@ -79,7 +73,8 @@ class MacosFrontend : public AddonInstance {
 
     ICUUID createInputContext(const std::string &appId, id client);
     void destroyInputContext(ICUUID);
-    std::string keyEvent(ICUUID, const Key &key, bool isRelease);
+    std::string keyEvent(ICUUID, const Key &key, bool isRelease,
+                         bool isPassword);
     void focusIn(ICUUID);
     std::string focusOut(ICUUID);
 

src/controller.swift

@@ -68,7 +68,9 @@ class FcitxInputController: IMKInputController {
     guard let client = client as? IMKTextInput else {
       return false
     }
-    let res = String(process_key(uuid, unicode, modsVal, code, isRelease))
+    // It can change within an IMKInputController (e.g. sudo in Terminal), so must reevaluate before each key sent to IM.
+    let isPassword = IsSecureEventInputEnabled()
+    let res = String(process_key(uuid, unicode, modsVal, code, isRelease, isPassword))
     return processRes(client, res)
   }