yves-biener/zterm
1
0
Fork 0
Code Issues Pull Requests Actions Wiki Activity

feat(app): read input options correctly

Browse Source
This commit is contained in:
Yves Biener
2025-05-28 14:39:27 +02:00
parent c6d8eec287
commit 4cc749facc
1 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/app.zig
View File

@@ -163,6 +163,9 @@ pub fn App(comptime E: type) type {
// Legacy keys // Legacy keys
// CSI {ABCDEFHPQS} // CSI {ABCDEFHPQS}
// CSI 1 ; modifier:event_type {ABCDEFHPQS} // CSI 1 ; modifier:event_type {ABCDEFHPQS}
var field_iter = std.mem.splitScalar(u8, sequence[2 .. sequence.len - 1], ';');
_ = field_iter.next(); // skip first field
const key: Key = .{ const key: Key = .{
.cp = switch (final) { .cp = switch (final) {
'A' => input.Up, 'A' => input.Up,
@@ -178,42 +181,77 @@ pub fn App(comptime E: type) type {
'S' => input.F4, 'S' => input.F4,
else => unreachable, else => unreachable,
}, },
.mod = blk: {
// modifier_mask:event_type
var mod: Key.Modifier = .{};
const field_buf = field_iter.next() orelse break :blk mod;
var param_iter = std.mem.splitScalar(u8, field_buf, ':');
const modifier_buf = param_iter.next() orelse unreachable;
const modifier_mask = fmt.parseUnsigned(u8, modifier_buf, 10) catch break :blk mod;
if ((modifier_mask -| 1) & 1 != 0) mod.shift = true;
if ((modifier_mask -| 1) & 2 != 0) mod.alt = true;
if ((modifier_mask -| 1) & 4 != 0) mod.ctrl = true;
break :blk mod;
},
}; };
this.postEvent(.{ .key = key }); this.postEvent(.{ .key = key });
}, },
'Z' => this.postEvent(.{ .key = .{ .cp = input.Tab, .mod = .{ .shift = true } } }),
'~' => { '~' => {
// Legacy keys // Legacy keys
// CSI number ~ // CSI number ~
// CSI number ; modifier ~ // CSI number ; modifier ~
// CSI number ; modifier:event_type ; text_as_codepoint ~ // CSI number ; modifier:event_type ; text_as_codepoint ~
var field_iter = mem.splitScalar(u8, sequence[2 .. sequence.len - 1], ';'); var field_iter = mem.splitScalar(u8, sequence[2 .. sequence.len - 1], ';');
const number_buf = field_iter.next() orelse unreachable; // always will have one field
const number = fmt.parseUnsigned(u16, number_buf, 10) catch break;
const key: Key = .{ const key: Key = .{
.cp = switch (number) { .cp = blk: {
2 => input.Insert, const number_buf = field_iter.next() orelse unreachable; // always will have one field
3 => input.Delete, const number = fmt.parseUnsigned(u16, number_buf, 10) catch break;
5 => input.PageUp, break :blk switch (number) {
6 => input.PageDown, 2 => input.Insert,
7 => input.Home, 3 => input.Delete,
8 => input.End, 5 => input.PageUp,
11 => input.F1, 6 => input.PageDown,
12 => input.F2, 7 => input.Home,
13 => input.F3, 8 => input.End,
14 => input.F4, 11 => input.F1,
15 => input.F5, 12 => input.F2,
17 => input.F6, 13 => input.F3,
18 => input.F7, 14 => input.F4,
19 => input.F8, 15 => input.F5,
20 => input.F9, 17 => input.F6,
21 => input.F10, 18 => input.F7,
23 => input.F11, 19 => input.F8,
24 => input.F12, 20 => input.F9,
// 200 => return .{ .event = .paste_start, .n = sequence.len }, 21 => input.F10,
// 201 => return .{ .event = .paste_end, .n = sequence.len }, 23 => input.F11,
57427 => input.KpBegin, 24 => input.F12,
else => unreachable, 25 => input.F13,
26 => input.F14,
28 => input.F15,
29 => input.F16,
31 => input.F17,
32 => input.F18,
33 => input.F19,
34 => input.F20,
// 200 => return .{ .event = .paste_start, .n = sequence.len },
// 201 => return .{ .event = .paste_end, .n = sequence.len },
57427 => input.KpBegin,
else => unreachable,
};
},
.mod = blk: {
// modifier_mask:event_type
var mod: Key.Modifier = .{};
const field_buf = field_iter.next() orelse break :blk mod;
var param_iter = std.mem.splitScalar(u8, field_buf, ':');
const modifier_buf = param_iter.next() orelse unreachable;
const modifier_mask = fmt.parseUnsigned(u8, modifier_buf, 10) catch break :blk mod;
if ((modifier_mask -| 1) & 1 != 0) mod.shift = true;
if ((modifier_mask -| 1) & 2 != 0) mod.alt = true;
if ((modifier_mask -| 1) & 4 != 0) mod.ctrl = true;
break :blk mod;
}, },
}; };
this.postEvent(.{ .key = key }); this.postEvent(.{ .key = key });
@@ -303,9 +341,29 @@ pub fn App(comptime E: type) type {
else => {}, else => {},
} }
}, },
0x50 => {
// DCS
},
0x58 => {
// SOS
},
0x5D => {
// OSC
},
// TODO parse corresponding codes // TODO parse corresponding codes
// 0x5B => parseCsi(input, &self.buf), // CSI see https://github.com/rockorager/libvaxis/blob/main/src/Parser.zig 0x5F => {
else => {}, // APC
// parse for kitty graphics capabilities
},
else => {
// alt + <char> keypress
this.postEvent(.{
.key = .{
.cp = buf[1],
.mod = .{ .alt = true },
},
});
},
} }
} else { } else {
const b = buf[0]; const b = buf[0];
@@ -313,7 +371,8 @@ pub fn App(comptime E: type) type {
0x00 => .{ .cp = '@', .mod = .{ .ctrl = true } }, 0x00 => .{ .cp = '@', .mod = .{ .ctrl = true } },
0x08 => .{ .cp = input.Backspace }, 0x08 => .{ .cp = input.Backspace },
0x09 => .{ .cp = input.Tab }, 0x09 => .{ .cp = input.Tab },
0x0a, 0x0d => .{ .cp = input.Enter }, 0x0a => .{ .cp = 'j', .mod = .{ .ctrl = true } },
0x0d => .{ .cp = input.Enter },
0x01...0x07, 0x0b...0x0c, 0x0e...0x1a => .{ .cp = b + 0x60, .mod = .{ .ctrl = true } }, 0x01...0x07, 0x0b...0x0c, 0x0e...0x1a => .{ .cp = b + 0x60, .mod = .{ .ctrl = true } },
0x1b => escape: { 0x1b => escape: {
assert(read_bytes == 1); assert(read_bytes == 1);