diff --git a/src/Loop.zig b/src/Loop.zig --- a/src/Loop.zig +++ b/src/Loop.zig @@ -352,7 +352,7 @@ } }, .cap_da1 => { - std.Io.futexWake(vx.io, std.atomic.Value(u32), &vx.query_futex, 10); + std.Io.futexWake(vx.io, u32, &vx.query_futex.raw, 10); vx.queries_done.store(true, .unordered); }, .mouse => |mouse| { @@ -484,7 +484,7 @@ vx.caps.program_status = true; }, .cap_da1 => { - std.Io.futexWake(vx.io, std.atomic.Value(u32), &vx.query_futex, 10); + std.Io.futexWake(vx.io, u32, &vx.query_futex.raw, 10); vx.queries_done.store(true, .unordered); }, .winsize => |winsize| { diff --git a/src/Vaxis.zig b/src/Vaxis.zig --- a/src/Vaxis.zig +++ b/src/Vaxis.zig @@ -139,14 +139,13 @@ } } -/// resets enabled features, sends cursor to home and clears below cursor -pub fn resetState(self: *Vaxis, tty: *std.Io.Writer) !void { - // always show the cursor on state reset +/// Resets enabled terminal features without clearing screen content. +/// Use this for non-interactive / single-shot rendering where the +/// output should remain visible after exit. +pub fn resetModes(self: *Vaxis, tty: *std.Io.Writer) !void { tty.writeAll(ctlseqs.show_cursor) catch {}; tty.writeAll(ctlseqs.sgr_reset) catch {}; if (self.screen.cursor_shape != .default) { - // In many terminals, `.default` will set to the configured cursor shape. Others, it will - // change to a blinking block. tty.print(ctlseqs.cursor_shape, .{@backingInt(Cell.CursorShape.default)}) catch {}; } if (self.state.kitty_keyboard) { @@ -159,6 +158,32 @@ if (self.state.bracketed_paste) { try self.setBracketedPaste(tty, false); } + if (self.state.color_scheme_updates) { + try tty.writeAll(ctlseqs.color_scheme_reset); + self.state.color_scheme_updates = false; + } + if (self.state.in_band_resize) { + try tty.writeAll(ctlseqs.in_band_resize_reset); + self.state.in_band_resize = false; + } + if (self.state.changed_default_fg) { + try tty.writeAll(ctlseqs.osc10_reset); + self.state.changed_default_fg = false; + } + if (self.state.changed_default_bg) { + try tty.writeAll(ctlseqs.osc11_reset); + self.state.changed_default_bg = false; + } + if (self.state.changed_cursor_color) { + try tty.writeAll(ctlseqs.osc12_reset); + self.state.changed_cursor_color = false; + } + try tty.flush(); +} + +/// resets enabled features, sends cursor to home and clears below cursor +pub fn resetState(self: *Vaxis, tty: *std.Io.Writer) !void { + self.resetModes(tty) catch {}; if (self.state.alt_screen) { try tty.writeAll(ctlseqs.home); try tty.writeAll(ctlseqs.erase_below_cursor); @@ -171,27 +196,6 @@ } try tty.writeAll(ctlseqs.erase_below_cursor); } - if (self.state.color_scheme_updates) { - try tty.writeAll(ctlseqs.color_scheme_reset); - self.state.color_scheme_updates = false; - } - if (self.state.in_band_resize) { - try tty.writeAll(ctlseqs.in_band_resize_reset); - self.state.in_band_resize = false; - } - if (self.state.changed_default_fg) { - try tty.writeAll(ctlseqs.osc10_reset); - self.state.changed_default_fg = false; - } - if (self.state.changed_default_bg) { - try tty.writeAll(ctlseqs.osc11_reset); - self.state.changed_default_bg = false; - } - if (self.state.changed_cursor_color) { - try tty.writeAll(ctlseqs.osc12_reset); - self.state.changed_cursor_color = false; - } - try tty.flush(); } @@ -1101,19 +1105,19 @@ switch (format) { .rgb => { try tty.print( - "\x1b_Gf=24,s={d},v={d},i={d},t={c};{s}\x1b\\", + "\x1b_Gf=24,s={d},v={d},i={d},t={c},q=2;{s}\x1b\\", .{ width, height, id, medium_char, encoded }, ); }, .rgba => { try tty.print( - "\x1b_Gf=32,s={d},v={d},i={d},t={c};{s}\x1b\\", + "\x1b_Gf=32,s={d},v={d},i={d},t={c},q=2;{s}\x1b\\", .{ width, height, id, medium_char, encoded }, ); }, .png => { try tty.print( - "\x1b_Gf=100,i={d},t={c};{s}\x1b\\", + "\x1b_Gf=100,i={d},t={c},q=2;{s}\x1b\\", .{ id, medium_char, encoded }, ); }, @@ -1149,7 +1153,7 @@ if (bytes.len < 4096) { try tty.print( - "\x1b_Gf={d},s={d},v={d},i={d};{s}\x1b\\", + "\x1b_Gf={d},s={d},v={d},i={d},q=2;{s}\x1b\\", .{ fmt, width, @@ -1162,14 +1166,14 @@ var n: usize = 4096; try tty.print( - "\x1b_Gf={d},s={d},v={d},i={d},m=1;{s}\x1b\\", + "\x1b_Gf={d},s={d},v={d},i={d},m=1,q=2;{s}\x1b\\", .{ fmt, width, height, id, bytes[0..n] }, ); while (n < bytes.len) : (n += 4096) { const end: usize = @min(n + 4096, bytes.len); const m: u2 = if (end == bytes.len) 0 else 1; try tty.print( - "\x1b_Gm={d};{s}\x1b\\", + "\x1b_Gm={d},q=2;{s}\x1b\\", .{ m, bytes[n..end], diff --git a/src/c_api.zig b/src/c_api.zig --- a/src/c_api.zig +++ b/src/c_api.zig @@ -965,7 +965,7 @@ .cap_multi_cursor => vx.caps.multi_cursor = true, .cap_program_status => vx.caps.program_status = true, .cap_da1 => { - std.Io.futexWake(vx.io, std.atomic.Value(u32), &vx.query_futex, 10); + std.Io.futexWake(vx.io, u32, &vx.query_futex.raw, 10); vx.queries_done.store(true, .unordered); }, .winsize => { diff --git a/src/ctlseqs.zig b/src/ctlseqs.zig --- a/src/ctlseqs.zig +++ b/src/ctlseqs.zig @@ -140,8 +140,8 @@ pub const osc52_clipboard_request = "\x1b]52;c;?\x1b\\"; // Kitty graphics -pub const kitty_graphics_clear = "\x1b_Ga=d\x1b\\"; -pub const kitty_graphics_preamble = "\x1b_Ga=p,i={d}"; +pub const kitty_graphics_clear = "\x1b_Ga=d,q=2\x1b\\"; +pub const kitty_graphics_preamble = "\x1b_Ga=p,q=2,i={d}"; pub const kitty_graphics_closing = ",C=1\x1b\\"; // Color control sequences diff --git a/src/vxfw/Padding.zig b/src/vxfw/Padding.zig --- a/src/vxfw/Padding.zig +++ b/src/vxfw/Padding.zig @@ -6,7 +6,7 @@ const vxfw = @import("vxfw.zig"); const Padding = @This(); -const PadValues = struct { +pub const PadValues = struct { left: u16 = 0, right: u16 = 0, top: u16 = 0, @@ -54,10 +54,6 @@ pub fn draw(self: *const Padding, ctx: vxfw.DrawContext) Allocator.Error!vxfw.Surface { const pad = self.padding; - if (pad.left > 0 or pad.right > 0) - std.debug.assert(ctx.max.width != null); - if (pad.top > 0 or pad.bottom > 0) - std.debug.assert(ctx.max.height != null); const inner_min: vxfw.Size = .{ .width = ctx.min.width -| (pad.right + pad.left), .height = ctx.min.height -| (pad.top + pad.bottom),