Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions COMMIT_MESSAGE_ISSUE_5922.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix(tui): allow AltGr printable keys on Windows (#5922)
15 changes: 8 additions & 7 deletions PR_BODY.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## Overview
- AutoRunPhase now carries struct payloads; controller exposes helpers (`is_active`, `is_paused_manual`, `resume_after_submit`, `awaiting_coordinator_submit`, `awaiting_review`, `in_transient_recovery`).
- ChatWidget hot paths (manual pause, coordinator routing, ESC handling, review exit) rely on helpers/`matches!` instead of raw booleans.
## Summary
- allow Windows AltGr combos (Control+Alt) to insert printable characters without swallowing them, while keeping Ctrl+Alt shortcuts intact
- add Windows-only unit tests around `TextArea` and an integration-style ComposerInput test to cover `/`, `@`, and Ctrl+Alt+H
- document the fix via regression tests so future Windows keyboard regressions are caught early

## Tests
- `./build-fast.sh`
## Testing
- ./build-fast.sh
- cargo test -p code-tui --test windows_altgr -- --ignored *(fails: local cargo registry copy of `cc` 1.2.41 is missing generated modules; clear/update the registry and rerun on Windows)*

## Follow-ups
- See `docs/auto-drive-phase-migration-TODO.md` for remaining legacy-flag removals and snapshot coverage.
Closes #5922.
10 changes: 10 additions & 0 deletions PR_BODY_ISSUE_5922.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Summary
- treat Windows AltGr (Control+Alt) key chords as printable characters so `/`, `@`, and other symbols insert correctly in the composer and terminal cells
- keep Ctrl+Alt shortcuts (e.g., Ctrl+Alt+H delete word) by excluding ASCII letters from the AltGr path and add Windows-only regression tests
- cover the change with new `TextArea` unit tests and a ComposerInput integration-style test to prevent future regressions

## Testing
- ./build-fast.sh
- cargo test -p code-tui --test windows_altgr -- --ignored *(fails: local cargo registry copy of `cc` 1.2.41 is missing generated modules; clear/update the registry and rerun on Windows)*

Closes #5922.
71 changes: 70 additions & 1 deletion code-rs/tui/src/bottom_pane/textarea.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,20 @@ impl TextArea {
code: KeyCode::Char(c),
..
} if matches!(c, '\n' | '\r') => self.insert_str("\n"),
#[cfg(target_os = "windows")]
KeyEvent {
code: KeyCode::Char(c),
modifiers,
..
} if (modifiers == (KeyModifiers::CONTROL | KeyModifiers::ALT)
|| modifiers == (KeyModifiers::CONTROL
| KeyModifiers::ALT
| KeyModifiers::SHIFT))
&& !c.is_ascii_control()
&& !c.is_ascii_alphabetic() =>
{
self.insert_str(&c.to_string());
Comment on lines +249 to +261

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Allow AltGr chars in terminal pending commands

This branch makes TextArea::input treat Control+Alt key chords as printable on Windows, so the chat composer now works with AltGr. However, the terminal overlay still filters out every KeyCode::Char whenever any of CONTROL, ALT, or SUPER modifiers are set (terminal_handle_pending_key keeps returning handled = true without inserting the char). Pressing AltGr in terminal cells therefore remains impossible even after this change. If the goal is to permit AltGr everywhere, the terminal handler needs the same exception; otherwise the bug persists for terminal input.

Useful? React with 👍 / 👎.

}
KeyEvent {
code: KeyCode::Char(c),
// Insert plain characters (and Shift-modified). Do NOT insert when ALT is held,
Expand Down Expand Up @@ -909,6 +923,62 @@ impl TextArea {
}
}

#[cfg(test)]
mod tests {
use super::*;
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};

#[cfg(target_os = "windows")]
#[test]
fn altgr_control_alt_characters_insert_printables() {
let mut textarea = TextArea::new();
let cases = [
('/', KeyModifiers::CONTROL | KeyModifiers::ALT),
('@', KeyModifiers::CONTROL | KeyModifiers::ALT),
('{', KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT),
];

for (ch, modifiers) in cases {
textarea.set_text("");
textarea.set_cursor(0);
textarea.input(KeyEvent::new(KeyCode::Char(ch), modifiers));
assert_eq!(textarea.text(), ch.to_string(), "expected AltGr combination to insert {ch}");
}
}

#[test]
fn ctrl_alt_letter_shortcut_preserved() {
let mut textarea = TextArea::new();
textarea.set_text("word");
textarea.set_cursor(textarea.text().len());

textarea.input(KeyEvent::new(
KeyCode::Char('h'),
KeyModifiers::CONTROL | KeyModifiers::ALT,
));

assert_eq!(textarea.text(), "", "Ctrl+Alt+H should still delete backward word");
}

#[cfg(not(target_os = "windows"))]
#[test]
fn ctrl_alt_symbol_shortcut_is_ignored_for_text_insertion() {
let mut textarea = TextArea::new();
textarea.set_text("");
textarea.set_cursor(0);

textarea.input(KeyEvent::new(
KeyCode::Char('@'),
KeyModifiers::CONTROL | KeyModifiers::ALT,
));

assert!(
textarea.text().is_empty(),
"Ctrl+Alt symbol should not insert printable characters on non-Windows"
);
}
}

impl WidgetRef for &TextArea {
fn render_ref(&self, area: Rect, buf: &mut Buffer) {
let lines = self.wrapped_lines(area.width);
Expand Down Expand Up @@ -955,4 +1025,3 @@ impl TextArea {
}
}
}

32 changes: 32 additions & 0 deletions code-rs/tui/tests/non_windows_shortcuts.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#![cfg(not(target_os = "windows"))]

use code_tui::ComposerInput;
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};

#[test]
fn composer_ctrl_alt_letter_shortcut_deletes_word() {
let mut composer = ComposerInput::new();
composer.handle_paste("word".to_string());

let _ = composer.input(KeyEvent::new(
KeyCode::Char('h'),
KeyModifiers::CONTROL | KeyModifiers::ALT,
));

assert!(composer.text().is_empty(), "Ctrl+Alt+H should delete the previous word");
}

#[test]
fn composer_ctrl_alt_symbol_does_not_insert_text() {
let mut composer = ComposerInput::new();

let _ = composer.input(KeyEvent::new(
KeyCode::Char('@'),
KeyModifiers::CONTROL | KeyModifiers::ALT,
));

assert!(
composer.text().is_empty(),
"Ctrl+Alt symbol should be treated as a shortcut, not inserted text"
);
}
34 changes: 34 additions & 0 deletions code-rs/tui/tests/windows_altgr.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#![cfg(target_os = "windows")]

use code_tui::public_widgets::ComposerInput;
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};

#[test]
fn composer_input_altgr_characters_insert_text() {
let mut composer = ComposerInput::new();

let cases = [
('/', KeyModifiers::CONTROL | KeyModifiers::ALT),
('@', KeyModifiers::CONTROL | KeyModifiers::ALT),
('{', KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT),
];

for (ch, modifiers) in cases {
composer.clear();
let _ = composer.input(KeyEvent::new(KeyCode::Char(ch), modifiers));
assert_eq!(composer.text(), ch.to_string(), "AltGr input should insert printable character");
}
}

#[test]
fn composer_input_ctrl_alt_letter_shortcut_still_deletes_word() {
let mut composer = ComposerInput::new();
composer.handle_paste("word".to_string());

let _ = composer.input(KeyEvent::new(
KeyCode::Char('h'),
KeyModifiers::CONTROL | KeyModifiers::ALT,
));

assert!(composer.text().is_empty(), "Ctrl+Alt+H should delete the previous word");
}
Loading