1 files changed, 6 insertions, 144 deletions

diff --git a/src/Editor.zig b/src/Editor.zig
index 4b563ad..99ec932 100644
--- a/src/Editor.zig
+++ b/src/Editor.zig
@@ -6,6 +6,7 @@ const ArrayList = std.ArrayList;
 const Buffer = es.Buffer;
 const Editor = @This();
 const Key = es.Key;
+const KeyReader = es.KeyReader;
 const KeyState = es.key_state.KeyState;
 const StringBuilder = es.StringBuilder;
 const StringHashMap = std.StringHashMap;
@@ -23,7 +24,7 @@ statusmsg_time: i64,
 
 current_state: KeyState,
 
-key_buffer: ArrayList(Key),
+key_reader: KeyReader,
 should_exit: bool,
 
 pub fn init(allocator: Allocator) !Editor {
@@ -41,7 +42,7 @@ pub fn init(allocator: Allocator) !Editor {
 
         .current_state = es.key_state.defaultState,
 
-        .key_buffer = ArrayList(Key).init(allocator),
+        .key_reader = KeyReader.init(allocator),
         .should_exit = false,
     };
     errdefer self.deinit();
@@ -66,7 +67,7 @@ pub fn deinit(self: *Editor) void {
         self.allocator.free(statusmsg);
     }
 
-    self.key_buffer.deinit();
+    self.key_reader.deinit();
 
     self.* = undefined;
 }
@@ -195,7 +196,7 @@ pub fn openFile(self: *Editor) !void {
 }
 
 pub fn processKeypress(self: *Editor) !void {
-    const key = try self.readKey();
+    const key = try self.key_reader.readKey();
     try self.current_state(self, self.buffer, key);
 }
 
@@ -220,7 +221,7 @@ pub fn promptEx(
 
         // TODO: Navigation
         // TODO: Draw the cursor
-        const key = try self.readKey();
+        const key = try self.key_reader.readKey();
         switch (key) {
             Key.delete, Key.backspace => _ = buf.popOrNull(),
             Key.ctrl('g') => {
@@ -430,142 +431,3 @@ fn parseUnsignedOptDefault(comptime T: type, buf_opt: ?[]const u8, radix: u8, de
         return default;
     }
 }
-
-fn readByte(reader: std.fs.File) !?u8 {
-    var buf = [_]u8{undefined};
-    if (1 != try reader.read(&buf)) {
-        return null;
-    } else {
-        return buf[0];
-    }
-}
-
-fn readByteBlocking(reader: std.fs.File) !u8 {
-    // No we do not care about possible EOF on stdin, don't run the editor with redirected stdin.
-    var char = try readByte(reader);
-    while (char == null) : (char = try readByte(reader)) {
-        std.os.sched_yield() catch {}; // :)
-    }
-
-    return char.?;
-}
-
-fn readKey(self: *Editor) !Key {
-    if (self.key_buffer.items.len > 0) {
-        return self.key_buffer.pop();
-    }
-
-    const std_in = std.io.getStdIn();
-
-    const char1 = try readByteBlocking(std_in);
-    if (char1 != '\x1b') {
-        return Key.char(char1);
-    }
-
-    // TODO: This is a bad way of parsing.
-    const char2 = (try readByte(std_in)) orelse { return Key.escape; };
-    if (char2 == '[') {
-        const char3 = (try readByte(std_in)) orelse { return Key.meta('['); };
-        if (char3 >= '0' and char3 <= '9') {
-            const char4 = (try readByte(std_in)) orelse {
-                std.log.err("Unknown terminal sequence '^[[{c}'", .{char3});
-                try self.key_buffer.append(Key.char(char3));
-                return Key.meta('[');
-            };
-
-            if (char4 == '~') {
-                return switch (char3) {
-                    '1' => Key.home,
-                    '3' => Key.delete,
-                    '4' => Key.end,
-                    '5' => Key.page_up,
-                    '6' => Key.page_down,
-                    '7' => Key.home,
-                    '8' => Key.end,
-                    else => {
-                        std.log.err("Unknown terminal sequence '^[[{c}~'", .{char3});
-                        try self.key_buffer.append(Key.char('~'));
-                        try self.key_buffer.append(Key.char(char3));
-                        return Key.meta('[');
-                    },
-                };
-            } else if (char4 == ';' and char3 == '1') {
-                const char5 = (try readByte(std_in)) orelse {
-                    std.log.err("Unknown terminal sequence '^[[1;'", .{});
-                    try self.key_buffer.append(Key.char(';'));
-                    try self.key_buffer.append(Key.char('1'));
-                    return Key.meta('[');
-                };
-
-                if (char5 == '5') {
-                    const char6 = (try readByte(std_in)) orelse {
-                        std.log.err("Unknown terminal sequence '^[[1;5'", .{});
-                        try self.key_buffer.append(Key.char('5'));
-                        try self.key_buffer.append(Key.char(';'));
-                        try self.key_buffer.append(Key.char('1'));
-                        return Key.meta('[');
-                    };
-
-                    return switch (char6) {
-                        'A' => Key.ctrl_up,
-                        'B' => Key.ctrl_down,
-                        'C' => Key.ctrl_right,
-                        'D' => Key.ctrl_left,
-                        'F' => Key.ctrl_end,
-                        'H' => Key.ctrl_home,
-                        else => {
-                            std.log.err("Unknown terminal sequence '^[[1;5{c}'", .{char6});
-                            try self.key_buffer.append(Key.char(char6));
-                            try self.key_buffer.append(Key.char('5'));
-                            try self.key_buffer.append(Key.char(';'));
-                            try self.key_buffer.append(Key.char('1'));
-                            return Key.meta('[');
-                        },
-                    };
-                } else {
-                    std.log.err("Unknown terminal sequence '^[[1;{c}'", .{char5});
-                    try self.key_buffer.append(Key.char(char5));
-                    try self.key_buffer.append(Key.char(';'));
-                    try self.key_buffer.append(Key.char('1'));
-                    return Key.meta('[');
-                }
-            } else {
-                std.log.err("Unknown terminal sequence '^[[{c}{c}'", .{char3, char4});
-                try self.key_buffer.append(Key.char(char4));
-                try self.key_buffer.append(Key.char(char3));
-                return Key.meta('[');
-            }
-        } else {
-            return switch (char3) {
-                'A' => Key.up,
-                'B' => Key.down,
-                'C' => Key.right,
-                'D' => Key.left,
-                'F' => Key.end,
-                'H' => Key.home,
-                else => {
-                    std.log.err("Unknown terminal sequence '^[[{c}'", .{char3});
-                    try self.key_buffer.append(Key.char(char3));
-                    return Key.meta('[');
-                },
-            };
-        }
-    } else if (char2 == 'O') {
-        const char3 = (try readByte(std_in)) orelse { return Key.meta('O'); };
-        return switch (char3) {
-            'F' => Key.end,
-            'H' => Key.home,
-            else => {
-                std.log.err("Unknown terminal sequence '^[O{c}'", .{char3});
-                try self.key_buffer.append(Key.char(char3));
-                return Key.meta('O');
-            },
-        };
-    } else {
-        return Key.meta(char2);
-    }
-}
-// C-<page up>   = ^[[5;5~
-// C-<page down> = ^[[6;5
-
-// S- adds ;2, M- adds ;3, S-M- adds ;4, C- adds ;5, S-C- adds ;6, M-C- adds ;7, S-M-C- adds ;8