Skip to content

fix: lastFocusedInputContext may be nullptr. #36

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
Xinkai merged 1 commit into from
Mar 8, 2026
+31 −28
Merged

fix: lastFocusedInputContext may be nullptr. #36

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
59 changes: 31 additions & 28 deletions DictypeFcitx/src/DictypeFcitx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,39 +206,42 @@ void DictypeFcitx::trigger_(const fcitx::KeyEvent& keyEvent,
}
}

const auto syncState =
[](const DictypeFcitx* that) {
const auto inputContextOpt = that->state_.inputContext();
if (!inputContextOpt.has_value()) {
DICTYPE_WARN() << "input context is gone.";
if (that->running_.load(std::memory_order_acquire)) {
that->stop_();
}
return;
const auto syncState = [](const DictypeFcitx* that) {
const auto inputContextOpt = that->state_.inputContext();
if (!inputContextOpt.has_value()) {
DICTYPE_WARN() << "input context is gone.";
if (that->running_.load(std::memory_order_acquire)) {
that->stop_();
}
const auto lastFocusedInputContext =
that->instance()->lastFocusedInputContext();
auto* inputContext = *inputContextOpt;
if (lastFocusedInputContext != inputContext) {
// WORKAROUND: I suspect with some backends, InputContext
// commitString() always commits to the currently focused text
// widget, not the text widget associated with InputContext.
return;
}
const auto lastFocusedInputContext =
that->instance()->lastFocusedInputContext();
auto* inputContext = *inputContextOpt;
if (lastFocusedInputContext != inputContext) {
// WORKAROUND: I suspect with some backends, InputContext
// commitString() always commits to the currently focused text
// widget, not the text widget associated with InputContext.
if (lastFocusedInputContext == nullptr) {
DICTYPE_INFO() << "No focused InputContext. Delaying commit...";
} else {
const std::string uuid = toHex(lastFocusedInputContext->uuid());
DICTYPE_INFO()
<< "last focused input uuid: " << uuid
<< ". Different InputContexts detected. Delaying commit...";
// TODO: watch for the re-focus, and run syncState() again.
return;
<< ". Different InputContexts detected. Delaying "
"commit...";
}
if (const auto committable = that->state_.takeCommittableText();
committable.has_value()) {
const std::string uuid = toHex(inputContext->uuid());
DICTYPE_INFO()
<< uuid << " committing: " << committable.value();
inputContext->commitString(committable.value());
}
that->updateUI_();
};
// TODO: watch for the re-focus, and run syncState() again.
return;
}
if (const auto committable = that->state_.takeCommittableText();
committable.has_value()) {
const std::string uuid = toHex(inputContext->uuid());
DICTYPE_INFO() << uuid << " committing: " << committable.value();
inputContext->commitString(committable.value());
}
that->updateUI_();
};

// Start a non-blocking gRPC streaming call to dictyped.
try {
Expand Down