fix old focus out after new focus in; reset display mode

fcitx-contrib · Jan 25, 2025 · 240cb47 · 240cb47
1 parent f517c26
commit 240cb47
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 11 deletions.
diff --git a/engines/fcitx5-chinese-addons b/engines/fcitx5-chinese-addons
diff --git a/engines/fcitx5-lua b/engines/fcitx5-lua
diff --git a/engines/fcitx5-rime b/engines/fcitx5-rime
diff --git a/engines/libime b/engines/libime
diff --git a/fcitx5 b/fcitx5
diff --git a/iosfrontend/iosfrontend.cpp b/iosfrontend/iosfrontend.cpp
@@ -24,7 +24,12 @@ void IosFrontend::focusIn(id client) {
     ic_->focusIn();
 }
 
-void IosFrontend::focusOut() {
+void IosFrontend::focusOut(id client) {
+    // Old viewWillDisappear may be called after new viewWillAppear (if
+    // switching apps) so don't always reset.
+    if (client != ic_->getClient()) {
+        return;
+    }
     ic_->focusOut();
     // Extracting client from nil crashes on Swift, so it has to be put after
     // ic_->focusOut, although commit on focus out doesn't work on iOS (even if

diff --git a/iosfrontend/iosfrontend.h b/iosfrontend/iosfrontend.h
@@ -25,7 +25,7 @@ class IosFrontend : public AddonInstance {
     void createInputContext();
     bool keyEvent(const Key &key, bool isRelease);
     void focusIn(id client);
-    void focusOut();
+    void focusOut(id client);
 
   private:
     Instance *instance_;

diff --git a/keyboard/KeyboardViewController.swift b/keyboard/KeyboardViewController.swift
@@ -45,13 +45,14 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
       logger.info("Reload accepted")
       reload()
     }
+    virtualKeyboardView.setDisplayMode(.initial)
     focusIn(self)
   }
 
   override func viewWillDisappear(_ animated: Bool) {
     logger.info("viewWillDisappear \(self.id)")
     super.viewWillDisappear(animated)
-    focusOut()
+    focusOut(self)
   }
 
   deinit {

diff --git a/keyboard/fcitx.cpp b/keyboard/fcitx.cpp
@@ -23,8 +23,8 @@ void focusIn(id client) {
     return with_fcitx([client] { frontend->focusIn(client); });
 }
 
-void focusOut() {
-    return with_fcitx([] { frontend->focusOut(); });
+void focusOut(id client) {
+    return with_fcitx([client] { frontend->focusOut(client); });
 }
 
 bool processKey(const char *key) {

diff --git a/keyboard/fcitx.h b/keyboard/fcitx.h
@@ -4,6 +4,6 @@
 
 void startFcitx(const char *bundlePath, const char *appGroupPath);
 void focusIn(id client);
-void focusOut();
+void focusOut(id client);
 bool processKey(const char *key);
 void reload();
+1 −1		CMakeLists.txt
+1 −0		gui/pinyindictmanager/browserdialog.h
+92 −63		im/pinyin/pinyin.cpp
+3 −2		im/pinyin/pinyin.h
+1 −1		im/table/ime.h
+10 −8		im/table/state.cpp
+1 −0		im/table/state.h
+1 −1		modules/punctuation/punctuation.cpp
+1 −0		org.fcitx.Fcitx5.Addon.ChineseAddons.metainfo.xml.in
+125 −120		po/zh_CN.po
+4 −2		test/testpinyin.cpp
+1 −1		test/testtable.cpp
+1 −1		CMakeLists.txt
+4 −4		src/libime/table/tablebaseddictionary.cpp
+1 −0		data/org.fcitx.Fcitx5.metainfo.xml.in
+106 −98		po/ca.po
+108 −100		po/da.po
+106 −98		po/de.po
+106 −98		po/es.po
+106 −98		po/fcitx5.pot
+106 −98		po/fr.po
+106 −98		po/he.po
+115 −109		po/ja.po
+111 −103		po/ko.po
+118 −107		po/ru.po
+106 −98		po/vi.po
+116 −103		po/zh_CN.po
+112 −104		po/zh_TW.po
+2 −1		src/frontend/waylandim/waylandim.cpp
+10 −3		src/lib/fcitx/globalconfig.cpp
+16 −0		src/lib/fcitx/icontheme.cpp
+2 −1		src/lib/fcitx/instance.cpp
+21 −9		src/lib/fcitx/misc_p.h
+2 −1		src/modules/notificationitem/dbusmenu.cpp
+41 −6		src/modules/quickphrase/quickphrase.cpp
+4 −0		src/modules/quickphrase/quickphrase.h
+10 −0		src/modules/quickphrase/quickphrase_public.h
+29 −9		src/modules/wayland/waylandmodule.cpp
+1 −1		src/modules/wayland/waylandmodule.h
+2 −0		test/CMakeLists.txt
+2 −1		test/testinstance.cpp
+24 −0		test/testquickphrase.cpp
+1 −0		testing/testfrontend/testfrontend_public.h