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

xev: fix todos

Browse source
This commit is contained in:
Tim Culverhouse 2024-05-30 10:06:28 -05:00
parent bbd9184e00
commit 335ea9f2d0
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/xev.zig
View file

@ -37,7 +37,6 @@ pub fn main() !void {
try vx.queryTerminalSend(tty.anyWriter()); try vx.queryTerminalSend(tty.anyWriter());
try loop.run(.until_done); try loop.run(.until_done);
@panic("AHHH");
} }
fn callback( fn callback(
@ -56,7 +55,6 @@ fn callback(
.winsize => |ws| watcher.vx.resize(ud.?.*, watcher.tty.anyWriter(), ws) catch @panic("TODO"), .winsize => |ws| watcher.vx.resize(ud.?.*, watcher.tty.anyWriter(), ws) catch @panic("TODO"),
else => {}, else => {},
} }
std.log.debug("a", .{});
const win = watcher.vx.window(); const win = watcher.vx.window();
win.clear(); win.clear();
watcher.vx.render(watcher.tty.anyWriter()) catch { watcher.vx.render(watcher.tty.anyWriter()) catch {

32
src/xev.zig
View file

@ -105,7 +105,9 @@ pub fn TtyWatcher(comptime Userdata: type) type {
fn signalCallback(ptr: *anyopaque) void { fn signalCallback(ptr: *anyopaque) void {
const self: *Self = @ptrCast(@alignCast(ptr)); const self: *Self = @ptrCast(@alignCast(ptr));
self.winsize_wakeup.notify() catch @panic("TODO"); self.winsize_wakeup.notify() catch |err| {
log.warn("couldn't wake up winsize callback: {}", .{err});
};
} }
fn ttyReadCallback( fn ttyReadCallback(
@ -117,7 +119,10 @@ pub fn TtyWatcher(comptime Userdata: type) type {
r: xev.ReadError!usize, r: xev.ReadError!usize,
) xev.CallbackAction { ) xev.CallbackAction {
_ = c; // autofix _ = c; // autofix
const n = r catch @panic("TODO"); const n = r catch |err| {
log.err("read error: {}", .{err});
return .disarm;
};
const self = ud orelse unreachable; const self = ud orelse unreachable;
// reset read start state // reset read start state
@ -125,7 +130,10 @@ pub fn TtyWatcher(comptime Userdata: type) type {
var seq_start: usize = 0; var seq_start: usize = 0;
parse_loop: while (seq_start < n) { parse_loop: while (seq_start < n) {
const result = self.parser.parse(buf.slice[seq_start..n], null) catch @panic("TODO"); const result = self.parser.parse(buf.slice[seq_start..n], null) catch |err| {
log.err("couldn't parse input: {}", .{err});
return .disarm;
};
if (result.n == 0) { if (result.n == 0) {
// copy the read to the beginning. We don't use memcpy because // copy the read to the beginning. We don't use memcpy because
// this could be overlapping, and it's also rare // this could be overlapping, and it's also rare
@ -138,7 +146,7 @@ pub fn TtyWatcher(comptime Userdata: type) type {
} }
seq_start += n; seq_start += n;
const event_inner = result.event orelse { const event_inner = result.event orelse {
std.log.warn("unknown event: {s}", .{self.read_buf[seq_start - n + 1 .. seq_start]}); log.warn("unknown event: {s}", .{self.read_buf[seq_start - n + 1 .. seq_start]});
continue :parse_loop; continue :parse_loop;
}; };
@ -215,7 +223,9 @@ pub fn TtyWatcher(comptime Userdata: type) type {
self.vx.caps.color_scheme_updates = true; self.vx.caps.color_scheme_updates = true;
}, },
.cap_da1 => { .cap_da1 => {
self.vx.enableDetectedFeatures(self.tty.anyWriter()) catch {}; self.vx.enableDetectedFeatures(self.tty.anyWriter()) catch |err| {
log.err("couldn't enable features: {}", .{err});
};
}, },
} }
} }
@ -229,9 +239,15 @@ pub fn TtyWatcher(comptime Userdata: type) type {
_: *xev.Completion, _: *xev.Completion,
r: xev.Async.WaitError!void, r: xev.Async.WaitError!void,
) xev.CallbackAction { ) xev.CallbackAction {
_ = r catch @panic("TODO"); _ = r catch |err| {
const self = ud orelse @panic("TODO"); log.err("async error: {}", .{err});
const winsize = Tty.getWinsize(self.tty.fd) catch @panic("TODO"); return .disarm;
};
const self = ud orelse unreachable; // no userdata
const winsize = Tty.getWinsize(self.tty.fd) catch |err| {
log.err("couldn't get winsize: {}", .{err});
return .disarm;
};
return self.callback(self.ud, l, self, .{ .winsize = winsize }); return self.callback(self.ud, l, self, .{ .winsize = winsize });
} }
}; };