yves-biener/zterm
1
0
Fork 0
Code Issues Pull Requests Actions Wiki Activity

mod():

Browse Source
This commit is contained in:
Yves Biener
2025-02-14 21:49:30 +01:00
parent 4cda202873
commit 8998afd9d6
2 changed files with 64 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
examples/container.zig
View File

@@ -31,20 +31,33 @@ pub fn main() !void {
.separator = .{ .enabled = false }, .separator = .{ .enabled = false },
}, },
.layout = .{ .layout = .{
.gap = 1, .gap = 0,
.padding = .all(5), .padding = .all(5),
.direction = .horizontal, .direction = .horizontal,
}, },
}); });
try container.append(try App.Container.init(allocator, .{ var box = try App.Container.init(allocator, .{
.rectangle = .{ .fill = .blue }, .rectangle = .{ .fill = .blue },
.layout = .{ .layout = .{
.gap = 1,
.direction = .vertical,
.padding = .vertical(1),
.sizing = .{ .sizing = .{
.width = .{ .fixed = 70 }, // .width = .{ .fixed = 700 },
.height = .{ .fixed = 18 }, // .height = .{ .fixed = 180 },
}, },
}, },
});
try box.append(try App.Container.init(allocator, .{
.rectangle = .{ .fill = .light_green },
})); }));
try box.append(try App.Container.init(allocator, .{
.rectangle = .{ .fill = .light_green },
}));
try box.append(try App.Container.init(allocator, .{
.rectangle = .{ .fill = .light_green },
}));
try container.append(box);
try container.append(try App.Container.init(allocator, .{ try container.append(try App.Container.init(allocator, .{
.border = .{ .color = .light_blue, .corners = .squared }, .border = .{ .color = .light_blue, .corners = .squared },
})); }));

87
src/container.zig
View File

@@ -311,6 +311,7 @@ pub fn Container(comptime Event: type) type {
}); });
this.viewport = s; this.viewport = s;
// sizing // sizing
// FIX: fixed sizing for smaller and bigger values does not work yet
var size = s; var size = s;
size.anchor = .{}; // reset relative anchor of size! size.anchor = .{}; // reset relative anchor of size!
const sizing = this.properties.layout.sizing; const sizing = this.properties.layout.sizing;
@@ -410,8 +411,8 @@ pub fn Container(comptime Event: type) type {
} }
element_size = .{ element_size = .{
.anchor = .{ .anchor = .{
.col = size.anchor.col + offset, .col = this.viewport.anchor.col + offset,
.row = size.anchor.row, .row = this.viewport.anchor.row,
}, },
.cols = cols, .cols = cols,
.rows = size.rows, .rows = size.rows,
@@ -429,8 +430,8 @@ pub fn Container(comptime Event: type) type {
} }
element_size = .{ element_size = .{
.anchor = .{ .anchor = .{
.col = size.anchor.col, .col = this.viewport.anchor.col,
.row = size.anchor.row + offset, .row = this.viewport.anchor.row + offset,
}, },
.cols = size.cols, .cols = size.cols,
.rows = rows, .rows = rows,
@@ -464,52 +465,58 @@ pub fn Container(comptime Event: type) type {
} }
pub fn contents(this: *const @This()) ![]const Cell { pub fn contents(this: *const @This()) ![]const Cell {
const content = try this.allocator.alloc(Cell, @as(usize, this.properties.scroll.size.cols) * @as(usize, this.properties.scroll.size.rows)); const content_cells = try this.allocator.alloc(Cell, @as(usize, this.properties.scroll.size.cols) * @as(usize, this.properties.scroll.size.rows));
defer this.allocator.free(content); defer this.allocator.free(content_cells);
@memset(content, .{}); @memset(content_cells, .{});
const cells = try this.allocator.alloc(Cell, @as(usize, this.viewport.cols) * @as(usize, this.viewport.rows)); const viewport_cells = try this.allocator.alloc(Cell, @as(usize, this.viewport.cols) * @as(usize, this.viewport.rows));
@memset(cells, .{}); @memset(viewport_cells, .{});
this.properties.border.contents(content, this.properties.scroll.size, this.properties.layout, @truncate(this.elements.items.len)); this.properties.border.contents(content_cells, this.properties.scroll.size, this.properties.layout, @truncate(this.elements.items.len));
this.properties.rectangle.contents(content, this.properties.scroll.size); this.properties.rectangle.contents(content_cells, this.properties.scroll.size);
const cols = blk: { log.debug("Content::contents .scroll.size: {{ .anchor = {{ .col = {d}, .row = {d} }}, .cols = {d}, .rows = {d} }}", .{
var cols: u16 = this.properties.scroll.size.cols;
if (this.properties.scroll.size.cols > this.viewport.cols) {
cols = this.viewport.cols;
}
break :blk cols;
};
const rows = blk: {
var rows: u16 = this.properties.scroll.size.rows;
if (this.properties.scroll.size.rows > this.viewport.rows) {
rows = this.viewport.rows;
}
break :blk rows;
};
const anchor = (this.properties.scroll.size.anchor.row * this.properties.scroll.size.cols) + this.properties.scroll.size.anchor.col;
log.debug("viewport = .{{ .anchor = {{ .col = {d}, .row = {d} }}, .cols = {d}, .rows = {d} }}", .{
this.viewport.anchor.col,
this.viewport.anchor.row,
this.viewport.cols,
this.viewport.rows,
});
log.debug("size = .{{ .anchor = {{ .col = {d}, .row = {d} }}, .cols = {d}, .rows = {d} }}", .{
this.properties.scroll.size.anchor.col, this.properties.scroll.size.anchor.col,
this.properties.scroll.size.anchor.row, this.properties.scroll.size.anchor.row,
this.properties.scroll.size.cols, this.properties.scroll.size.cols,
this.properties.scroll.size.rows, this.properties.scroll.size.rows,
}); });
for (0..rows) |row| {
for (0..cols) |col| { const cols = blk: {
// TODO: try to do this with @memcpy instead to improve performance var cols: u16 = this.properties.scroll.size.cols - this.properties.scroll.size.anchor.col;
const cell = content[anchor + (row * this.properties.scroll.size.cols) + col]; if (cols > this.viewport.cols) {
cells[row * this.viewport.cols + col].cp = cell.cp; cols = this.viewport.cols;
cells[row * this.viewport.cols + col].style = cell.style;
} }
break :blk cols;
};
const rows = blk: {
var rows: u16 = this.properties.scroll.size.rows - this.properties.scroll.size.anchor.col;
if (rows > this.viewport.rows) {
rows = this.viewport.rows;
}
break :blk rows;
};
var content_row: usize = this.properties.scroll.size.anchor.row;
var content_col: usize = this.properties.scroll.size.anchor.col;
var viewport_row: usize = 0;
var viewport_col: usize = 0;
for (0..rows) |_| {
for (0..cols) |_| {
// TODO: try to do this with @memcpy instead to improve performance
const cell = content_cells[(content_row * this.properties.scroll.size.cols) + content_col];
viewport_cells[(viewport_row * this.viewport.cols) + viewport_col] = cell;
content_col += 1;
viewport_col += 1;
}
content_row += 1;
viewport_row += 1;
content_col = 0;
viewport_col = 0;
} }
return cells; return viewport_cells;
} }
}; };
} }