Rename to Ubik and start keyboard

README.md

@@ -1,5 +1,5 @@
-# Système 9
-an operating system made with zig using Ubik as its kernel
+# Ubik
+a kernel made with zig
 
 # TODO
 - use flanterm
@@ -9,7 +9,7 @@ an operating system made with zig using Ubik as its kernel
 
 ### clone
 
-    git clone https://github.com/ratakor/os --recursive
+    git clone https://github.com/ratakor/ubik --recursive
 
 ### build
 Make sure to have `xorriso` and run

build.zig

@@ -68,7 +68,7 @@ pub fn build(b: *std.Build) void {
     b.installArtifact(kernel);
 
     const image_name = std.mem.concat(b.allocator, u8, &.{
-        "système-9-", @tagName(kernel.target.cpu_arch.?), ".iso"
+        "ubik-", @tagName(kernel.target.cpu_arch.?), ".iso"
     }) catch unreachable;
     const image_step = b.step("image", "Build the image");
     const image_cmd = buildImage(b, image_name);

build.zig.zon

@@ -1,5 +1,5 @@
 .{
-    .name = "système-9",
+    .name = "ubik",
     .version = "0.1.0",
     .dependencies = .{
         .limine = .{

kernel/Terminal.zig

@@ -1531,7 +1531,7 @@ fn putChar(self: *Context, c: u8) void {
             return;
         },
         control_code.bs => {
-            self.setCursorPos(x - 1, y);
+            self.setCursorPos(x -| 1, y);
             return;
         },
         control_code.cr => {

kernel/keyboard.zig

@@ -0,0 +1,94 @@
+// TODO: ugly and doesn't work well
+
+const ps2 = @import("ps2.zig");
+
+const Key = enum {
+    bad,
+    escape,
+    @"1",
+    @"2",
+    @"3",
+    @"4",
+    @"5",
+    @"6",
+    @"7",
+    @"8",
+    @"9",
+    @"0",
+    @"-",
+    @"=",
+    backspace,
+    tab,
+    q,
+    w,
+    e,
+    r,
+    t,
+    y,
+    u,
+    i,
+    o,
+    p,
+    @"[",
+    @"]",
+    enter,
+    left_ctrl,
+    a,
+    s,
+    d,
+    f,
+    g,
+    h,
+    j,
+    k,
+    l,
+    @";",
+    @"'",
+    @"`",
+    left_shift,
+    @"\\",
+    z,
+    x,
+    c,
+    v,
+    @".",
+    @"/",
+    right_shift,
+    keypad_star,
+    left_alt,
+    space,
+    caps_lock,
+    F1,
+    F2,
+    F3,
+    F4,
+    F5,
+    F6,
+    F7,
+    F8,
+    F9,
+    F10,
+    nums_lock,
+    scroll_lock,
+    keypad_7,
+    keypad_8,
+    keypad_9,
+    keypad_minus,
+    keypad_4,
+    keypad_5,
+    keypad_6,
+    keypad_plus,
+    keypad_1,
+    keypad_2,
+    keypad_3,
+    keypad_0,
+    keypad_dot,
+    F11,
+    F12,
+};
+
+pub fn readKey() Key {
+    const key = ps2.read();
+    if (key > @intFromEnum(Key.F12)) return .bad;
+    return @enumFromInt(key);
+}

kernel/main.zig

@@ -9,6 +9,7 @@ const pmm = @import("pmm.zig");
 const vmm = @import("vmm.zig");
 const mem = @import("mem.zig");
 const time = @import("time.zig");
+const keyboard = @import("keyboard.zig");
 
 pub const std_options = struct {
     pub const logFn = debug.log;
@@ -102,6 +103,22 @@ fn main() !void {
     defer pmm.free(buf);
     tty.print("allocated a buffer of size {} and address = {*}\n", .{ buf.len, buf.ptr });
 
+    while (true) {
+        const key = keyboard.readKey();
+        switch (key) {
+            .bad => {},
+            .escape => break,
+            .backspace => {
+                tty.write(&[1]u8{std.ascii.control_code.bs});
+                tty.clearFromCursorToLineEnd();
+            },
+            .tab => tty.write(&[1]u8{std.ascii.control_code.ht}),
+            .enter => tty.write(&[1]u8{std.ascii.control_code.lf}),
+            .space => tty.write(" "),
+            else => tty.write(@tagName(key)),
+        }
+    }
+
     asm volatile ("sti");
     @breakpoint();
 }

limine.cfg

@@ -1,6 +1,6 @@
 TIMEOUT=0
 
-:Système 9 ${ARCH}
+:Ubik ${ARCH}
     PROTOCOL=limine
     KERNEL_PATH=boot:///kernel.elf
     KASLR=no