update deps; auto collapse when no preedit (#55)

eagleoflqj · web-flow · commit 91b405366b0b · 2025-11-15T18:37:35.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,6 +79,7 @@ jobs:
       - name: Build HAP
         run: |
           git apply --directory=entry/src/main/cpp/fcitx5 patches/fcitx5.patch
+          git apply --directory=entry/src/main/cpp/fcitx5-chinese-addons patches/chinese-addons.patch
           git apply --directory=entry/src/main/cpp/libime patches/libime.patch
           # Install dependencies
           ohpm install --all
diff --git a/entry/src/main/cpp/CMakeLists.txt b/entry/src/main/cpp/CMakeLists.txt
@@ -20,6 +20,7 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${PREBUILT_ROOT}")
 set(ENV{PKG_CONFIG_PATH} "${PREBUILT_USR}/lib/pkgconfig")
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+set(Fcitx5Utils_DIR "${PROJECT_SOURCE_DIR}/cmake")
 
 find_library(UV NAMES uv)
 add_library(ohos_uv SHARED IMPORTED)
diff --git a/entry/src/main/cpp/cmake/Fcitx5UtilsConfig.cmake b/entry/src/main/cpp/cmake/Fcitx5UtilsConfig.cmake
@@ -7,4 +7,6 @@ set(FCITX_INSTALL_CMAKECONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 # mimic fcitx5/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
 include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5Utils/Fcitx5Macros.cmake")
+
+# Install resources to entry/src/main/resources/resfile/usr/share/fcitx5
 set(FCITX_INSTALL_PKGDATADIR /usr/share/fcitx5)
diff --git a/entry/src/main/cpp/cmake/Fcitx5UtilsConfigVersion.cmake b/entry/src/main/cpp/cmake/Fcitx5UtilsConfigVersion.cmake
@@ -0,0 +1 @@
+set(PACKAGE_VERSION_COMPATIBLE TRUE)
diff --git a/entry/src/main/cpp/cmake/FindFcitx5Core.cmake b/entry/src/main/cpp/cmake/FindFcitx5Core.cmake
@@ -1,2 +1,2 @@
 set(Fcitx5Core_FOUND TRUE)
-find_package(Fcitx5Utils REQUIRED MODULE)
+find_package(Fcitx5Utils REQUIRED CONFIG)
diff --git a/entry/src/main/cpp/fcitx5 b/entry/src/main/cpp/fcitx5
@@ -1 +1 @@
-Subproject commit b4405d70a6d58ac94b9f06a446e84f777ea5f3b7
+Subproject commit 05af961e0a03215383ce4b5bb47677a28fb50cbb
diff --git a/entry/src/main/cpp/fcitx5-chinese-addons b/entry/src/main/cpp/fcitx5-chinese-addons
@@ -1 +1 @@
-Subproject commit 12d6bdff68123c38d60964c7e211c7929a088a16
+Subproject commit d231148df40903a25d9c0cba89b0c48ade934289
diff --git a/entry/src/main/cpp/fcitx5-lua b/entry/src/main/cpp/fcitx5-lua
@@ -1 +1 @@
-Subproject commit fa7a16fbc56dd111fcda3bc7504ff2b9925892b0
+Subproject commit b2f2a5583895d93a69d64f537f2e9fb5f226c939
diff --git a/entry/src/main/cpp/libime b/entry/src/main/cpp/libime
@@ -1 +1 @@
-Subproject commit 020b4573ff13e7e0f474e587dd26c2f5eea55373
+Subproject commit 1bae691968e002ea937b6fa8ec04dfc3360d3de1
diff --git a/entry/src/main/cpp/webkeyboard/webkeyboard.cpp b/entry/src/main/cpp/webkeyboard/webkeyboard.cpp
@@ -55,7 +55,7 @@ void WebKeyboard::update(UserInterfaceComponent component, InputContext *inputCo
         if (auxUp.empty() && preedit.empty() && candidates.empty()) {
             notify_main_async(R"JSON({"type":"CLEAR"})JSON");
         } else {
-            setCandidatesAsync(candidates, highlighted, 0, false, false);
+            setCandidatesAsync(candidates, highlighted, 0, false, false, !inputPanel.clientPreedit().empty());
         }
         break;
     }
@@ -66,14 +66,15 @@ void WebKeyboard::update(UserInterfaceComponent component, InputContext *inputCo
 }
 
 void WebKeyboard::setCandidatesAsync(const std::vector<Candidate> &candidates, int highlighted, int scrollState,
-                                     bool scrollStart, bool scrollEnd) {
+                                     bool scrollStart, bool scrollEnd, bool hasClientPreedit) {
     auto j = json{{"type", "CANDIDATES"},
                   {"data",
                    {{"candidates", candidates},
                     {"highlighted", highlighted},
                     {"scrollState", scrollState},
                     {"scrollStart", scrollStart},
-                    {"scrollEnd", scrollEnd}}}};
+                    {"scrollEnd", scrollEnd},
+                    {"hasClientPreedit", hasClientPreedit}}}};
     notify_main_async(j.dump());
 }
 
@@ -105,7 +106,8 @@ void WebKeyboard::scroll(int start, int count) {
             break;
         }
     }
-    setCandidatesAsync(candidates, start == 0 ? 0 : -1, 2, start == 0, endReached);
+    setCandidatesAsync(candidates, start == 0 ? 0 : -1, 2, start == 0, endReached,
+                       !ic->inputPanel().clientPreedit().empty());
 }
 
 static nlohmann::json actionToJson(Action *action, InputContext *ic) {
diff --git a/entry/src/main/cpp/webkeyboard/webkeyboard.h b/entry/src/main/cpp/webkeyboard/webkeyboard.h
@@ -48,7 +48,7 @@ class WebKeyboard final : public VirtualKeyboardUserInterface {
     Instance *instance_;
 
     void setCandidatesAsync(const std::vector<Candidate> &candidates, int highlighted, int scrollState,
-                            bool scrollStart, bool scrollEnd);
+                            bool scrollStart, bool scrollEnd, bool hasClientPreedit);
     void expand();
 };
 
diff --git a/entry/src/main/fcitx5-keyboard-web b/entry/src/main/fcitx5-keyboard-web
@@ -1 +1 @@
-Subproject commit 36ff5f1d6910850b023a42f6b9cc613b11eb9fca
+Subproject commit 8d7c37399acdeb4a02fce908b08cc25d8ab5a966
diff --git a/patches/chinese-addons.patch b/patches/chinese-addons.patch
@@ -0,0 +1,29 @@
+diff --git a/im/pinyin/pinyin.cpp b/im/pinyin/pinyin.cpp
+index bc19a12..853196c 100644
+--- a/im/pinyin/pinyin.cpp
++++ b/im/pinyin/pinyin.cpp
+@@ -894,13 +894,13 @@ void PinyinEngine::loadExtraDict() {
+     auto files =
+         standardPath.locate(StandardPathsType::PkgData, "pinyin/dictionaries",
+                             pathfilter::extension(".dict"));
+-    std::unordered_set<std::filesystem::path> disableFilesSet;
++    std::unordered_set<std::string> disableFilesSet;
+     for (const auto &item :
+          standardPath.locate(StandardPathsType::PkgData, "pinyin/dictionaries",
+                              pathfilter::extension(".disable")) |
+              std::views::transform(
+                  [](const auto &item) { return item.first.stem(); })) {
+-        disableFilesSet.insert(item);
++        disableFilesSet.insert(item.string());
+     }
+     FCITX_ASSERT(ime_->dict()->dictSize() >=
+                  libime::TrieDictionary::UserDict + NumBuiltInDict + 1)
+@@ -909,7 +909,7 @@ void PinyinEngine::loadExtraDict() {
+     ime_->dict()->removeFrom(libime::TrieDictionary::UserDict + NumBuiltInDict +
+                              1);
+     for (auto &file : files) {
+-        if (disableFilesSet.contains(file.first)) {
++        if (disableFilesSet.find(file.first.string()) != disableFilesSet.end()) {
+             PINYIN_DEBUG() << "Dictionary: " << file.first << " is disabled.";
+             continue;
+         }
diff --git a/patches/fcitx5.patch b/patches/fcitx5.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29536ffc..5c98d97b 100644
+index ee908c87..4d0449f4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -228,7 +228,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI
+@@ -231,7 +231,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI
  include_directories(${CMAKE_CURRENT_BINARY_DIR})
  
  add_subdirectory(src)
@@ -11,10 +11,10 @@ index 29536ffc..5c98d97b 100644
  
  if (ENABLE_TESTING_ADDONS)
 diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
-index b2f37acd..0cf72d7c 100644
+index 60bfa14a..08f4a73e 100644
 --- a/src/lib/fcitx-config/CMakeLists.txt
 +++ b/src/lib/fcitx-config/CMakeLists.txt
-@@ -30,8 +30,7 @@ ecm_setup_version(PROJECT
+@@ -35,8 +35,7 @@ ecm_setup_version(PROJECT
  
  add_library(Fcitx5Config ${FCITX_CONFIG_SOURCES})
  set_target_properties(Fcitx5Config
@@ -25,10 +25,10 @@ index b2f37acd..0cf72d7c 100644
    )
  target_include_directories(Fcitx5Config PUBLIC
 diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt
-index d2498649..b88dc5f9 100644
+index fe71b8f8..4e36f67c 100644
 --- a/src/lib/fcitx-utils/CMakeLists.txt
 +++ b/src/lib/fcitx-utils/CMakeLists.txt
-@@ -124,8 +124,7 @@ ecm_setup_version(PROJECT
+@@ -142,8 +142,7 @@ ecm_setup_version(PROJECT
  
  add_library(Fcitx5Utils ${FCITX_UTILS_SOURCES})
  set_target_properties(Fcitx5Utils
@@ -39,30 +39,150 @@ index d2498649..b88dc5f9 100644
    )
  target_include_directories(Fcitx5Utils PUBLIC
 diff --git a/src/lib/fcitx-utils/log.cpp b/src/lib/fcitx-utils/log.cpp
-index 6e9d18ab..00964e3a 100644
+index 56fb7f62..5b4dc244 100644
 --- a/src/lib/fcitx-utils/log.cpp
 +++ b/src/lib/fcitx-utils/log.cpp
-@@ -213,6 +213,7 @@ LogMessageBuilder::LogMessageBuilder(std::ostream &out, LogLevel l,
+@@ -21,7 +21,6 @@
+ #include <utility>
+ #include <vector>
+ #include <format>
+-#include <syncstream>
+ #include "macros.h"
+ #include "stringutils.h"
+ 
+@@ -35,16 +34,17 @@ using LogRule = std::pair<std::string, LogLevel>;
+ 
+ struct LogConfig {
+     static std::ostream *defaultLogStream;
+-    static thread_local std::osyncstream localLogStream;
+     static bool showTimeDate;
+ };
+ 
+ std::ostream *LogConfig::defaultLogStream = &std::cerr;
++#if 0
+ thread_local std::osyncstream LogConfig::localLogStream = []() {
+     std::osyncstream out(*LogConfig::defaultLogStream);
+     out.rdbuf()->set_emit_on_sync(true);
+     return out;
+ }();
++#endif
+ bool LogConfig::showTimeDate = true;
+ 
+ bool validateLogLevel(std::underlying_type_t<LogLevel> l) {
+@@ -199,12 +199,15 @@ void Log::setLogStream(std::ostream &stream) {
+ }
+ 
+ std::ostream &Log::logStream() {
++#if 0
+     auto *buf = LogConfig::defaultLogStream->rdbuf();
+     if (LogConfig::localLogStream.get_wrapped() != buf) {
+         LogConfig::localLogStream = std::osyncstream(buf);
+         LogConfig::localLogStream.rdbuf()->set_emit_on_sync(true);
+     }
+     return LogConfig::localLogStream;
++#endif
++    return *LogConfig::defaultLogStream;
+ }
+ 
+ LogMessageBuilder::LogMessageBuilder(std::ostream &out, LogLevel l,
+@@ -230,6 +233,7 @@ LogMessageBuilder::LogMessageBuilder(std::ostream &out, LogLevel l,
          break;
      }
  
 +#if 0
-     if (globalLogConfig.showTimeDate) {
+     if (LogConfig::showTimeDate) {
          try {
              auto now = std::chrono::time_point_cast<std::chrono::microseconds>(
-@@ -229,6 +230,7 @@ LogMessageBuilder::LogMessageBuilder(std::ostream &out, LogLevel l,
+@@ -246,6 +250,7 @@ LogMessageBuilder::LogMessageBuilder(std::ostream &out, LogLevel l,
          } catch (...) {
          }
      }
 +#endif
  
      out_ << filename << ":" << lineNumber << "] ";
  }
+diff --git a/src/lib/fcitx-utils/log.h b/src/lib/fcitx-utils/log.h
+index d1f3638f..112c3b6b 100644
+--- a/src/lib/fcitx-utils/log.h
++++ b/src/lib/fcitx-utils/log.h
+@@ -32,7 +32,6 @@
+ #include <fcitx-utils/metastring.h>
+ #include <fcitx-utils/misc.h>
+ #include <fcitx-utils/tuplehelpers.h>
+-#include <source_location> // IWYU pragma: keep
+ #include <span>
+ 
+ namespace fcitx {
+@@ -302,16 +301,18 @@ private:
+ 
+ } // namespace fcitx
+ 
++#define FCITX_LOG_FILENAME_WRAP                                                \
++    fcitx::MetaStringBasenameType<fcitxMakeMetaString(__FILE__)>::data()
++
+ // Use meta string for file name to avoid having full path in binary.
+ #define FCITX_LOGC_IF(CATEGORY, LEVEL, CONDITION)                              \
+     for (bool fcitxLogEnabled =                                                \
+              (CONDITION) && CATEGORY().fatalWrapper(::fcitx::LogLevel::LEVEL); \
+          fcitxLogEnabled;                                                      \
+          fcitxLogEnabled = CATEGORY().fatalWrapper2(::fcitx::LogLevel::LEVEL)) \
+-    ::fcitx::LogMessageBuilderWrapper<                                         \
+-        fcitx::MetaStringBasenameType<fcitxMakeMetaString(                     \
+-            std::source_location::current().file_name())>,                     \
+-        std::source_location::current().line()>(::fcitx::LogLevel::LEVEL)      \
++    ::fcitx::LogMessageBuilder(::fcitx::Log::logStream(),                      \
++                               ::fcitx::LogLevel::LEVEL,                       \
++                               FCITX_LOG_FILENAME_WRAP, __LINE__)              \
+         .self()
+ 
+ #define FCITX_LOGC(CATEGORY, LEVEL)                                            \
+@@ -319,10 +320,9 @@ private:
+              CATEGORY().fatalWrapper(::fcitx::LogLevel::LEVEL);                \
+          fcitxLogEnabled;                                                      \
+          fcitxLogEnabled = CATEGORY().fatalWrapper2(::fcitx::LogLevel::LEVEL)) \
+-    ::fcitx::LogMessageBuilderWrapper<                                         \
+-        fcitx::MetaStringBasenameType<fcitxMakeMetaString(                     \
+-            std::source_location::current().file_name())>,                     \
+-        std::source_location::current().line()>(::fcitx::LogLevel::LEVEL)      \
++    ::fcitx::LogMessageBuilder(::fcitx::Log::logStream(),                      \
++                               ::fcitx::LogLevel::LEVEL,                       \
++                               FCITX_LOG_FILENAME_WRAP, __LINE__)              \
+         .self()
+ 
+ #define FCITX_LOG(LEVEL) FCITX_LOGC(::fcitx::Log::defaultCategory, LEVEL)
+diff --git a/src/lib/fcitx-utils/standardpaths_p_unix.cpp b/src/lib/fcitx-utils/standardpaths_p_unix.cpp
+index 7bee8aba..8d593e05 100644
+--- a/src/lib/fcitx-utils/standardpaths_p_unix.cpp
++++ b/src/lib/fcitx-utils/standardpaths_p_unix.cpp
+@@ -103,12 +103,12 @@ std::vector<std::filesystem::path> defaultPaths(
+         }
+     }
+ 
+-    std::unordered_set<std::filesystem::path> seen;
++    std::unordered_set<std::string> seen;
+     std::erase_if(dirs, [&seen](const auto &dir) {
+-        if (seen.contains(dir)) {
++        if (seen.find(dir.string()) != seen.end()) {
+             return true;
+         }
+-        seen.insert(dir);
++        seen.insert(dir.string());
+         return false;
+     });
+ 
 diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt
-index 56fe5190..f154b8d3 100644
+index 0cf004fe..c742e0bf 100644
 --- a/src/lib/fcitx/CMakeLists.txt
 +++ b/src/lib/fcitx/CMakeLists.txt
-@@ -67,8 +67,7 @@ ecm_setup_version(PROJECT
+@@ -24,7 +24,6 @@ set(FCITX_CORE_SOURCES
+     inputpanel.cpp
+     candidatelist.cpp
+     candidateaction.cpp
+-    icontheme.cpp
+     inputmethodengine.cpp
+     )
+ 
+@@ -67,8 +66,7 @@ ecm_setup_version(PROJECT
  
  add_library(Fcitx5Core ${FCITX_CORE_SOURCES})
  set_target_properties(Fcitx5Core
@@ -71,4 +191,4 @@ index 56fe5190..f154b8d3 100644
 +  PROPERTIES
    EXPORT_NAME Core
    )
- target_include_directories(Fcitx5Core PUBLIC
+ 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`set(Fcitx5Core_FOUND TRUE)`
`2`		`-find_package(Fcitx5Utils REQUIRED MODULE)`
	`2`	`+find_package(Fcitx5Utils REQUIRED CONFIG)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void WebKeyboard::update(UserInterfaceComponent component, InputContext *inputCo`
`55`	`55`	`if (auxUp.empty() && preedit.empty() && candidates.empty()) {`
`56`	`56`	`notify_main_async(R"JSON({"type":"CLEAR"})JSON");`
`57`	`57`	`} else {`
`58`		`- setCandidatesAsync(candidates, highlighted, 0, false, false);`
	`58`	`+ setCandidatesAsync(candidates, highlighted, 0, false, false, !inputPanel.clientPreedit().empty());`
`59`	`59`	`}`
`60`	`60`	`break;`
`61`	`61`	`}`
`@@ -66,14 +66,15 @@ void WebKeyboard::update(UserInterfaceComponent component, InputContext *inputCo`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`void WebKeyboard::setCandidatesAsync(const std::vector<Candidate> &candidates, int highlighted, int scrollState,`
`69`		`- bool scrollStart, bool scrollEnd) {`
	`69`	`+ bool scrollStart, bool scrollEnd, bool hasClientPreedit) {`
`70`	`70`	`auto j = json{{"type", "CANDIDATES"},`
`71`	`71`	`{"data",`
`72`	`72`	`{{"candidates", candidates},`
`73`	`73`	`{"highlighted", highlighted},`
`74`	`74`	`{"scrollState", scrollState},`
`75`	`75`	`{"scrollStart", scrollStart},`
`76`		`- {"scrollEnd", scrollEnd}}}};`
	`76`	`+ {"scrollEnd", scrollEnd},`
	`77`	`+ {"hasClientPreedit", hasClientPreedit}}}};`
`77`	`78`	`notify_main_async(j.dump());`
`78`	`79`	`}`
`79`	`80`
`@@ -105,7 +106,8 @@ void WebKeyboard::scroll(int start, int count) {`
`105`	`106`	`break;`
`106`	`107`	`}`
`107`	`108`	`}`
`108`		`- setCandidatesAsync(candidates, start == 0 ? 0 : -1, 2, start == 0, endReached);`
	`109`	`+ setCandidatesAsync(candidates, start == 0 ? 0 : -1, 2, start == 0, endReached,`
	`110`	`+ !ic->inputPanel().clientPreedit().empty());`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`static nlohmann::json actionToJson(Action action, InputContext ic) {`