1 files changed, 20 insertions, 11 deletions

diff --git a/rsnix/src/ps2.rs b/rsnix/src/ps2.rs
index 1b10b3b..8dd58a0 100644
--- a/rsnix/src/ps2.rs
+++ b/rsnix/src/ps2.rs
@@ -22,8 +22,10 @@ pub enum KeyEvent {
     Backspace,
     Tab,
     Escape,
-    CtrlC,
-    CtrlD,
+    /// Ctrl + key (e.g. Ctrl('c') = ^C, Ctrl('s') = ^S).
+    Ctrl(char),
+    /// Ctrl + arrow (0=up, 1=down, 2=left, 3=right) — word/page nav.
+    CtrlArrow(u8),
     ArrowUp,
     ArrowDown,
     ArrowLeft,
@@ -306,13 +308,14 @@ fn process_byte(byte: u8) -> Option<KeyEvent> {
                     ch.to_ascii_uppercase()
                 };
             }
-            // Ctrl+letter — the shell uses ^C (interrupt) and ^D (EOF).
+            // Ctrl+key — the terminal control-byte protocol (^C, ^D, ^S, ^X, …).
             let ctrl = state.modifiers & (MOD_LCTRL | MOD_RCTRL) != 0;
             if ctrl {
-                return match ch.to_ascii_lowercase() {
-                    b'c' => Some(KeyEvent::CtrlC),
-                    b'd' => Some(KeyEvent::CtrlD),
-                    _ => None, // swallow other Ctrl+key combinations
+                let lc = ch.to_ascii_lowercase();
+                return if lc.is_ascii_graphic() {
+                    Some(KeyEvent::Ctrl(lc as char))
+                } else {
+                    None // swallow non-graphic Ctrl combos
                 };
             }
             if ch != 0 {
@@ -334,10 +337,10 @@ fn process_e0(byte: u8) -> Option<KeyEvent> {
     update_modifiers(byte, true, true);
 
     match byte {
-        0x48 => Some(KeyEvent::ArrowUp),
-        0x50 => Some(KeyEvent::ArrowDown),
-        0x4B => Some(KeyEvent::ArrowLeft),
-        0x4D => Some(KeyEvent::ArrowRight),
+        0x48 => Some(if ctrl_held() { KeyEvent::CtrlArrow(0) } else { KeyEvent::ArrowUp }),
+        0x50 => Some(if ctrl_held() { KeyEvent::CtrlArrow(1) } else { KeyEvent::ArrowDown }),
+        0x4B => Some(if ctrl_held() { KeyEvent::CtrlArrow(2) } else { KeyEvent::ArrowLeft }),
+        0x4D => Some(if ctrl_held() { KeyEvent::CtrlArrow(3) } else { KeyEvent::ArrowRight }),
         0x47 => Some(KeyEvent::Home),
         0x4F => Some(KeyEvent::End),
         0x49 => Some(KeyEvent::PageUp),
@@ -371,3 +374,9 @@ fn set_mod(state: &mut KbdState, bit: u8, pressed: bool) {
         state.modifiers &= !bit;
     }
 }
+
+/// Is either Ctrl key held?
+fn ctrl_held() -> bool {
+    let state = unsafe { &mut KBD };
+    state.modifiers & (MOD_LCTRL | MOD_RCTRL) != 0
+}