zig/libvaxis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parser: fix query responses for kitty kbd, decrpm

Browse source
This commit is contained in:
Tim Culverhouse 2024-06-05 11:49:03 -05:00
parent 4d9a0cc8d4
commit 43a714de0c
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Parser.zig
View file

@ -290,11 +290,13 @@ inline fn parseOsc(input: []const u8, paste_allocator: ?std.mem.Allocator) !Resu
inline fn parseCsi(input: []const u8, text_buf: []u8) Result { inline fn parseCsi(input: []const u8, text_buf: []u8) Result {
// We start iterating at index 2 to get past te '[' // We start iterating at index 2 to get past te '['
const sequence = for (input[2..], 2..) |b, i| { const sequence = for (input[2..], 2..) |b, i| {
if (i == 2 and b == '?') continue;
switch (b) { switch (b) {
0x40...0xFF => break input[0 .. i + 1], 0x40...0xFF => break input[0 .. i + 1],
else => continue, else => continue,
} }
} else return .{ .event = null, .n = 0 }; } else return .{ .event = null, .n = 0 };
std.log.err("{s}\r\n", .{sequence[1..]});
const null_event: Result = .{ .event = null, .n = sequence.len }; const null_event: Result = .{ .event = null, .n = sequence.len };
@ -431,6 +433,11 @@ inline fn parseCsi(input: []const u8, text_buf: []u8) Result {
// Not all fields will be present. Only unicode-key-code is // Not all fields will be present. Only unicode-key-code is
// mandatory // mandatory
if (sequence.len > 2 and sequence[2] == '?') return .{
.event = .cap_kitty_keyboard,
.n = sequence.len,
};
var key: Key = .{ var key: Key = .{
.codepoint = undefined, .codepoint = undefined,
}; };
@ -487,10 +494,10 @@ inline fn parseCsi(input: []const u8, text_buf: []u8) Result {
return .{ .event = event, .n = sequence.len }; return .{ .event = event, .n = sequence.len };
}, },
'y' => { 'y' => {
// DECRPM (CSI Ps ; Pm y) // DECRPM (CSI ? Ps ; Pm $ y)
const delim_idx = std.mem.indexOfScalarPos(u8, input, 2, ';') orelse return null_event; const delim_idx = std.mem.indexOfScalarPos(u8, input, 2, ';') orelse return null_event;
const ps = std.fmt.parseUnsigned(u16, input[2..delim_idx], 10) catch return null_event; const ps = std.fmt.parseUnsigned(u16, input[3..delim_idx], 10) catch return null_event;
const pm = std.fmt.parseUnsigned(u8, input[delim_idx + 1 .. sequence.len - 1], 10) catch return null_event; const pm = std.fmt.parseUnsigned(u8, input[delim_idx + 1 .. sequence.len - 2], 10) catch return null_event;
switch (ps) { switch (ps) {
// Mouse Pixel reporting // Mouse Pixel reporting
1016 => switch (pm) { 1016 => switch (pm) {