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

fix(vaxis): prevent a crash on large bracketed paste operations

Browse source 
Now we just serialize *all* event data and drop the grapheme cache
that was overflowing.
This commit is contained in:
CJ van den Berg 2024-06-19 17:39:27 +02:00
parent 0dd9cb179e
commit 866451779b
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/renderer/vaxis/renderer.zig
View file

@ -143,7 +143,7 @@ pub fn leave_alternate_screen(self: *Self) void {
self.vx.exitAltScreen() catch {}; self.vx.exitAltScreen() catch {};
} }
pub fn process_input_event(self: *Self, input_: []const u8) !void { pub fn process_input_event(self: *Self, input_: []const u8, text: ?[]const u8) !void {
const event = std.mem.bytesAsValue(vaxis.Event, input_); const event = std.mem.bytesAsValue(vaxis.Event, input_);
switch (event.*) { switch (event.*) {
.key_press => |key__| { .key_press => |key__| {
@ -154,7 +154,7 @@ pub fn process_input_event(self: *Self, input_: []const u8) !void {
event_type.PRESS, event_type.PRESS,
key_.codepoint, key_.codepoint,
key_.shifted_codepoint orelse key_.codepoint, key_.shifted_codepoint orelse key_.codepoint,
key_.text orelse input.utils.key_id_string(key_.base_layout_codepoint orelse key_.codepoint), text orelse input.utils.key_id_string(key_.base_layout_codepoint orelse key_.codepoint),
@as(u8, @bitCast(key_.mods)), @as(u8, @bitCast(key_.mods)),
}); });
if (self.bracketed_paste and self.handle_bracketed_paste_input(cbor_msg) catch |e| { if (self.bracketed_paste and self.handle_bracketed_paste_input(cbor_msg) catch |e| {
@ -170,7 +170,7 @@ pub fn process_input_event(self: *Self, input_: []const u8) !void {
event_type.RELEASE, event_type.RELEASE,
key_.codepoint, key_.codepoint,
key_.shifted_codepoint orelse key_.codepoint, key_.shifted_codepoint orelse key_.codepoint,
key_.text orelse input.utils.key_id_string(key_.base_layout_codepoint orelse key_.codepoint), text orelse input.utils.key_id_string(key_.base_layout_codepoint orelse key_.codepoint),
@as(u8, @bitCast(key_.mods)), @as(u8, @bitCast(key_.mods)),
}); });
if (self.bracketed_paste) {} else if (self.dispatch_input) |f| f(self.handler_ctx, cbor_msg); if (self.bracketed_paste) {} else if (self.dispatch_input) |f| f(self.handler_ctx, cbor_msg);
@ -230,8 +230,7 @@ pub fn process_input_event(self: *Self, input_: []const u8) !void {
self.bracketed_paste_buffer.clearRetainingCapacity(); self.bracketed_paste_buffer.clearRetainingCapacity();
}, },
.paste_end => try self.handle_bracketed_paste_end(), .paste_end => try self.handle_bracketed_paste_end(),
.paste => |text| { .paste => |_| {
defer self.a.free(text);
if (self.dispatch_event) |f| f(self.handler_ctx, try self.fmtmsg(.{ "system_clipboard", text })); if (self.dispatch_event) |f| f(self.handler_ctx, try self.fmtmsg(.{ "system_clipboard", text }));
}, },
.color_report => {}, .color_report => {},
@ -388,7 +387,6 @@ const Loop = struct {
thread: ?std.Thread = null, thread: ?std.Thread = null,
should_quit: bool = false, should_quit: bool = false,
cache: vaxis.GraphemeCache = .{},
const tp = @import("thespian"); const tp = @import("thespian");
@ -424,20 +422,24 @@ const Loop = struct {
} }
fn postEvent(self: *Loop, event: vaxis.Event) void { fn postEvent(self: *Loop, event: vaxis.Event) void {
var text: []const u8 = "";
var free_text: bool = false;
switch (event) { switch (event) {
.key_press => |key_| { .key_press => |key_| {
var mut_key = key_; if (key_.text) |text_| text = text_;
if (key_.text) |text|
mut_key.text = self.cache.put(text);
}, },
.key_release => |key_| { .key_release => |key_| {
var mut_key = key_; if (key_.text) |text_| text = text_;
if (key_.text) |text| },
mut_key.text = self.cache.put(text); .paste => |text_| {
text = text_;
free_text = true;
}, },
else => {}, else => {},
} }
self.pid.send(.{ "VXS", std.mem.asBytes(&event) }) catch @panic("send VXS event failed"); self.pid.send(.{ "VXS", std.mem.asBytes(&event), text }) catch @panic("send VXS event failed");
if (free_text)
self.vaxis.opts.system_clipboard_allocator.?.free(text);
} }
fn ttyRun(self: *Loop) !void { fn ttyRun(self: *Loop) !void {
@ -481,6 +483,7 @@ const Loop = struct {
need_read = true; need_read = true;
continue; continue;
} }
if (result.event) |event| self.postEvent(event);
if (result.n < n) { if (result.n < n) {
const buf_move = try a.alloc(u8, buf.len); const buf_move = try a.alloc(u8, buf.len);
@memcpy(buf_move[0 .. n - result.n], buf[result.n..n]); @memcpy(buf_move[0 .. n - result.n], buf[result.n..n]);
@ -490,8 +493,6 @@ const Loop = struct {
} else { } else {
n = 0; n = 0;
} }
const event = result.event orelse continue;
self.postEvent(event);
} }
}, },
} }

5
src/tui/tui.zig
View file

@ -179,8 +179,9 @@ fn receive(self: *Self, from: tp.pid_ref, m: tp.message) tp.result {
fn receive_safe(self: *Self, from: tp.pid_ref, m: tp.message) tp.result { fn receive_safe(self: *Self, from: tp.pid_ref, m: tp.message) tp.result {
var input: []const u8 = undefined; var input: []const u8 = undefined;
if (try m.match(.{ "VXS", tp.extract(&input) })) { var text: []const u8 = undefined;
self.rdr.process_input_event(input) catch |e| return tp.exit_error(e); if (try m.match(.{ "VXS", tp.extract(&input), tp.extract(&text) })) {
self.rdr.process_input_event(input, if (text.len > 0) text else null) catch |e| return tp.exit_error(e);
try self.dispatch_flush_input_event(); try self.dispatch_flush_input_event();
if (self.unrendered_input_events_count > 0 and !self.frame_clock_running) if (self.unrendered_input_events_count > 0 and !self.frame_clock_running)
need_render(); need_render();