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

widgets(terminal): dirty handling, cursor up, cursor shapes

Browse source
This commit is contained in:
Tim Culverhouse 2024-06-07 22:32:49 -05:00
parent c52bb30cdc
commit ef62de5541
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/widgets/terminal/Terminal.zig
View file

@ -139,7 +139,6 @@ pub fn resize(self: *Terminal, ws: Winsize) !void {
} }
pub fn draw(self: *Terminal, win: vaxis.Window) !void { pub fn draw(self: *Terminal, win: vaxis.Window) !void {
// TODO: check sync
if (self.back_mutex.tryLock() and !self.mode.sync) { if (self.back_mutex.tryLock() and !self.mode.sync) {
defer self.back_mutex.unlock(); defer self.back_mutex.unlock();
try self.back_screen.copyTo(&self.front_screen); try self.back_screen.copyTo(&self.front_screen);
@ -155,8 +154,10 @@ pub fn draw(self: *Terminal, win: vaxis.Window) !void {
} }
} }
if (self.front_screen.cursor.visible) if (self.front_screen.cursor.visible) {
win.setCursorShape(self.front_screen.cursor.shape);
win.showCursor(self.front_screen.cursor.col, self.front_screen.cursor.row); win.showCursor(self.front_screen.cursor.col, self.front_screen.cursor.row);
}
} }
pub fn update(self: *Terminal, event: InputEvent) !void { pub fn update(self: *Terminal, event: InputEvent) !void {
@ -220,6 +221,11 @@ fn run(self: *Terminal) !void {
.ss3 => |ss3| std.log.err("unhandled ss3: {c}", .{ss3}), .ss3 => |ss3| std.log.err("unhandled ss3: {c}", .{ss3}),
.csi => |seq| { .csi => |seq| {
switch (seq.final) { switch (seq.final) {
'A' => {
var iter = seq.iterator(u16);
const delta = iter.next() orelse 1;
self.back_screen.cursor.row = self.back_screen.cursor.row -| delta;
},
'B' => { // CUD 'B' => { // CUD
var iter = seq.iterator(u16); var iter = seq.iterator(u16);
const delta = iter.next() orelse 1; const delta = iter.next() orelse 1;
@ -275,6 +281,18 @@ fn run(self: *Terminal) !void {
self.back_screen.sgr(seq); self.back_screen.sgr(seq);
} }
}, },
'q' => {
if (seq.intermediate) |int| {
switch (int) {
' ' => {
var iter = seq.iterator(u8);
const shape = iter.next() orelse 0;
self.back_screen.cursor.shape = @enumFromInt(shape);
},
else => {},
}
}
},
else => std.log.err("unhandled CSI: {}", .{seq}), else => std.log.err("unhandled CSI: {}", .{seq}),
} }
}, },
@ -316,6 +334,10 @@ pub fn setMode(self: *Terminal, mode: u16, val: bool) void {
self.back_screen = &self.back_screen_alt self.back_screen = &self.back_screen_alt
else else
self.back_screen = &self.back_screen_pri; self.back_screen = &self.back_screen_pri;
var i: usize = 0;
while (i < self.back_screen.buf.len) : (i += 1) {
self.back_screen.buf[i].dirty = true;
}
}, },
2026 => self.mode.sync = val, 2026 => self.mode.sync = val,
else => return, else => return,