Skip to content

fix(gui): always process text input from char events #587

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

Open
ypsvlq wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(gui): always process text input from char events #587

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
17 changes: 10 additions & 7 deletions src/gui/wio/app.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,14 @@ fn wioLoop() void {
}) catch {};
} else {
if (input_translate.codepointFromButton(btn, .{})) |base_cp| {
// Character keys are handled by .char unless modifiers are held.
if (std.math.cast(u8, base_cp)) |ascii| {
if (std.ascii.isPrint(ascii)) {
if (!mods.alt and !mods.ctrl) {
continue;
}
}
}
const shifted_cp = if (mods.shift) input_translate.codepointFromButton(btn, .{ .shift = true }) else base_cp;
sendKey(press, base_cp, shifted_cp orelse base_cp, mods);
} else {
Expand Down Expand Up @@ -793,13 +801,8 @@ fn wioLoop() void {
}
},
.char => |cp| {
// Only handle non-ASCII IME-composed codepoints here.
// ASCII keys are fully handled by .button_press with correct
// base/shifted codepoints, avoiding double-firing on X11.
if (cp > 0x7f) {
const mods = syncModifiers();
sendKey(press, cp, cp, mods);
}
const mods = syncModifiers();
sendKey(press, cp, cp, mods);
},
.mouse => |pos| {
mouse_pos = pos;
Expand Down