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

refactor: process terminal mode keybindings

Browse source
This commit is contained in:
CJ van den Berg 2026-02-24 23:17:21 +01:00
parent 3d81631679
commit 341c652333
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/tui/terminal_view.zig
View file

@ -13,6 +13,8 @@ const WidgetList = @import("WidgetList.zig");
const MessageFilter = @import("MessageFilter.zig"); const MessageFilter = @import("MessageFilter.zig");
const tui = @import("tui.zig"); const tui = @import("tui.zig");
const input = @import("input"); const input = @import("input");
const keybind = @import("keybind");
pub const Mode = keybind.Mode;
pub const name = @typeName(Self); pub const name = @typeName(Self);
@ -30,6 +32,7 @@ pty_pid: ?tp.pid = null,
focused: bool = false, focused: bool = false,
cwd: std.ArrayListUnmanaged(u8) = .empty, cwd: std.ArrayListUnmanaged(u8) = .empty,
title: std.ArrayListUnmanaged(u8) = .empty, title: std.ArrayListUnmanaged(u8) = .empty,
input_mode: Mode,
pub fn create(allocator: Allocator, parent: Plane) !Widget { pub fn create(allocator: Allocator, parent: Plane) !Widget {
return create_with_args(allocator, parent, .{}); return create_with_args(allocator, parent, .{});
@ -107,6 +110,7 @@ pub fn create_with_args(allocator: Allocator, parent: Plane, ctx: command.Contex
.env = env, .env = env,
.write_buf = undefined, // managed via self.vt's pty_writer pointer .write_buf = undefined, // managed via self.vt's pty_writer pointer
.pty_pid = null, .pty_pid = null,
.input_mode = try keybind.mode("terminal", allocator, .{}),
}; };
try self.vt.spawn(); try self.vt.spawn();
@ -121,25 +125,38 @@ pub fn create_with_args(allocator: Allocator, parent: Plane, ctx: command.Contex
return container.widget(); return container.widget();
} }
pub fn receive(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool { pub fn receive(self: *Self, from: tp.pid_ref, m: tp.message) error{Exit}!bool {
if (try m.match(.{ "terminal_view", "output" })) { if (try m.match(.{ "terminal_view", "output" })) {
tui.need_render(@src()); tui.need_render(@src());
return true; return true;
} } else if (!(try m.match(.{ "I", tp.more })
if (!self.focused) return false; // or
var evtype: u8 = 0; // try m.match(.{ "B", tp.more }) or
var keycode: u21 = 0; // try m.match(.{ "D", tp.more }) or
var shifted: u21 = 0; // try m.match(.{ "M", tp.more })
var text: []const u8 = ""; ))
var mods: u8 = 0;
if (!(try m.match(.{ "I", tp.extract(&evtype), tp.extract(&keycode), tp.extract(&shifted), tp.extract(&text), tp.extract(&mods) })))
return false; return false;
if (!self.focused) return false;
if (try self.input_mode.bindings.receive(from, m))
return true;
var event: input.Event = 0;
var keypress: input.Key = 0;
var keypress_shifted: input.Key = 0;
var text: []const u8 = "";
var modifiers: u8 = 0;
if (!try m.match(.{ "I", tp.extract(&event), tp.extract(&keypress), tp.extract(&keypress_shifted), tp.extract(&text), tp.extract(&modifiers) }))
return false;
// Only forward press and repeat events; ignore releases. // Only forward press and repeat events; ignore releases.
if (evtype != input.event.press and evtype != input.event.repeat) return true; if (event != input.event.press and event != input.event.repeat) return true;
const key: vaxis.Key = .{ const key: vaxis.Key = .{
.codepoint = keycode, .codepoint = keypress,
.shifted_codepoint = if (shifted != keycode) shifted else null, .shifted_codepoint = if (keypress_shifted != keypress) keypress_shifted else null,
.mods = @bitCast(mods), .mods = @bitCast(modifiers),
.text = if (text.len > 0) text else null, .text = if (text.len > 0) text else null,
}; };
self.vt.update(.{ .key_press = key }) catch |e| self.vt.update(.{ .key_press = key }) catch |e|