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

mod: use allocators for Layout and Widget types

Browse Source
This commit is contained in:
Yves Biener
2024-11-19 22:56:37 +01:00
parent cd12fb12e6
commit 1c703a196a
18 changed files with 264 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/container.zig
View File

@@ -30,19 +30,19 @@ pub fn main() !void {
// TODO: when not running fullscreen, the application needs to screen down accordingly to display the contents
// -> size hint how much should it use?
var layout = Layout.createFrom(Layout.HContainer.init(allocator, .{
var layout = Layout.createFrom(allocator, Layout.HContainer.init(allocator, .{
.{
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
15,
},
.{
Layout.createFrom(Layout.VContainer.init(allocator, .{
Layout.createFrom(allocator, Layout.VContainer.init(allocator, .{
.{
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
25,
},
.{
Widget.createFrom(blk: {
Widget.createFrom(allocator, blk: {
const file = try std.fs.cwd().openFile("./src/app.zig", .{});
defer file.close();
const widget = Widget.RawText.init(allocator, file);
@@ -51,14 +51,14 @@ pub fn main() !void {
50,
},
.{
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
25,
},
})),
70,
},
.{
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
15,
},
}));

10
examples/exec.zig
View File

@@ -31,14 +31,14 @@ pub fn main() !void {
// TODO: when not running fullscreen, the application needs to screen down accordingly to display the contents
// -> size hint how much should it use?
var layout = Layout.createFrom(Layout.VContainer.init(allocator, .{
var layout = Layout.createFrom(allocator, Layout.VContainer.init(allocator, .{
.{
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
45,
},
.{
Layout.createFrom(Layout.Framing.init(allocator, .{}, .{
.widget = Widget.createFrom(Widget.Text.init(allocator, .center, &[_]Cell{
Layout.createFrom(allocator, Layout.Framing.init(allocator, .{}, .{
.widget = Widget.createFrom(allocator, Widget.Text.init(allocator, .center, &[_]Cell{
.{ .content = "Press " },
.{ .content = "Ctrl+n", .style = .{ .fg = .{ .index = 6 } } },
.{ .content = " to launch $EDITOR" },
@@ -47,7 +47,7 @@ pub fn main() !void {
10,
},
.{
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
45,
},
}));

8
examples/padding.zig
View File

@@ -30,10 +30,10 @@ pub fn main() !void {
// TODO: when not running fullscreen, the application needs to screen down accordingly to display the contents
// -> size hint how much should it use?
var layout = Layout.createFrom(Layout.Padding.init(allocator, .{
var layout = Layout.createFrom(allocator, Layout.Padding.init(allocator, .{
.padding = 15,
}, .{
.layout = Layout.createFrom(Layout.Framing.init(allocator, .{
.layout = Layout.createFrom(allocator, Layout.Framing.init(allocator, .{
.style = .{
.fg = .{
.index = 6,
@@ -49,13 +49,13 @@ pub fn main() !void {
},
},
}, .{
.layout = Layout.createFrom(Layout.Margin.init(
.layout = Layout.createFrom(allocator, Layout.Margin.init(
allocator,
.{
.margin = 10,
},
.{
.widget = Widget.createFrom(blk: {
.widget = Widget.createFrom(allocator, blk: {
const file = try std.fs.cwd().openFile("./examples/padding.zig", .{});
defer file.close();
const widget = Widget.RawText.init(allocator, file);

20
examples/stack.zig
View File

@@ -30,7 +30,7 @@ pub fn main() !void {
// TODO: when not running fullscreen, the application needs to screen down accordingly to display the contents
// -> size hint how much should it use?
var layout = Layout.createFrom(Layout.Framing.init(allocator, .{
var layout = Layout.createFrom(allocator, Layout.Framing.init(allocator, .{
.style = .{
.fg = .{
.index = 6,
@@ -46,9 +46,9 @@ pub fn main() !void {
},
},
}, .{
.layout = Layout.createFrom(Layout.HStack.init(allocator, .{
Widget.createFrom(Widget.Spacer.init(allocator)),
Layout.createFrom(Layout.Framing.init(
.layout = Layout.createFrom(allocator, Layout.HStack.init(allocator, .{
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
Layout.createFrom(allocator, Layout.Framing.init(
allocator,
.{
.style = .{
@@ -67,18 +67,18 @@ pub fn main() !void {
},
},
.{
.layout = Layout.createFrom(Layout.Margin.init(allocator, .{
.layout = Layout.createFrom(allocator, Layout.Margin.init(allocator, .{
.margin = 10,
}, .{
.layout = Layout.createFrom(Layout.VStack.init(allocator, .{
Widget.createFrom(blk: {
.layout = Layout.createFrom(allocator, Layout.VStack.init(allocator, .{
Widget.createFrom(allocator, blk: {
const file = try std.fs.cwd().openFile("./examples/stack.zig", .{});
defer file.close();
const widget = Widget.RawText.init(allocator, file);
break :blk widget;
}),
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(blk: {
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, blk: {
const file = try std.fs.cwd().openFile("./examples/stack.zig", .{});
defer file.close();
const widget = Widget.RawText.init(allocator, file);
@@ -88,7 +88,7 @@ pub fn main() !void {
})),
},
)),
Widget.createFrom(Widget.Spacer.init(allocator)),
Widget.createFrom(allocator, Widget.Spacer.init(allocator)),
})),
}));
defer layout.deinit();

102
examples/tui.zig Normal file
View File

@@ -0,0 +1,102 @@
const std = @import("std");
const zterm = @import("zterm");
const App = zterm.App(
union(enum) {},
zterm.Renderer.Direct,
true,
);
const Cell = zterm.Cell;
const Key = zterm.Key;
const Layout = App.Layout;
const Widget = App.Widget;
const log = std.log.scoped(.tui);
pub fn main() !void {
errdefer |err| log.err("Application Error: {any}", .{err});
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena.deinit();
const allocator = arena.allocator();
var app: App = .{};
var renderer: App.Renderer = .{};
// FIXME: the layout creates an 'incorrect alignment'?
var layout = Layout.createFrom(allocator, Layout.VContainer.init(allocator, .{
.{
Layout.createFrom(allocator, Layout.Framing.init(allocator, .{
.title = .{
.str = "Welcome to my terminal website",
.style = .{
.ul = .{ .index = 6 },
.ul_style = .single,
},
},
}, .{
.layout = Layout.createFrom(allocator, Layout.HContainer.init(allocator, .{
.{
Widget.createFrom(allocator, Widget.Text.init(allocator, .left, &[1]Cell{
.{ .content = "Yves Biener", .style = .{ .bold = true } },
})),
25,
},
.{
Widget.createFrom(allocator, Widget.Text.init(allocator, .center, &[1]Cell{
.{ .content = "File name", .style = .{ .bold = true } },
})),
50,
},
.{
Widget.createFrom(allocator, Widget.Text.init(allocator, .right, &[1]Cell{
.{ .content = "Contact", .style = .{ .bold = true, .ul_style = .single } },
})),
25,
},
})),
})),
10,
},
.{
Layout.createFrom(allocator, Layout.Margin.init(allocator, .{ .left = 15, .right = 15 }, .{
.widget = Widget.createFrom(allocator, Widget.Text.init(allocator, .default, &[1]Cell{
.{ .content = "Does this change anything?", .style = .{ .bold = true, .ul_style = .single } },
})),
})),
90,
},
}));
defer layout.deinit();
try app.start();
defer app.stop() catch unreachable;
// App.Event loop
while (true) {
const event = app.nextEvent();
switch (event) {
.quit => break,
.resize => |size| {
renderer.resize(size);
},
.key => |key| {
// ctrl+c to quit
if (Key.matches(key, .{ .cp = 'c', .mod = .{ .ctrl = true } })) {
app.quit();
}
},
.err => |err| {
log.err("Received {any} with message: {s}", .{ err.err, err.msg });
},
}
const events = try layout.handle(event);
for (events.items) |e| {
app.postEvent(e);
}
try layout.render(&renderer);
}
}