Skip to content

fix: improve key buffering and state recovery to prevent dropped keys #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhktmdzhg merged 1 commit into from
Mar 5, 2026
+42 −6
Merged

fix: improve key buffering and state recovery to prevent dropped keys #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions src/lotus-state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ namespace fcitx {
} else {
std::string keyUtf8Check = Key::keySymToUTF8(currentSym);
if (!keyUtf8Check.empty() && buffered_keys_.size() < MAX_BUFFERED_KEYS) {
buffered_keys_.push_back(currentSym);
buffered_keys_.push_back({currentSym, keyEvent.rawKey().states()});
}
keyEvent.filterAndAccept();
}
Expand Down Expand Up @@ -641,9 +641,21 @@ namespace fcitx {

auto commitAfterReplay = UniqueCPtr<char>(EnginePullCommit(lotusEngine_.handle()));
if (commitAfterReplay && commitAfterReplay.get()[0]) {
std::string commitStr = commitAfterReplay.get();
std::string commonPrefix, deletedPart, addedPart;
compareAndSplitStrings(oldPreBuffer_, commitStr, commonPrefix, deletedPart, addedPart);

if (!deletedPart.empty()) {
performReplacement(deletedPart, addedPart);
} else if (!addedPart.empty()) {
ic_->commitString(addedPart);
}

history_.clear();
ResetEngine(lotusEngine_.handle());
oldPreBuffer_.clear();

keyEvent.filterAndAccept();
return;
}

Expand Down Expand Up @@ -997,13 +1009,14 @@ namespace fcitx {
auto keys = std::move(buffered_keys_);
buffered_keys_.clear();
for (size_t i = 0; i < keys.size(); ++i) {
KeySym sym = keys[i];
KeySym sym = static_cast<KeySym>(keys[i].sym);
uint32_t state = keys[i].state;
std::string keyUtf8 = Key::keySymToUTF8(sym);
if (keyUtf8.empty()) {
continue;
}

bool processed = EngineProcessKeyEvent(lotusEngine_.handle(), sym, 0);
bool processed = EngineProcessKeyEvent(lotusEngine_.handle(), sym, state);

auto commitF = UniqueCPtr<char>(EnginePullCommit(lotusEngine_.handle()));
if (commitF && commitF.get()[0]) {
Expand All @@ -1019,10 +1032,12 @@ namespace fcitx {
}
}
performReplacement(deletedPart, addedPart);
history_.clear();
ResetEngine(lotusEngine_.handle());
oldPreBuffer_.clear();
return;
} else if (!addedPart.empty()) {
ic_->commitString(addedPart);
oldPreBuffer_ = commitStr;
}

history_.clear();
Expand All @@ -1043,6 +1058,26 @@ namespace fcitx {

auto commitAfterReplay = UniqueCPtr<char>(EnginePullCommit(lotusEngine_.handle()));
if (commitAfterReplay && commitAfterReplay.get()[0]) {
std::string commitStr = commitAfterReplay.get();
std::string commonPrefix, deletedPart, 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;
} else if (!addedPart.empty()) {
ic_->commitString(addedPart);
}

history_.clear();
ResetEngine(lotusEngine_.handle());
oldPreBuffer_.clear();
Expand Down
5 changes: 3 additions & 2 deletions src/lotus-state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "lotus.h"
#include "emoji.h"
#include "lotus-utils.h"
#include <fcitx-utils/key.h>
#include <fcitx/inputcontext.h>
#include <fcitx/inputcontextproperty.h>
Expand Down Expand Up @@ -199,7 +200,7 @@ namespace fcitx {
friend class LotusEngine;

private:
static constexpr size_t MAX_BUFFERED_KEYS = 10;
static constexpr size_t MAX_BUFFERED_KEYS = 50;

LotusEngine* engine_;
InputContext* ic_;
Expand All @@ -213,7 +214,7 @@ namespace fcitx {
std::string emojiBuffer_;
std::vector<EmojiEntry> emojiCandidates_;
bool waitAck_ = false;
std::vector<KeySym> buffered_keys_; ///< Keystrokes buffered during replacement
std::vector<KeyEntry> buffered_keys_; ///< Keystrokes buffered during replacement
};

} // namespace fcitx
Expand Down
Loading