fix terminal ctrl-c with selection

Author: maxiloEmmmm

src/gui/terminal_host.rs

@@ -901,7 +901,7 @@ impl GuiTerminalHost {
 
     /// Copies selected text while skipping alacritty wide-cell spacers.
     fn override_selected_copy_text(&mut self, ui: &Ui, response: &egui::Response) -> bool {
-        if !response.has_focus() || !copy_requested(ui) {
+        if !response.has_focus() || !terminal_selection_copy_requested(ui) {
             return false;
         }
         let term = self.backend.term.lock();
@@ -1880,22 +1880,51 @@ fn enable_terminal_ime(ui: &Ui, backend: &TerminalBackend, rect: egui::Rect) {
     });
 }
 
-/// Detects copy requests so terminal selection text can be normalized.
-fn copy_requested(ui: &Ui) -> bool {
-    ui.input(|input| {
-        input.events.iter().any(|event| match event {
-            egui::Event::Copy => true,
-            egui::Event::Key {
-                key,
-                pressed: true,
-                modifiers,
-                ..
-            } => terminal_copy_key_event(*key, *modifiers),
-            _ => false,
-        })
+/// Detects copy requests that should copy terminal selection text.
+fn terminal_selection_copy_requested(ui: &Ui) -> bool {
+    ui.input(|input| terminal_selection_copy_requested_from_events(&input.events, input.modifiers))
+}
+
+/// Detects terminal-selection copy without stealing Ctrl+C interrupts.
+fn terminal_selection_copy_requested_from_events(
+    events: &[Event],
+    active_modifiers: Modifiers,
+) -> bool {
+    events.iter().any(|event| match event {
+        egui::Event::Copy => terminal_selection_copy_modifiers(active_modifiers),
+        egui::Event::Key {
+            key,
+            pressed: true,
+            modifiers,
+            ..
+        } => terminal_selection_copy_key_event(*key, *modifiers),
+        _ => false,
     })
 }
 
+/// Detects platform copy events that should copy terminal selection.
+fn terminal_selection_copy_modifiers(modifiers: Modifiers) -> bool {
+    // 触发条件：Linux/Windows 上 Ctrl+C 可同时带 command alias。
+    // 不能把它按平台 Copy 处理：终端里 Ctrl+C 的主语义是 ETX。
+    // 防止回归：有选区时 Ctrl+C 只复制、不再中断子进程。
+    if modifiers.alt {
+        return false;
+    }
+    if modifiers.ctrl {
+        return modifiers.shift && !modifiers.mac_cmd;
+    }
+    modifiers.mac_cmd || modifiers.command
+}
+
+/// Detects key copy chords that should copy terminal selection.
+fn terminal_selection_copy_key_event(key: Key, modifiers: Modifiers) -> bool {
+    terminal_copy_key_event(key, modifiers)
+        || (key == Key::C
+            && !modifiers.ctrl
+            && !modifiers.alt
+            && (modifiers.mac_cmd || modifiers.command))
+}
+
 /// Removes padding cells from the end of a copied terminal line.
 fn trim_trailing_spaces(text: &mut String) {
     let trimmed_len = text.trim_end_matches(' ').len();

src/gui/terminal_host_test.rs

@@ -200,6 +200,58 @@ fn command_copy_event_is_not_forwarded_as_interrupt_with_selection() {
     assert!(agent_input_bytes_from_events(&events, modifiers, false).is_empty());
 }
 
+/// 验证带 command alias 的 Ctrl+C 不会被当作 terminal 选区复制。
+#[test]
+fn control_c_copy_event_with_selection_keeps_interrupt_semantics() {
+    let events = vec![Event::Copy];
+    let modifiers = Modifiers {
+        ctrl: true,
+        command: true,
+        ..Modifiers::default()
+    };
+
+    assert!(!terminal_selection_copy_requested_from_events(
+        &events, modifiers
+    ));
+    assert_eq!(
+        agent_input_bytes_from_events(&events, modifiers, true),
+        b"\x03"
+    );
+}
+
+/// 验证 Ctrl+Shift+C 仍然作为明确的 terminal 选区复制手势。
+#[test]
+fn control_shift_c_copy_event_with_selection_keeps_copy_semantics() {
+    let events = vec![Event::Copy];
+    let modifiers = Modifiers {
+        ctrl: true,
+        shift: true,
+        command: true,
+        ..Modifiers::default()
+    };
+
+    assert!(terminal_selection_copy_requested_from_events(
+        &events, modifiers
+    ));
+    assert!(agent_input_bytes_from_events(&events, modifiers, false).is_empty());
+}
+
+/// 验证 macOS Cmd+C 仍然可以复制 terminal 选区。
+#[test]
+fn mac_command_c_copy_event_with_selection_keeps_copy_semantics() {
+    let events = vec![Event::Copy];
+    let modifiers = Modifiers {
+        mac_cmd: true,
+        command: true,
+        ..Modifiers::default()
+    };
+
+    assert!(terminal_selection_copy_requested_from_events(
+        &events, modifiers
+    ));
+    assert!(agent_input_bytes_from_events(&events, modifiers, false).is_empty());
+}
+
 /// Verifies that Ctrl+C survives egui's command alias on Linux and Windows.
 #[test]
 fn control_c_copy_event_with_command_alias_is_forwarded_as_interrupt() {