fix typo false :v, and reomve some func

Author: Zebra2711

src/ack-apps.h src/app_quirks.hsrc/ack-apps.h renamed to src/app_quirks.h

@@ -6,24 +6,25 @@
  */
 
 /**
- * @file ack-apps.h
+ * @file app_quirks.h
  * @brief List of applications requiring acknowledgment workaround.
  *
  * These browsers need special handling for uinput mode to work correctly.
  */
 
 #include <string>
-#include <vector>
+#include <string_view>
 
 /**
  * @brief List of application names requiring ACK workaround.
  *
  * Chromium-based browsers that need special handling for text replacement.
  */
-static std::vector<std::string> ack_apps = {"chrome", "chromium", "brave", "edge", "vivaldi", "opera", "coccoc", "cromite", "helium", "thorium", "slimjet", "yandex"};
+inline constexpr std::array<std::string_view, 12> ack_apps = {"chrome", "chromium", "brave",  "edge",    "vivaldi", "opera",
+                                                              "coccoc", "cromite",  "helium", "thorium", "slimjet", "yandex"};
 
 /**
  * @brief List of application names have goood support surrowding text
  *
  */
-static std::vector<std::string> surrtp_apps = {"mullvad", "soffice"};
+inline constexpr std::array<std::string_view, 1> surrtp_apps = {"soffice"};

src/lotus-engine.cpp

@@ -12,7 +12,7 @@
 #include "lotus-candidates.h"
 #include "lotus-monitor.h"
 #include "lotus-utils.h"
-#include "ack-apps.h"
+#include "app_quirks.h"
 #include <sys/socket.h>
 #include <utility>
 #ifndef DISABLE_VERSION_ACTION
@@ -375,7 +375,7 @@ namespace fcitx {
         //
         // TODO: Properly fixes instead ugly WA
         state->wa_flag  = false;
-        state->surrtp   = true;
+        state->surrtp   = false;
         state->waitAck_ = false;
         if (*config_.fixUinputWithAck) {
             if (targetMode == LotusMode::Uinput || targetMode == LotusMode::UinputHC || targetMode == LotusMode::Smooth) {
@@ -388,7 +388,7 @@ namespace fcitx {
                     if (appName.find(ackApp) != std::string::npos) {
                         if (is_dbus) {
                             state->waitAck_ = true;
-                            LOTUS_INFO(ackApp + " detected, waiting for ack");
+                            LOTUS_INFO(std::string(ackApp) + " detected, waiting for ack");
                         }
                         state->wa_flag = true;
                         break;
@@ -621,7 +621,6 @@ namespace fcitx {
         auto*      state           = ic->propertyFor(&factory_);
         const bool surrvalid       = ic->surroundingText().isValid();
         const bool is_dbus         = getFrontendName(ic) == "dbus";
-        state->lastDeactivateTime_ = now_ms();
         if (realMode == LotusMode::Preedit && event.type() != EventType::InputContextFocusOut) {
             state->commitBuffer();
         } else {

src/lotus-state.cpp

@@ -468,9 +468,9 @@ namespace fcitx {
             if (surr.isValid() && surr.cursor() == realtextLen.load(std::memory_order_acquire)) {
                 LOTUS_INFO("Skip retry");
             } else {
-                // Retry x3 (2 ms each), khi can (chromium,electron,...)
-                for (int retry = 0; retry < 3; ++retry) {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(2));
+                // Retry x5 (1 ms each), khi can (chromium,electron,...)
+                for (int retry = 0; retry < 5; ++retry) {
+                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
                     const auto& surr2 = ic_->surroundingText();
                     if (surr2.isValid() && surr2.cursor() == realtextLen.load(std::memory_order_acquire)) {
                         break;
@@ -484,8 +484,8 @@ namespace fcitx {
             pending_commit_string_   = "";
 
             event.filterAndAccept(); // Filter out the final trigger backspace.
-            if (getFrontendName(ic_) == "dbus" && !ic_->surroundingText().isValid())
-                replayBufferedKeys(); // Does we need drop this?
+            //if (getFrontendName(ic_) == "dbus" && !ic_->surroundingText().isValid())
+            //  replayBufferedKeys(); // Does we need drop this?
             return true;
         }
         return false;
@@ -683,32 +683,6 @@ namespace fcitx {
         history_ += keyUtf8;
         realtextLen.fetch_add(1, std::memory_order_acq_rel);
 
-        replayBufferToEngine(history_);
-
-        auto commitAfterReplay = UniqueCPtr<char>(EnginePullCommit(lotusEngine_.handle()));
-        if (commitAfterReplay && (*commitAfterReplay.get() != 0)) {
-            std::string commitStr = commitAfterReplay.get();
-            std::string commonPrefix;
-            std::string deletedPart;
-            std::string addedPart;
-            compareAndSplitStrings(oldPreBuffer_, commitStr, commonPrefix, deletedPart, addedPart);
-
-            if (!deletedPart.empty()) {
-                if (performReplacement(deletedPart, addedPart))
-                    keyEvent.forward();
-            } else if (!addedPart.empty()) {
-                ic_->commitString(addedPart);
-                LOTUS_INFO("Commit: " + addedPart);
-            }
-
-            history_.clear();
-            ResetEngine(lotusEngine_.handle());
-            oldPreBuffer_.clear();
-
-            keyEvent.filterAndAccept();
-            return;
-        }
-
         UniqueCPtr<char> preeditC(EnginePullPreedit(lotusEngine_.handle()));
         std::string      preeditStr = (preeditC && (*preeditC.get() != 0)) ? preeditC.get() : "";
 
@@ -969,8 +943,8 @@ namespace fcitx {
             }
             replacement_thread_id_.store(0, std::memory_order_release);
             replacement_start_ms_.store(0, std::memory_order_release);
-            if (getFrontendName(ic_) == "dbus" && !ic_->surroundingText().isValid())
-                replayBufferedKeys(); // Does we need drop this?
+            //if (getFrontendName(ic_) == "dbus" && !ic_->surroundingText().isValid())
+            //   replayBufferedKeys(); // Does we need drop this?
         }
         KeySym currentSym = keyEvent.rawKey().sym();
         if (*engine_->config().autoCapitalizeAfterPunctuation && realMode != LotusMode::Off) {
@@ -1162,11 +1136,9 @@ namespace fcitx {
         }
         oldPreBuffer_.clear();
         history_.clear();
-        if (!is_deleting_.load(std::memory_order_acquire)) {
-            expected_backspaces_     = 0;
-            current_backspace_count_ = 0;
-            pending_commit_string_.clear();
-        }
+        expected_backspaces_     = 0;
+        current_backspace_count_ = 0;
+        pending_commit_string_.clear();
         emojiBuffer_.clear();
         emojiCandidates_.clear();
         buffered_keys_.clear();
@@ -1179,14 +1151,13 @@ namespace fcitx {
     bool LotusState::isEmptyHistory() {
         return history_.empty();
     }
-
+    /*
     void LotusState::replayBufferedKeys() {
         LOTUS_INFO("Starting replay buffered keys");
         if (buffered_keys_.empty()) {
             return;
         }
         auto keys = std::move(buffered_keys_);
-        buffered_keys_.clear();
         for (size_t i = 0; i < keys.size(); ++i) {
             KeySym      sym     = static_cast<KeySym>(keys[i].sym);
             uint32_t    state   = keys[i].state;
@@ -1236,40 +1207,6 @@ namespace fcitx {
             history_ += keyUtf8;
             realtextLen.fetch_add(1, std::memory_order_acq_rel);
 
-            replayBufferToEngine(history_);
-
-            auto commitAfterReplay = UniqueCPtr<char>(EnginePullCommit(lotusEngine_.handle()));
-            if (commitAfterReplay && (*commitAfterReplay.get() != 0)) {
-                std::string commitStr = commitAfterReplay.get();
-                std::string commonPrefix;
-                std::string deletedPart;
-                std::string addedPart;
-                compareAndSplitStrings(oldPreBuffer_, commitStr, commonPrefix, deletedPart, addedPart);
-
-                if (!deletedPart.empty()) {
-                    // Re-buffer remaining keys for next replay cycle.
-                    for (size_t j = i + 1; j < keys.size(); ++j) {
-                        if (buffered_keys_.size() < MAX_BUFFERED_KEYS) {
-                            buffered_keys_.push_back(keys[j]);
-                        }
-                    }
-                    performReplacement(deletedPart, addedPart);
-
-                    history_.clear();
-                    ResetEngine(lotusEngine_.handle());
-                    oldPreBuffer_.clear();
-                    return;
-                }
-                if (!addedPart.empty()) {
-                    ic_->commitString(addedPart);
-                }
-
-                history_.clear();
-                ResetEngine(lotusEngine_.handle());
-                oldPreBuffer_.clear();
-                continue;
-            }
-
             UniqueCPtr<char> preeditC(EnginePullPreedit(lotusEngine_.handle()));
             std::string      preeditStr = (preeditC && (*preeditC.get() != 0)) ? preeditC.get() : "";
 
@@ -1307,4 +1244,5 @@ namespace fcitx {
         }
         LOTUS_INFO("Replay buffered keys done");
     }
+*/
 } // namespace fcitx