Fix macOS Option character input

Author: mkrueger

crates/icy_draw/src/window_manager.rs

@@ -996,9 +996,14 @@ impl WindowManager {
                     Event::Mouse(icy_ui::mouse::Event::ButtonPressed { .. }) => Some(WindowManagerMessage::Event(window_id, event)),
                     Event::Mouse(_) => None,
                     // Keyboard events are handled below
-                    Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) => {
+                    Event::Keyboard(keyboard::Event::KeyPressed {
+                        key,
+                        modified_key,
+                        modifiers,
+                        ..
+                    }) => {
                         // Handle window manager keyboard shortcuts (Tab, Alt+Number, etc.)
-                        if let Some(action) = icy_engine_gui::handle_window_manager_keyboard_press(key, modifiers) {
+                        if let Some(action) = icy_engine_gui::handle_window_manager_keyboard_press(key, modified_key, modifiers) {
                             use icy_engine_gui::KeyboardAction;
                             return match action {
                                 KeyboardAction::FocusWindow(target_id) => Some(WindowManagerMessage::FocusWindow(target_id)),

crates/icy_engine_gui/src/ui/window_manager.rs

@@ -265,7 +265,14 @@ pub enum KeyboardAction {
 /// Window IDs: 1-9 map to windows 1-9, 0 maps to window 10.
 ///
 /// Note: Uses Alt on all platforms. On macOS, Cmd is also accepted (without Ctrl).
-pub fn handle_window_manager_keyboard_press(key: &icy_ui::keyboard::Key, modifiers: &icy_ui::keyboard::Modifiers) -> Option<KeyboardAction> {
+/// `modified_key` must include the current keyboard layout and modifiers. This
+/// prevents Option+number combinations that produce punctuation on macOS from
+/// being mistaken for window shortcuts.
+pub fn handle_window_manager_keyboard_press(
+    key: &icy_ui::keyboard::Key,
+    modified_key: &icy_ui::keyboard::Key,
+    modifiers: &icy_ui::keyboard::Modifiers,
+) -> Option<KeyboardAction> {
     use icy_ui::keyboard::key::Named;
 
     // Handle Tab / Shift+Tab for focus navigation
@@ -283,7 +290,7 @@ pub fn handle_window_manager_keyboard_press(key: &icy_ui::keyboard::Key, modifie
     let is_alt_or_cmd = modifiers.alt() || (modifiers.command() && !modifiers.control());
 
     if is_alt_or_cmd && !modifiers.shift() {
-        if let icy_ui::keyboard::Key::Character(s) = key {
+        if let icy_ui::keyboard::Key::Character(s) = modified_key {
             if let Some(digit) = s.chars().next() {
                 if digit.is_ascii_digit() {
                     let target_id = digit.to_digit(10).unwrap() as usize;
@@ -296,3 +303,34 @@ pub fn handle_window_manager_keyboard_press(key: &icy_ui::keyboard::Key, modifie
     }
     None
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{handle_window_manager_keyboard_press, KeyboardAction};
+    use icy_ui::keyboard::{Key, Modifiers};
+
+    #[test]
+    fn alt_digit_focuses_window() {
+        let key = Key::Character("5".into());
+        assert_eq!(
+            handle_window_manager_keyboard_press(&key, &key, &Modifiers::ALT),
+            Some(KeyboardAction::FocusWindow(5))
+        );
+    }
+
+    #[test]
+    fn option_generated_characters_are_not_window_shortcuts() {
+        for (unmodified, modified, modifiers) in [
+            ("5", "[", Modifiers::ALT),
+            ("6", "]", Modifiers::ALT),
+            ("7", "|", Modifiers::ALT),
+            ("8", "{", Modifiers::ALT),
+            ("9", "}", Modifiers::ALT),
+            ("7", "\\", Modifiers::ALT | Modifiers::SHIFT),
+        ] {
+            let unmodified_key = Key::Character(unmodified.into());
+            let modified_key = Key::Character(modified.into());
+            assert_eq!(handle_window_manager_keyboard_press(&unmodified_key, &modified_key, &modifiers), None);
+        }
+    }
+}

crates/icy_mail/src/ui/window_manager.rs

@@ -167,13 +167,16 @@ impl WindowManager {
             window::close_events().map(WindowManagerMessage::WindowClosed),
             icy_ui::event::listen_with(|event, status, window_id| {
                 let captured = matches!(status, icy_ui::event::Status::Captured);
-                if let Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) = &event {
+                if let Event::Keyboard(keyboard::Event::KeyPressed {
+                    key, modified_key, modifiers, ..
+                }) = &event
+                {
                     // Tab cycles our own panes unless a text widget has focus and used it.
                     let tab_owned_by_window = matches!(key, keyboard::Key::Named(keyboard::key::Named::Tab)) && !captured;
 
                     // Handle window manager keyboard shortcuts (Tab, Alt+Number, etc.)
                     if !tab_owned_by_window {
-                        if let Some(action) = handle_window_manager_keyboard_press(key, modifiers) {
+                        if let Some(action) = handle_window_manager_keyboard_press(key, modified_key, modifiers) {
                             return match action {
                                 KeyboardAction::FocusWindow(target_id) => Some(WindowManagerMessage::FocusWindow(target_id)),
                                 KeyboardAction::FocusNext => Some(WindowManagerMessage::FocusNext),

crates/icy_term/src/ui/window_manager.rs

@@ -259,9 +259,12 @@ impl WindowManager {
 
                 if !is_tab_in_terminal {
                     // Handle Alt+Number window switching
-                    if let Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) = &event {
+                    if let Event::Keyboard(keyboard::Event::KeyPressed {
+                        key, modified_key, modifiers, ..
+                    }) = &event
+                    {
                         if let Some(icy_engine_gui::KeyboardAction::FocusWindow(target_id)) =
-                            icy_engine_gui::handle_window_manager_keyboard_press(key, modifiers)
+                            icy_engine_gui::handle_window_manager_keyboard_press(key, modified_key, modifiers)
                         {
                             return Task::done(WindowManagerMessage::FocusWindow(target_id));
                         }

crates/icy_view/src/window_manager.rs

@@ -246,9 +246,11 @@ impl WindowManager {
                     // Skip other mouse events.
                     Event::Mouse(_) => None,
 
-                    Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) => {
+                    Event::Keyboard(keyboard::Event::KeyPressed {
+                        key, modified_key, modifiers, ..
+                    }) => {
                         // Handle window manager keyboard shortcuts (Tab, Alt+Number, etc.)
-                        if let Some(action) = icy_engine_gui::handle_window_manager_keyboard_press(key, modifiers) {
+                        if let Some(action) = icy_engine_gui::handle_window_manager_keyboard_press(key, modified_key, modifiers) {
                             use icy_engine_gui::KeyboardAction;
                             return match action {
                                 KeyboardAction::FocusWindow(target_id) => Some(WindowManagerMessage::FocusWindow(target_id)),