Skip to content

fix(tui): Windows Alt/AltGr punctuation and “?” overlay #4702

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
wants to merge 3 commits into
base: main
Choose a base branch
from
+1,852 −1,829
Open

fix(tui): Windows Alt/AltGr punctuation and “?” overlay #4702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f647a3d
fix(tui): allow Alt/AltGr punctuation to insert; preserve Ctrl+Alt+h …
esdrasrenan Oct 4, 2025
439d35b
Merge branch 'main' into fix/windows-punct-input
esdrasrenan Oct 4, 2025
d266a8f
Merge branch 'main' into fix/windows-punct-input
esdrasrenan Oct 7, 2025
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
44 changes: 30 additions & 14 deletions codex-rs/tui/src/bottom_pane/chat_composer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,14 +1312,30 @@ impl ChatComposer {
return false;
}

let toggles = matches!(
key_event,
KeyEvent {
code: KeyCode::Char('?'),
modifiers: KeyModifiers::NONE,
..
} if self.is_empty()
);
// Toggle shortcut overlay on '?' when the composer is empty.
// Accept with or without Shift, but ignore Ctrl/Alt combos so we don't
// steal editor/navigation chords. This keeps Windows consoles (which
// sometimes omit Shift on punctuation) working while still letting
// users type '?' normally when there's text.
let toggles = if self.is_empty() {
match key_event {
KeyEvent {
code: KeyCode::Char('?'),
modifiers,
..
} => {
let is_altgr = modifiers.contains(KeyModifiers::ALT)
&& modifiers.contains(KeyModifiers::CONTROL);
// Accept plain '?' or AltGr+'?' (common on Windows international layouts).
!modifiers.contains(KeyModifiers::ALT)
&& !modifiers.contains(KeyModifiers::CONTROL)
|| is_altgr
}
_ => false,
}
} else {
false
};

if !toggles {
return false;
Expand Down Expand Up @@ -1713,7 +1729,7 @@ mod tests {
snapshot_composer_state("footer_mode_shortcut_overlay", true, |composer| {
composer.set_esc_backtrack_hint(true);
let _ =
composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::SHIFT));
});

snapshot_composer_state("footer_mode_ctrl_c_quit", true, |composer| {
Expand All @@ -1732,7 +1748,7 @@ mod tests {

snapshot_composer_state("footer_mode_esc_hint_from_overlay", true, |composer| {
let _ =
composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::SHIFT));
let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
});

Expand All @@ -1746,7 +1762,7 @@ mod tests {
true,
|composer| {
let _ = composer
.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::SHIFT));
composer.set_esc_backtrack_hint(true);
},
);
Expand All @@ -1773,13 +1789,13 @@ mod tests {
);

let (result, needs_redraw) =
composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::SHIFT));
assert_eq!(result, InputResult::None);
assert!(needs_redraw, "toggling overlay should request redraw");
assert_eq!(composer.footer_mode, FooterMode::ShortcutOverlay);

// Toggle back to prompt mode so subsequent typing captures characters.
let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::SHIFT));
assert_eq!(composer.footer_mode, FooterMode::ShortcutPrompt);

type_chars_humanlike(&mut composer, &['h']);
Expand Down Expand Up @@ -1813,7 +1829,7 @@ mod tests {
false,
);

let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::SHIFT));
assert_eq!(composer.footer_mode, FooterMode::ShortcutOverlay);

composer.set_task_running(true);
Expand Down
Loading