vndangkhoa/vietc
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

fix: non-grabbing mode double-injection — extra backspace for control keys on screen
Some checks are pending
Build & Release / Build & test (push) Waiting to run
Details
Build & Release / Build .deb (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
Khoa Vo 2026-07-01 13:34:11 +07:00
parent 7fe03b7f44
commit 82d0796059
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
daemon/src/main.rs
View file

@ -1205,7 +1205,11 @@ fn run_with_evdev(
} }
if !grabbed { if !grabbed {
// Legacy mode: only forward to engine on press events // Legacy mode: only forward to engine on press events.
// Raw keystrokes reach the application BEFORE the daemon
// can correct them, so VNI/Telex control keys (1-9, f,s,r,...)
// appear on screen as literal characters. We must account
// for this by adding one extra backspace for control keys.
if value != 1 { if value != 1 {
continue; continue;
} }
@ -1213,7 +1217,22 @@ fn run_with_evdev(
continue; continue;
} }
if let Some(ch) = key_to_char(key) { if let Some(ch) = key_to_char(key) {
let commands = daemon.process_key(ch); let mut commands = daemon.process_key(ch);
// In non-grabbing mode, VNI/Telex control keys (1-9, f,s,r,x,j)
// reach the application as literal characters before the daemon
// can inject corrections. Add one extra backspace to remove
// the control character from the screen.
if !commands.is_empty()
&& is_vn_control_key(&daemon.config.input_method, ch)
{
// Find and increment the first Backspace command
for cmd in &mut commands {
if let OutputCommand::Backspace(ref mut n) = cmd {
*n += 1;
break;
}
}
}
execute_commands(&*injector, &commands, false); execute_commands(&*injector, &commands, false);
} }
} else { } else {