fix: arrows jumping by 2

kentucky-fried-kernel · Mar 2, 2025 · d0ab036 · d0ab036
1 parent 06a610e
commit d0ab036
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -12,8 +12,9 @@ mod terminal;
 #[unsafe(no_mangle)]
 pub extern "C" fn kernel_main() {
     if let Err(e) = ps2::init() {
-        panic!("{}", e);
+        panic!("could not initialize PS/2: {}", e);
     }
+
     arch::x86::set_gdt();
     #[allow(static_mut_refs)]
     shell::launch(unsafe { &mut SCREEN });

diff --git a/src/ps2/controller.rs b/src/ps2/controller.rs
@@ -365,9 +365,9 @@ pub fn read_if_ready() -> Option<Key> {
 
     if code == 0xE0 {
         while !is_ps2_data_available() {}
-        let extended_code = unsafe { read(DATA_PORT) };
-        unsafe { LAST_KEY = Some(extended_code) };
-        return SCANCODE_TO_KEY[extended_code as usize].1;
+        let _ = unsafe { read(DATA_PORT) };
+        unsafe { LAST_KEY = None };
+        return None;
     }
 
     unsafe { LAST_KEY = Some(code) };

diff --git a/src/ps2/scancodes.rs b/src/ps2/scancodes.rs
@@ -195,17 +195,17 @@ pub const SCANCODE_TO_KEY: [(u8, Option<Key>); 256] = [
     (0x68, None),
     (0x69, Some(N1)),
     (0x6A, None),
-    (0x6B, Some(N4)),
+    (0x6B, Some(ArrowLeft)),
     (0x6C, Some(N7)),
     (0x6D, None),
     (0x6E, None),
     (0x6F, None),
     (0x70, Some(N0)),
     (0x71, Some(Point)),
-    (0x72, Some(N2)),
+    (0x72, Some(ArrowDown)),
     (0x73, Some(N5)),
-    (0x74, Some(N6)),
-    (0x75, Some(N8)),
+    (0x74, Some(ArrowRight)),
+    (0x75, Some(ArrowUp)),
     (0x76, Some(Escape)),
     (0x77, Some(NumLock)),
     (0x78, Some(F11)),