Skip to content

feat: add support for macOS modifier keys #159

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
srothgan merged 3 commits into from
May 4, 2026
Merged

feat: add support for macOS modifier keys #159

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
261f0ea
feat: add support for macOS modifier keys
Apr 30, 2026
99f1701
feat: adapt history shortcuts for macOS
TomasWeisss May 3, 2026
4fc0def
fix: rework modifier key handling to global constants
TomasWeisss May 4, 2026
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
19 changes: 12 additions & 7 deletions src/app/events/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ use super::{
};
use crate::agent::model;
use crate::app::keys::reclaim_input_from_inline_prompt_if_needed;
#[cfg(test)]
use crate::app::keys::{CMD_MOD, WORD_NAV_MOD};
use crate::app::todos::apply_plan_todos;
#[cfg(test)]
use crossterm::event::KeyEvent;
Expand Down Expand Up @@ -3393,11 +3395,11 @@ mod tests {
let mut app = make_test_app();
app.input.set_text("hello world");

handle_normal_key(&mut app, KeyEvent::new(KeyCode::Backspace, KeyModifiers::CONTROL));
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Backspace, WORD_NAV_MOD));
assert_eq!(app.input.text(), "hello ");

app.input.move_home();
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Delete, KeyModifiers::CONTROL));
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Delete, WORD_NAV_MOD));
assert_eq!(app.input.text(), " ");
}

Expand All @@ -3406,13 +3408,16 @@ mod tests {
let mut app = make_test_app();
app.input.set_text("hello world");

handle_normal_key(&mut app, KeyEvent::new(KeyCode::Backspace, KeyModifiers::CONTROL));
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Backspace, WORD_NAV_MOD));
assert_eq!(app.input.text(), "hello ");

handle_normal_key(&mut app, KeyEvent::new(KeyCode::Char('z'), KeyModifiers::CONTROL));
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Char('z'), CMD_MOD));
assert_eq!(app.input.text(), "hello world");

handle_normal_key(&mut app, KeyEvent::new(KeyCode::Char('y'), KeyModifiers::CONTROL));
#[cfg(target_os = "macos")]
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Char('Z'), CMD_MOD));
#[cfg(not(target_os = "macos"))]
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Char('y'), CMD_MOD));
assert_eq!(app.input.text(), "hello ");
}

Expand All @@ -3422,10 +3427,10 @@ mod tests {
app.input.set_text("hello world");
app.input.move_home();

handle_normal_key(&mut app, KeyEvent::new(KeyCode::Right, KeyModifiers::CONTROL));
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Right, WORD_NAV_MOD));
assert!(app.input.cursor_col() > 0);

handle_normal_key(&mut app, KeyEvent::new(KeyCode::Left, KeyModifiers::CONTROL));
handle_normal_key(&mut app, KeyEvent::new(KeyCode::Left, WORD_NAV_MOD));
assert_eq!(app.input.cursor_col(), 0);
}

Expand Down
48 changes: 38 additions & 10 deletions src/app/keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ use std::time::Instant;
const HELP_TAB_PREV_KEY: KeyCode = KeyCode::Left;
const HELP_TAB_NEXT_KEY: KeyCode = KeyCode::Right;

#[cfg(target_os = "macos")]
pub(crate) const CMD_MOD: KeyModifiers = KeyModifiers::SUPER;
#[cfg(not(target_os = "macos"))]
pub(crate) const CMD_MOD: KeyModifiers = KeyModifiers::CONTROL;

#[cfg(target_os = "macos")]
pub(crate) const WORD_NAV_MOD: KeyModifiers = KeyModifiers::ALT;
#[cfg(not(target_os = "macos"))]
pub(crate) const WORD_NAV_MOD: KeyModifiers = KeyModifiers::CONTROL;

#[cfg(target_os = "macos")]
pub(crate) const WORD_NAV_MOD_EXCLUDED: KeyModifiers = KeyModifiers::empty();
#[cfg(not(target_os = "macos"))]
pub(crate) const WORD_NAV_MOD_EXCLUDED: KeyModifiers = KeyModifiers::ALT;

fn is_ctrl_shortcut(modifiers: KeyModifiers) -> bool {
modifiers.contains(KeyModifiers::CONTROL) && !modifiers.contains(KeyModifiers::ALT)
}
Expand Down Expand Up @@ -439,8 +454,21 @@ fn handle_history_key(app: &mut App, key: KeyEvent) -> bool {
return false;
}
match (key.code, key.modifiers) {
(KeyCode::Char('z'), m) if m == KeyModifiers::CONTROL => app.input.textarea_undo(),
(KeyCode::Char('y'), m) if m == KeyModifiers::CONTROL => app.input.textarea_redo(),
(KeyCode::Char('z'), m) if m == CMD_MOD => {
app.input.textarea_undo();
true
}

#[cfg(target_os = "macos")]
(KeyCode::Char('Z'), m) if m == CMD_MOD => {
app.input.textarea_redo();
true
}
#[cfg(not(target_os = "macos"))]
(KeyCode::Char('y'), m) if m == CMD_MOD => {
app.input.textarea_redo();
true
}
_ => false,
}
}
Expand All @@ -449,15 +477,15 @@ fn handle_navigation_key(app: &mut App, key: KeyEvent) -> bool {
match (key.code, key.modifiers) {
(KeyCode::Left, m)
if app.focus_owner() != FocusOwner::TodoList
&& m.contains(KeyModifiers::CONTROL)
&& !m.contains(KeyModifiers::ALT) =>
&& m.contains(WORD_NAV_MOD)
&& !m.intersects(WORD_NAV_MOD_EXCLUDED) =>
{
app.input.textarea_move_word_left()
}
(KeyCode::Right, m)
if app.focus_owner() != FocusOwner::TodoList
&& m.contains(KeyModifiers::CONTROL)
&& !m.contains(KeyModifiers::ALT) =>
&& m.contains(WORD_NAV_MOD)
&& !m.intersects(WORD_NAV_MOD_EXCLUDED) =>
{
app.input.textarea_move_word_right()
}
Expand Down Expand Up @@ -677,8 +705,8 @@ fn handle_editing_key(app: &mut App, key: KeyEvent) -> bool {
match (key.code, key.modifiers) {
(KeyCode::Backspace, m)
if app.focus_owner() != FocusOwner::TodoList
&& m.contains(KeyModifiers::CONTROL)
&& !m.contains(KeyModifiers::ALT) =>
&& m.contains(WORD_NAV_MOD)
&& !m.intersects(WORD_NAV_MOD_EXCLUDED) =>
{
reclaim_input_from_inline_prompt_if_needed(app);
if try_delete_image_badge(app, "before") {
Expand All @@ -688,8 +716,8 @@ fn handle_editing_key(app: &mut App, key: KeyEvent) -> bool {
}
(KeyCode::Delete, m)
if app.focus_owner() != FocusOwner::TodoList
&& m.contains(KeyModifiers::CONTROL)
&& !m.contains(KeyModifiers::ALT) =>
&& m.contains(WORD_NAV_MOD)
&& !m.intersects(WORD_NAV_MOD_EXCLUDED) =>
{
reclaim_input_from_inline_prompt_if_needed(app);
if try_delete_image_badge(app, "after") {
Expand Down