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

fix: improve delayed initialization of input modes

Browse source 
Input modes are not loaded immediately on startup. There is a very
short delay. During this time all input is just dropped. This is to
make sure that the input buffer is flushed of any rubbish left over
from the previous application.

This commit fixes delayed initialization in cases where an input mode
is switched immediately on startup. For example when the home screen
loads.
This commit is contained in:
CJ van den Berg 2024-11-15 22:26:15 +01:00
parent f016277621
commit 376d14353a
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tui/tui.zig
View file

@ -28,7 +28,9 @@ frame_last_time: i64 = 0,
receiver: Receiver, receiver: Receiver,
mainview: Widget, mainview: Widget,
message_filters: MessageFilter.List, message_filters: MessageFilter.List,
input_mode: ?Mode, input_mode: ?Mode = null,
delayed_init_done: bool = false,
delayed_init_input_mode: ?[]const u8 = null,
input_mode_outer: ?Mode = null, input_mode_outer: ?Mode = null,
input_listeners: EventHandler.List, input_listeners: EventHandler.List,
keyboard_focus: ?Widget = null, keyboard_focus: ?Widget = null,
@ -106,7 +108,6 @@ fn init(allocator: Allocator) !*Self {
.receiver = Receiver.init(receive, self), .receiver = Receiver.init(receive, self),
.mainview = undefined, .mainview = undefined,
.message_filters = MessageFilter.List.init(allocator), .message_filters = MessageFilter.List.init(allocator),
.input_mode = null,
.input_listeners = EventHandler.List.init(allocator), .input_listeners = EventHandler.List.init(allocator),
.logger = log.logger("tui"), .logger = log.logger("tui"),
.init_timer = try tp.timeout.init_ms(init_delay, tp.message.fmt(.{"init"})), .init_timer = try tp.timeout.init_ms(init_delay, tp.message.fmt(.{"init"})),
@ -148,7 +149,12 @@ fn init(allocator: Allocator) !*Self {
} }
fn init_delayed(self: *Self) !void { fn init_delayed(self: *Self) !void {
if (self.input_mode) |_| {} else return cmds.enter_mode(self, command.Context.fmt(.{self.config.input_mode})); self.delayed_init_done = true;
if (self.input_mode) |_| {} else {
return cmds.enter_mode(self, command.Context.fmt(.{
self.delayed_init_input_mode orelse self.config.input_mode,
}));
}
} }
fn deinit(self: *Self) void { fn deinit(self: *Self) void {
@ -163,6 +169,7 @@ fn deinit(self: *Self) void {
self.keepalive_timer = null; self.keepalive_timer = null;
} }
if (self.input_mode) |*m| m.deinit(); if (self.input_mode) |*m| m.deinit();
if (self.delayed_init_input_mode) |mode| self.allocator.free(mode);
self.commands.deinit(); self.commands.deinit();
self.mainview.deinit(self.allocator); self.mainview.deinit(self.allocator);
self.message_filters.deinit(); self.message_filters.deinit();
@ -660,6 +667,10 @@ const cmds = struct {
var mode: []const u8 = undefined; var mode: []const u8 = undefined;
if (!try ctx.args.match(.{tp.extract(&mode)})) if (!try ctx.args.match(.{tp.extract(&mode)}))
return tp.exit_error(error.InvalidArgument, null); return tp.exit_error(error.InvalidArgument, null);
if (!self.delayed_init_done) {
self.delayed_init_input_mode = try self.allocator.dupe(u8, mode);
return;
}
if (self.mini_mode) |_| try exit_mini_mode(self, .{}); if (self.mini_mode) |_| try exit_mini_mode(self, .{});
if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{}); if (self.input_mode_outer) |_| try exit_overlay_mode(self, .{});
if (self.input_mode) |*m| m.deinit(); if (self.input_mode) |*m| m.deinit();