Skip to content

feat(fcitx5): 润色期间按空格直接上屏粗识别文本 #71

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
LeonardNJU merged 1 commit into from
Oct 15, 2026
Merged

feat(fcitx5): 润色期间按空格直接上屏粗识别文本 #71

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
61 changes: 57 additions & 4 deletions src/integrations/fcitx5/module/vocotype_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,21 @@ void VoCoTypeModule::handleKeyEvent(fcitx::KeyEvent &event) {
return;
}
}
// Space while polishing accepts the rough recognition as-is, waiting for
// it when the key arrives before the first recognition result. Space rather
// than Enter: a late press after the polished commit only adds a space
// instead of submitting a chat message.
if (!event.isRelease() && roughRecognitionAcceptable() &&
key.check(FcitxKey_space)) {
if (!active_polish_original_.empty()) {
commitRoughRecognition(ic, active_polish_original_);
} else {
accept_rough_requested_ = true;
showPanelMessage(ic, "⏳ 识别中，完成后直接上屏粗识别文本");
}
event.filterAndAccept();
return;
}
if ((transcription_start_pending_ || !active_polish_task_id_.empty()) &&
!event.isRelease()) {
cancelActivePolishTask();
Expand Down Expand Up @@ -1218,6 +1233,7 @@ void VoCoTypeModule::startRecording(fcitx::InputContext *ic, bool long_mode,
recording_long_mode_ = long_mode;
recording_edit_mode_ = edit_mode;
recording_edit_snapshot_ = edit_snapshot;
accept_rough_requested_ = false;
active_ic_ = ic->watch();
const uint64_t generation = ++recording_generation_;
auto output_state = recorder_output_state_;
Expand Down Expand Up @@ -1322,6 +1338,7 @@ void VoCoTypeModule::stopRecording(bool transcribe) {
const auto asr_prewarm = stopAsrPrewarm();
if (transcribe && !edit_mode) {
transcription_start_pending_ = true;
transcription_pending_long_mode_ = long_mode;
} else if (!transcribe) {
active_voice_session_id_ = 0;
}
Expand Down Expand Up @@ -1698,7 +1715,9 @@ void VoCoTypeModule::startPolishPolling(fcitx::InputContext *ic,
active_polish_started_us_ = fcitx::now(CLOCK_MONOTONIC);
polish_poll_in_flight_ = false;
polish_poll_timer_.reset();
if (ultra_minimal_panel_) {
if (accept_rough_requested_) {
// Keep the "commit rough text when ready" notice on screen.
} else if (ultra_minimal_panel_) {
startPanelAnimation(ic, PanelAnimationKind::Processing);
} else {
showPanelMessage(
Expand Down Expand Up @@ -1788,6 +1807,10 @@ void VoCoTypeModule::handlePolishPollResult(
if (!result.success) {
const std::string fallback =
polish_enabled ? active_polish_original_ : std::string();
if (accept_rough_requested_ && !fallback.empty()) {
commitRoughRecognition(ic, fallback);
return;
}
active_polish_task_id_.clear();
active_polish_enabled_ = false;
active_polish_session_id_ = 0;
Expand Down Expand Up @@ -1819,6 +1842,12 @@ void VoCoTypeModule::handlePolishPollResult(
}
}

if (accept_rough_requested_ && polish_enabled &&
!active_polish_original_.empty()) {
commitRoughRecognition(ic, active_polish_original_);
return;
}

if (result.status == "final") {
const std::string final_text =
result.final_text.empty() ? active_polish_preview_
Expand Down Expand Up @@ -1853,6 +1882,10 @@ void VoCoTypeModule::handlePolishPollResult(
? (polish_enabled ? "润色已取消" : "识别已取消")
: (polish_enabled ? "润色失败" : "识别失败"))
: result.error;
if (accept_rough_requested_ && !fallback.empty()) {
commitRoughRecognition(ic, fallback);
return;
}
active_polish_task_id_.clear();
active_polish_enabled_ = false;
active_polish_session_id_ = 0;
Expand All @@ -1866,7 +1899,7 @@ void VoCoTypeModule::handlePolishPollResult(
return;
}

if (polish_enabled && !ultra_minimal_panel_) {
if (polish_enabled && !ultra_minimal_panel_ && !accept_rough_requested_) {
showPolishProgress(ic, active_polish_preview_, active_polish_original_);
}
schedulePolishPoll(ic->watch());
Expand Down Expand Up @@ -1898,8 +1931,9 @@ void VoCoTypeModule::showPolishProgress(fcitx::InputContext *ic,
auto candidates = std::make_unique<fcitx::CommonCandidateList>();
candidates->setPageSize(2);
fcitx::Text original;
original.append(original_text.empty() ? "粗识别文本：等待识别结果..."
: "粗识别文本：" + original_text);
original.append(original_text.empty()
? "粗识别文本：等待识别结果..."
: "粗识别文本（空格采用）：" + original_text);
candidates->append<fcitx::DisplayOnlyCandidateWord>(original);
if (!preview.empty()) {
fcitx::Text preview_text;
Expand All @@ -1926,6 +1960,8 @@ void VoCoTypeModule::cancelActivePolishTask() {
}).detach();
}
transcription_start_pending_ = false;
transcription_pending_long_mode_ = false;
accept_rough_requested_ = false;
active_polish_task_id_.clear();
active_polish_enabled_ = false;
active_polish_session_id_ = 0;
Expand All @@ -1937,6 +1973,23 @@ void VoCoTypeModule::cancelActivePolishTask() {
active_ic_ = fcitx::TrackableObjectReference<fcitx::InputContext>();
}

bool VoCoTypeModule::roughRecognitionAcceptable() const {
// Includes the short PTT release grace window, before stopRecording runs.
if (is_recording_ && recording_long_mode_ && ptt_release_timer_) {
return true;
}
if (transcription_start_pending_) {
return transcription_pending_long_mode_;
}
return !active_polish_task_id_.empty() && active_polish_enabled_;
}

void VoCoTypeModule::commitRoughRecognition(fcitx::InputContext *ic,
std::string text) {
cancelActivePolishTask();
commitText(ic, text, strip_trailing_period_on_commit_);
}

void VoCoTypeModule::showPanelMessage(fcitx::InputContext *ic,
const std::string &message) {
if (!ic) {
Expand Down
5 changes: 5 additions & 0 deletions src/integrations/fcitx5/module/vocotype_module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ class VoCoTypeModule final : public fcitx::AddonInstance {
void showPolishProgress(fcitx::InputContext *ic, const std::string &preview,
const std::string &original_text);
void cancelActivePolishTask();
bool roughRecognitionAcceptable() const;
void commitRoughRecognition(fcitx::InputContext *ic, std::string text);

void armPendingRecordingStart(fcitx::InputContext *ic, bool long_mode,
bool edit_mode,
Expand Down Expand Up @@ -254,6 +256,9 @@ class VoCoTypeModule final : public fcitx::AddonInstance {
bool ptt_suppressed_ = false;
bool is_recording_ = false;
bool transcription_start_pending_ = false;
bool transcription_pending_long_mode_ = false;
// Space arrived before the rough text did; commit it as soon as it lands.
bool accept_rough_requested_ = false;
std::shared_ptr<std::atomic_bool> backend_start_pending_ =
std::make_shared<std::atomic_bool>(false);
std::shared_ptr<AsrPrewarmState> asr_prewarm_;
Expand Down