neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add multi-cursor support to copy/cut/paste commands

Browse source
This commit is contained in:
CJ van den Berg 2024-03-11 21:37:41 +01:00
parent 8a020717f3
commit 69a6e659bd
2 changed files with 74 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/tui/editor.zig
View file

@ -1743,36 +1743,84 @@ pub const Editor = struct {
const primary = self.get_primary(); const primary = self.get_primary();
const b = self.buf_for_update() catch return; const b = self.buf_for_update() catch return;
var root = b.root; var root = b.root;
if (primary.selection) |_| {} else { if (self.cursels.items.len == 1)
const sel = primary.enable_selection(); if (primary.selection) |_| {} else {
move_cursor_begin(root, &sel.begin) catch |e| return tp.exit_error(e); const sel = primary.enable_selection();
move_cursor_end(root, &sel.end) catch |e| return tp.exit_error(e); move_cursor_begin(root, &sel.begin) catch |e| return tp.exit_error(e);
move_cursor_right(root, &sel.end) catch |e| return tp.exit_error(e); move_cursor_end(root, &sel.end) catch |e| return tp.exit_error(e);
} move_cursor_right(root, &sel.end) catch |e| return tp.exit_error(e);
const cut_text, root = self.cut_selection(root, primary) catch |e| return tp.exit_error(e); };
var first = true;
var text = std.ArrayList(u8).init(self.a);
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
const cut_text, root = self.cut_selection(root, cursel) catch |e| return tp.exit_error(e);
if (first) {
first = false;
} else {
text.appendSlice("\n") catch |e| return tp.exit_error(e);
}
text.appendSlice(cut_text) catch |e| return tp.exit_error(e);
};
self.update_buf(root) catch |e| return tp.exit_error(e); self.update_buf(root) catch |e| return tp.exit_error(e);
self.set_clipboard(cut_text); self.set_clipboard(text.items);
self.clamp(); self.clamp();
} }
pub fn copy(self: *Self, _: command.Context) tp.result { pub fn copy(self: *Self, _: command.Context) tp.result {
const primary = self.get_primary(); const root = self.buf_root() catch return;
if (primary.selection) |sel| { var first = true;
const root = self.buf_root() catch return; var text = std.ArrayList(u8).init(self.a);
const copy_text = copy_selection(root, sel, self.a) catch |e| return tp.exit_error(e); for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
if (copy_text.len > 100) { if (cursel.selection) |sel| {
self.logger.print("copy:{s}...", .{std.fmt.fmtSliceEscapeLower(copy_text[0..100])}); const copy_text = copy_selection(root, sel, self.a) catch |e| return tp.exit_error(e);
} else { if (first) {
self.logger.print("copy:{s}", .{std.fmt.fmtSliceEscapeLower(copy_text)}); first = false;
} else {
text.appendSlice("\n") catch |e| return tp.exit_error(e);
}
text.appendSlice(copy_text) catch |e| return tp.exit_error(e);
} }
self.set_clipboard(copy_text); };
if (text.items.len > 0) {
if (text.items.len > 100) {
self.logger.print("copy:{s}...", .{std.fmt.fmtSliceEscapeLower(text.items[0..100])});
} else {
self.logger.print("copy:{s}", .{std.fmt.fmtSliceEscapeLower(text.items)});
}
self.set_clipboard(text.items);
} }
} }
pub fn paste(self: *Self, _: command.Context) tp.result { pub fn paste(self: *Self, ctx: command.Context) tp.result {
if (self.clipboard) |text| { var text: []const u8 = undefined;
return self.insert_chars(command.fmt(.{text})); if (!try ctx.args.match(.{tp.extract(&text)})) {
if (self.clipboard) |text_| text = text_ else return;
} }
const b = self.buf_for_update() catch |e| return tp.exit_error(e);
var root = b.root;
if (self.cursels.items.len == 1) {
const primary = self.get_primary();
root = self.insert(root, primary, text, b.a) catch |e| return tp.exit_error(e);
} else {
if (std.mem.indexOfScalar(u8, text, '\n')) |_| {
var pos: usize = 0;
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
if (std.mem.indexOfScalarPos(u8, text, pos, '\n')) |next| {
root = self.insert(root, cursel, text[pos..next], b.a) catch |e| return tp.exit_error(e);
pos = next + 1;
} else {
root = self.insert(root, cursel, text[pos..], b.a) catch |e| return tp.exit_error(e);
pos = 0;
}
};
} else {
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
root = self.insert(root, cursel, text, b.a) catch |e| return tp.exit_error(e);
};
}
}
self.update_buf(root) catch |e| return tp.exit_error(e);
self.clamp();
} }
pub fn system_paste(_: *Self, _: command.Context) tp.result { pub fn system_paste(_: *Self, _: command.Context) tp.result {

9
src/tui/mode/input/flow.zig
View file

@ -51,9 +51,7 @@ pub fn receive(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool {
} else if (try m.match(.{"F"})) { } else if (try m.match(.{"F"})) {
try self.flush_input(); try self.flush_input();
} else if (try m.match(.{ "system_clipboard", tp.extract(&text) })) { } else if (try m.match(.{ "system_clipboard", tp.extract(&text) })) {
try self.flush_input(); try self.paste_bytes(text);
try self.insert_bytes(text);
try self.flush_input();
} }
return false; return false;
} }
@ -253,6 +251,11 @@ fn insert_bytes(self: *Self, bytes: []const u8) tp.result {
self.input.appendSlice(bytes) catch |e| return tp.exit_error(e); self.input.appendSlice(bytes) catch |e| return tp.exit_error(e);
} }
fn paste_bytes(self: *Self, bytes: []const u8) tp.result {
try self.flush_input();
try command.executeName("paste", command.fmt(.{bytes}));
}
var insert_chars_id: ?command.ID = null; var insert_chars_id: ?command.ID = null;
fn flush_input(self: *Self) tp.result { fn flush_input(self: *Self) tp.result {