1 files changed, 16 insertions, 6 deletions

diff --git a/src/pardes.zig b/src/pardes.zig
index 9821839f..e4645d70 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -17,6 +17,7 @@ pub const normal = @import("normal.zig");
 pub const edit = @import("edit.zig");
 pub const body_layer = @import("body_layer.zig");
 pub const Messages = @import("Messages.zig");
+pub const Registers = @import("Registers.zig");
 pub const Pipe = @import("Pipe.zig");
 pub const colors = @import("colors.zig");
 pub const Theme = colors.Theme;
@@ -453,6 +454,7 @@ test {
     _ = @import("regexp.zig");
     _ = @import("edit.zig");
     _ = @import("Messages.zig");
+    _ = @import("Registers.zig");
     _ = @import("selection_pipe.zig");
     _ = @import("Pipe.zig");
     _ = @import("colors.zig");
@@ -2326,7 +2328,7 @@ test "a host with no methods at all is a complete in-process pardes" {
     try std.testing.expectEqual(before, p.panes[0].?.terminal.?.vt.screens.active.cursor.y);
 
     // the clipboard round-trips through the in-process one
-    p.yank = try gpa.dupe(u8, "copied");
+    p.registers.put(gpa, '+', "copied", 0, 1, true);
     p.perform(.set_clipboard);
     try std.testing.expectEqualStrings("copied", p.fallback.clipboard.items);
 
@@ -4003,6 +4005,14 @@ pub const Pardes = struct {
     multi_on: bool = false,
     multi_first: bool = false,
     multi_stop: bool = false,
+    /// While a key is replayed across the ranges: which range this pass is,
+    /// in document order, and how many there are. A register value belongs
+    /// to its range by this index.
+    multi_index: usize = 0,
+    multi_count: usize = 1,
+    /// The register the running normal command names (`"<reg>`); 0 for the
+    /// default one.
+    register: u21 = 0,
     leader_on: bool = false,
     leader_keys: [4]u8 = undefined,
     leader_n: u8 = 0,
@@ -4085,7 +4095,7 @@ pub const Pardes = struct {
     in_head: usize = 0,
     in_len: usize = 0,
 
-    yank: ?[]u8 = null,
+    registers: Registers = .{},
     clip_pending: ?edit.ClipRequest = null,
     /// the last serialized dump (gpa-owned), read by the write_dump effect
     dump_out: ?[]u8 = null,
@@ -4256,7 +4266,7 @@ pub const Pardes = struct {
         const gpa = p.gpa;
         for (&p.col_tags) |*t| t.deinit(gpa);
         p.global_tag.deinit(gpa);
-        if (p.yank) |y| gpa.free(y);
+        p.registers.deinit(gpa);
         if (p.dump_out) |d| gpa.free(d);
         p.fallback.deinit();
         if (p.last_dump) |d| gpa.free(d);
@@ -4826,7 +4836,7 @@ pub const Pardes = struct {
                 }
             },
             .set_clipboard => {
-                const text = p.yank orelse "";
+                const text = p.registers.text(p.gpa, '+') orelse "";
                 if (v.set_clipboard) |f| f(p.host.ctx, text) else p.fallback.setClipboard(text);
             },
             // No desktop to ask: answer from the in-process clipboard at once,
@@ -5162,7 +5172,7 @@ pub const Pardes = struct {
                 // in it the chord is the program's -- vim's visual block,
                 // readline's quoted-insert -- and swallowing it would make
                 // Ctrl-V a black hole in every full-screen application.
-                if (p.yank) |text| return edit.typeToTty(p, p.active, pane, text);
+                if (p.registers.text(p.gpa, Registers.default)) |text| return edit.typeToTty(p, p.active, pane, text);
             }
             return panes.Terminal.forwardKey(p, p.active, key);
         }
@@ -5310,7 +5320,7 @@ pub const Pardes = struct {
         switch (t.mode) {
             .normal => normal.handleNormal(p, t, key),
             .insert => {
-                if (hit(key, config.escape)) return edit.exitInsert(p, t);
+                if (hit(key, config.escape) and !t.reg_wait) return edit.exitInsert(p, t);
                 edit.handleInsert(p, t, key);
             },
             .tty => panes.Terminal.forwardKey(p, p.active, key),