ceos/ly
1
0
Fork 0
mirror of https://codeberg.org/fairyglade/ly.git synced 2026-08-21 21:14:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: move terminal bounds check to TerminalBuffer method

Browse source 
Adds `TerminalBuffer.setCellBoundsChecked` as a way to add a `Cell` to
the buffer if it is within the buffer's dimensions.
This commit is contained in:
Titanium Brain 2026-05-08 18:07:05 +01:00
commit e771f11e92
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ly-ui/src/TerminalBuffer.zig
View file

@ -381,6 +381,15 @@ pub fn setCell(x: usize, y: usize, cell: Cell) void {
);
}
pub fn setCellBoundsChecked(self: *TerminalBuffer, x: usize, y: usize, cell: Cell) void {
const width = self.width;
const height = self.height;
if (0 <= x and x < width and 0 <= y and y < height) {
cell.put(x, y);
}
}
pub fn reclaim(self: TerminalBuffer) !void {
if (self.termios) |termios| {
// Take back control of the TTY

22
src/animations/DurFile.zig
View file

@ -538,25 +538,19 @@ fn draw(self: *DurFile) void {
const current_frame = self.dur_movie.frames.items[self.frames];
const buf_width: u32 = @intCast(self.terminal_buffer.width);
const buf_height: u32 = @intCast(self.terminal_buffer.height);
// y is used as an iterator in the durformat, while cell_y gives us the correct placement for the cell (same for x)
const start_pos_y: u64 = @max(0, -self.start_pos[VEC_Y]);
const lines: u64 = @intCast(self.dur_movie.lines.?);
const end_pos_y: u64 = @intCast(@min(lines, buf_height - self.start_pos[VEC_Y]));
for (start_pos_y..end_pos_y) |y| {
for (0..@intCast(self.dur_movie.lines.?)) |y| {
const y_offset_i = @as(i32, @intCast(y)) + self.start_pos[VEC_Y];
const cell_y: u32 = @intCast(y_offset_i);
const cell_y: u32 = if (y_offset_i >= 0) @intCast(y_offset_i) else continue;
var iter = std.unicode.Utf8View.initUnchecked(current_frame.contents[y]).iterator();
const start_pos_x: u64 = @max(0, -self.start_pos[VEC_X]);
const columns: u64 = @intCast(self.dur_movie.columns.?);
const end_pos_x: u64 = @intCast(@min(columns, buf_width - self.start_pos[VEC_X]));
for (start_pos_x..end_pos_x) |x| {
for (0..@intCast(self.dur_movie.columns.?)) |x| {
const x_offset_i = @as(i32, @intCast(x)) + self.start_pos[VEC_X];
const cell_x: u32 = @intCast(x_offset_i);
const cell_x: u32 = if (x_offset_i >= 0) @intCast(x_offset_i) else {
_ = iter.nextCodepoint().?;
continue;
};
const codepoint: u21 = iter.nextCodepoint().?;
const color_map = current_frame.colorMap[x][y];
@ -573,7 +567,7 @@ fn draw(self: *DurFile) void {
const cell = Cell{ .ch = @intCast(codepoint), .fg = fg_color, .bg = bg_color };
cell.put(cell_x, cell_y);
self.terminal_buffer.setCellBoundsChecked(cell_x, cell_y, cell);
}
}