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

fix: fully deinit keybind.Mode to avoid race when switching modes

Browse source
This commit is contained in:
CJ van den Berg 2025-11-05 16:39:35 +01:00
parent 983e518f69
commit 8b50c7a3af
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/keybind/keybind.zig
View file

@ -100,7 +100,7 @@ const Handler = struct {
pub const Mode = struct { pub const Mode = struct {
allocator: std.mem.Allocator, allocator: std.mem.Allocator,
input_handler: EventHandler, input_handler: ?EventHandler,
event_handler: ?EventHandler = null, event_handler: ?EventHandler = null,
mode: []const u8, mode: []const u8,
@ -121,11 +121,24 @@ pub const Mode = struct {
} }
pub fn deinit(self: *Mode) void { pub fn deinit(self: *Mode) void {
if (self.deinit_command) |deinit_command| if (self.deinit_command) |deinit_command| deinit_command.execute_const();
deinit_command.execute_const();
self.allocator.free(self.mode);
self.input_handler.deinit();
if (self.event_handler) |eh| eh.deinit(); if (self.event_handler) |eh| eh.deinit();
if (self.input_handler) |ih| ih.deinit();
self.allocator.free(self.mode);
self.deinit_command = null;
self.event_handler = null;
self.input_handler = null;
self.mode = &.{};
self.name = "";
self.line_numbers = .inherit;
self.keybind_hints = &.{};
self.cursor_shape = null;
self.selection_style = .normal;
self.init_command = null;
self.deinit_command = null;
self.initialized = false;
} }
}; };

6
src/tui/tui.zig
View file

@ -554,7 +554,7 @@ fn active_event_handler(self: *Self) ?EventHandler {
fn dispatch_flush_input_event(self: *Self) error{ Exit, NoSpaceLeft }!void { fn dispatch_flush_input_event(self: *Self) error{ Exit, NoSpaceLeft }!void {
var buf: [32]u8 = undefined; var buf: [32]u8 = undefined;
const mode = self.input_mode_ orelse return; const mode = self.input_mode_ orelse return;
try mode.input_handler.send(tp.self_pid(), try tp.message.fmtbuf(&buf, .{"F"})); if (mode.input_handler) |ih| try ih.send(tp.self_pid(), try tp.message.fmtbuf(&buf, .{"F"}));
if (mode.event_handler) |eh| try eh.send(tp.self_pid(), try tp.message.fmtbuf(&buf, .{"F"})); if (mode.event_handler) |eh| try eh.send(tp.self_pid(), try tp.message.fmtbuf(&buf, .{"F"}));
} }
@ -577,8 +577,8 @@ fn dispatch_input(ctx: *anyopaque, cbor_msg: []const u8) void {
break :ret false; break :ret false;
}) })
return; return;
if (self.input_mode_) |mode| if (self.input_mode_) |mode| if (mode.input_handler) |ih|
mode.input_handler.send(from, m) catch |e| self.logger.err("input handler", e); ih.send(from, m) catch |e| self.logger.err("input handler", e);
} }
fn dispatch_mouse(ctx: *anyopaque, y: c_int, x: c_int, cbor_msg: []const u8) void { fn dispatch_mouse(ctx: *anyopaque, y: c_int, x: c_int, cbor_msg: []const u8) void {