add(examples/demo): application to showcase a more complex application
All checks were successful
Zig Project Action / Lint, Spell-check and test zig project (push) Successful in 53s
All checks were successful
Zig Project Action / Lint, Spell-check and test zig project (push) Successful in 53s
Further improvements for example applications; Demo example is now default build target (when not providing example configuration).
This commit is contained in:
13
build.zig
13
build.zig
@@ -5,6 +5,7 @@ pub fn build(b: *std.Build) void {
|
|||||||
const optimize = b.standardOptimizeOption(.{});
|
const optimize = b.standardOptimizeOption(.{});
|
||||||
|
|
||||||
const Examples = enum {
|
const Examples = enum {
|
||||||
|
demo,
|
||||||
// elements:
|
// elements:
|
||||||
button,
|
button,
|
||||||
input,
|
input,
|
||||||
@@ -21,7 +22,7 @@ pub fn build(b: *std.Build) void {
|
|||||||
errors,
|
errors,
|
||||||
};
|
};
|
||||||
|
|
||||||
const example = b.option(Examples, "example", "Example to build and/or run. (default: vertical)") orelse .vertical;
|
const example = b.option(Examples, "example", "Example to build and/or run. (default: demo)") orelse .demo;
|
||||||
|
|
||||||
const options = b.addOptions();
|
const options = b.addOptions();
|
||||||
options.addOption(Examples, "example", example);
|
options.addOption(Examples, "example", example);
|
||||||
@@ -42,6 +43,15 @@ pub fn build(b: *std.Build) void {
|
|||||||
|
|
||||||
//--- Examples ---
|
//--- Examples ---
|
||||||
|
|
||||||
|
// demo:
|
||||||
|
const demo = b.addExecutable(.{
|
||||||
|
.name = "demo",
|
||||||
|
.root_source_file = b.path("examples/demo.zig"),
|
||||||
|
.target = target,
|
||||||
|
.optimize = optimize,
|
||||||
|
});
|
||||||
|
demo.root_module.addImport("zterm", lib);
|
||||||
|
|
||||||
// elements:
|
// elements:
|
||||||
const button = b.addExecutable(.{
|
const button = b.addExecutable(.{
|
||||||
.name = "button",
|
.name = "button",
|
||||||
@@ -128,6 +138,7 @@ pub fn build(b: *std.Build) void {
|
|||||||
|
|
||||||
// mapping of user selected example to compile step
|
// mapping of user selected example to compile step
|
||||||
const exe = switch (example) {
|
const exe = switch (example) {
|
||||||
|
.demo => demo,
|
||||||
// elements:
|
// elements:
|
||||||
.button => button,
|
.button => button,
|
||||||
.input => input,
|
.input => input,
|
||||||
|
|||||||
144
examples/demo.zig
Normal file
144
examples/demo.zig
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const zterm = @import("zterm");
|
||||||
|
|
||||||
|
const input = zterm.input;
|
||||||
|
const App = zterm.App(union(enum) {});
|
||||||
|
|
||||||
|
const log = std.log.scoped(.default);
|
||||||
|
|
||||||
|
const QuitText = struct {
|
||||||
|
const text = "Press ctrl+c to quit. Press ctrl+n to launch helix.";
|
||||||
|
|
||||||
|
pub fn element(this: *@This()) App.Element {
|
||||||
|
return .{ .ptr = this, .vtable = &.{ .content = content } };
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Size) !void {
|
||||||
|
_ = ctx;
|
||||||
|
std.debug.assert(cells.len == @as(usize, size.cols) * @as(usize, size.rows));
|
||||||
|
|
||||||
|
const row = 2;
|
||||||
|
const col = size.cols / 2 -| (text.len / 2);
|
||||||
|
const anchor = (row * size.cols) + col;
|
||||||
|
|
||||||
|
for (text, 0..) |cp, idx| {
|
||||||
|
cells[anchor + idx].style.fg = .white;
|
||||||
|
cells[anchor + idx].style.bg = .black;
|
||||||
|
cells[anchor + idx].cp = cp;
|
||||||
|
|
||||||
|
// NOTE: do not write over the contents of this `Container`'s `Size`
|
||||||
|
if (anchor + idx == cells.len - 1) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
pub fn main() !void {
|
||||||
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
|
// TODO: maybe create own allocator as some sort of arena allocator to have consistent memory usage
|
||||||
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
|
|
||||||
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
|
var app: App = .init;
|
||||||
|
var renderer = zterm.Renderer.Buffered.init(allocator);
|
||||||
|
defer renderer.deinit();
|
||||||
|
|
||||||
|
var quit_text: QuitText = .{};
|
||||||
|
|
||||||
|
// TODO: what should the demo application do?
|
||||||
|
// - some sort of chat? -> write messages and have them displayed in a scrollable array at the right hand side?
|
||||||
|
// - on the left some buttons?
|
||||||
|
var box = try App.Container.init(allocator, .{
|
||||||
|
.layout = .{
|
||||||
|
.gap = 1,
|
||||||
|
.padding = .vertical(2),
|
||||||
|
},
|
||||||
|
.min_size = .{ .cols = 50 },
|
||||||
|
}, .{});
|
||||||
|
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 },
|
||||||
|
}, .{}));
|
||||||
|
defer box.deinit();
|
||||||
|
|
||||||
|
var scrollable: App.Scrollable = .{
|
||||||
|
.container = box,
|
||||||
|
};
|
||||||
|
|
||||||
|
var container = try App.Container.init(allocator, .{
|
||||||
|
.border = .{
|
||||||
|
.separator = .{
|
||||||
|
.enabled = true,
|
||||||
|
.line = .double,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
.layout = .{
|
||||||
|
.gap = 2,
|
||||||
|
.padding = .{ .top = 5, .bottom = 3, .left = 3, .right = 3 },
|
||||||
|
.direction = .horizontal,
|
||||||
|
},
|
||||||
|
}, quit_text.element());
|
||||||
|
try container.append(try App.Container.init(allocator, .{}, scrollable.element()));
|
||||||
|
|
||||||
|
try container.append(try App.Container.init(allocator, .{
|
||||||
|
.border = .{
|
||||||
|
.color = .light_blue,
|
||||||
|
.sides = .all,
|
||||||
|
},
|
||||||
|
}, .{}));
|
||||||
|
try container.append(try App.Container.init(allocator, .{
|
||||||
|
.rectangle = .{ .fill = .blue },
|
||||||
|
}, .{}));
|
||||||
|
defer container.deinit(); // also de-initializes the children
|
||||||
|
|
||||||
|
try app.start();
|
||||||
|
defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
|
||||||
|
|
||||||
|
// event loop
|
||||||
|
while (true) {
|
||||||
|
const event = app.nextEvent();
|
||||||
|
log.debug("received event: {s}", .{@tagName(event)});
|
||||||
|
|
||||||
|
switch (event) {
|
||||||
|
.init => continue,
|
||||||
|
.quit => break,
|
||||||
|
.resize => |size| try renderer.resize(size),
|
||||||
|
.key => |key| {
|
||||||
|
if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit();
|
||||||
|
|
||||||
|
if (key.eql(.{ .cp = 'n', .mod = .{ .ctrl = true } })) {
|
||||||
|
try app.interrupt();
|
||||||
|
defer app.start() catch @panic("could not start app event loop");
|
||||||
|
var child = std.process.Child.init(&.{"hx"}, allocator);
|
||||||
|
_ = child.spawnAndWait() catch |err| app.postEvent(.{
|
||||||
|
.err = .{
|
||||||
|
.err = err,
|
||||||
|
.msg = "Spawning $EDITOR failed",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// NOTE: errors could be displayed in another container in case one was received, etc. to provide the user with feedback
|
||||||
|
.err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
|
||||||
|
else => {},
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: returned errors should be propagated back to the application
|
||||||
|
container.handle(event) catch |err| app.postEvent(.{
|
||||||
|
.err = .{
|
||||||
|
.err = err,
|
||||||
|
.msg = "Container Event handling failed",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
try renderer.render(@TypeOf(container), &container);
|
||||||
|
try renderer.flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -52,9 +52,7 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
|
|||||||
@@ -72,9 +72,7 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
|
|||||||
@@ -101,9 +101,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
@@ -38,9 +38,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
@@ -38,9 +38,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
@@ -38,9 +38,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
@@ -38,9 +38,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
@@ -35,9 +35,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
@@ -86,9 +86,8 @@ pub fn main() !void {
|
|||||||
errdefer |err| log.err("Application Error: {any}", .{err});
|
errdefer |err| log.err("Application Error: {any}", .{err});
|
||||||
|
|
||||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
|
||||||
defer if (gpa.deinit() == .leak) {
|
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
|
||||||
log.err("memory leak", .{});
|
|
||||||
};
|
|
||||||
const allocator = gpa.allocator();
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
var app: App = .init;
|
var app: App = .init;
|
||||||
|
|||||||
Reference in New Issue
Block a user