add(example): WIP popup Element example implementation

.gitea/workflows/release.yaml

@@ -15,15 +15,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup zig installation
-        uses: https://codeberg.org/mlugg/setup-zig@v2
+        uses: mlugg/setup-zig@v2
         with:
-          version: latest
+          version: master
-      - name: Lint check
-        run: zig fmt --check .
-      - name: Spell checking
-        uses: crate-ci/typos@v1.39.0
-        with:
-          config: ./.typos-config
       - name: Run tests
         run: zig build --release=fast
       - name: Release build artifacts

.gitea/workflows/test.yaml

@@ -14,13 +14,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup zig installation
-        uses: https://codeberg.org/mlugg/setup-zig@v2
+        uses: mlugg/setup-zig@v2
         with:
-          version: latest
+          version: master
       - name: Lint check
         run: zig fmt --check --exclude src/test .
       - name: Spell checking
-        uses: crate-ci/typos@v1.39.0
+        uses: crate-ci/typos@v1.25.0
         with:
           config: ./.typos-config
       - name: Run tests

README.md

@@ -2,6 +2,9 @@
 
 `zterm` is a terminal user interface library (*tui*) to implement terminal (fullscreen or inline) applications.
 
+> [!CAUTION]
+> Only builds using the zig master version are tested to work.
+
 ## Demo
 
 Clone this repository and run `zig build --help` to see the available examples. Run a given example as follows:
@@ -10,7 +13,7 @@ Clone this repository and run `zig build --help` to see the available examples.
 zig build --release=safe -Dexample=demo run
 ```
 
-> [!tip]
+> [!TIP]
 > Every example application can be quit using `ctrl+c`.
 
 See the [wiki](https://gitea.yves-biener.de/yves-biener/zterm/wiki) for a showcase of the examples and the further details.
@@ -30,6 +33,8 @@ const zterm: *Dependency = b.dependency("zterm", .{
     .target = target,
     .optimize = optimize,
 });
+// ...
+exe.root_module.addImport("zterm", zterm.module("zterm"));
 ```
 
 ### Documentation

build.zig

@@ -10,10 +10,9 @@ pub fn build(b: *std.Build) void {
         alignment,
         button,
         input,
+        popup,
         progress,
-        radio_button,
         scrollable,
-        selection,
         // layouts:
         vertical,
         horizontal,
@@ -24,8 +23,6 @@ pub fn build(b: *std.Build) void {
         palette,
         // error handling
         errors,
-        // non alternate screen applications
-        direct,
     };
 
     const example = b.option(Examples, "example", "Example to build and/or run. (default: all)") orelse .all;
@@ -37,15 +34,20 @@ pub fn build(b: *std.Build) void {
     options.addOption(bool, "debug", debug_rendering);
     const options_module = options.createModule();
 
+    // dependencies
+    const zg = b.dependency("zg", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
     // library
     const lib = b.addModule("zterm", .{
         .root_source_file = b.path("src/root.zig"),
         .target = target,
         .optimize = optimize,
-        .imports = &.{
-            .{ .name = "build_options", .module = options_module },
-        },
     });
+    lib.addImport("code_point", zg.module("code_point"));
+    lib.addImport("build_options", options_module);
 
     //--- Examples ---
     const examples = std.meta.fields(Examples);
@@ -53,54 +55,46 @@ pub fn build(b: *std.Build) void {
         if (@as(Examples, @enumFromInt(e.value)) == .all) continue; // skip `.all` entry
         const demo = b.addExecutable(.{
             .name = e.name,
-            .root_module = b.createModule(.{
+            .root_source_file = b.path(switch (@as(Examples, @enumFromInt(e.value))) {
-                .root_source_file = b.path(switch (@as(Examples, @enumFromInt(e.value))) {
+                .demo => "examples/demo.zig",
-                    .demo => "examples/demo.zig",
+                .continuous => "examples/continuous.zig",
-                    .continuous => "examples/continuous.zig",
+                // elements:
-                    // elements:
+                .alignment => "examples/elements/alignment.zig",
-                    .alignment => "examples/elements/alignment.zig",
+                .button => "examples/elements/button.zig",
-                    .button => "examples/elements/button.zig",
+                .input => "examples/elements/input.zig",
-                    .input => "examples/elements/input.zig",
+                .popup => "examples/elements/popup.zig",
-                    .progress => "examples/elements/progress.zig",
+                .progress => "examples/elements/progress.zig",
-                    .radio_button => "examples/elements/radio-button.zig",
+                .scrollable => "examples/elements/scrollable.zig",
-                    .scrollable => "examples/elements/scrollable.zig",
+                // layouts:
-                    .selection => "examples/elements/selection.zig",
+                .vertical => "examples/layouts/vertical.zig",
-                    // layouts:
+                .horizontal => "examples/layouts/horizontal.zig",
-                    .vertical => "examples/layouts/vertical.zig",
+                .grid => "examples/layouts/grid.zig",
-                    .horizontal => "examples/layouts/horizontal.zig",
+                .mixed => "examples/layouts/mixed.zig",
-                    .grid => "examples/layouts/grid.zig",
+                // styles:
-                    .mixed => "examples/layouts/mixed.zig",
+                .text => "examples/styles/text.zig",
-                    // styles:
+                .palette => "examples/styles/palette.zig",
-                    .text => "examples/styles/text.zig",
+                // error handling
-                    .palette => "examples/styles/palette.zig",
+                .errors => "examples/errors.zig",
-                    // error handling
+                .all => unreachable, // should never happen
-                    .errors => "examples/errors.zig",
-                    // non-alternate screen
-                    .direct => "examples/direct.zig",
-                    .all => unreachable, // should never happen
-                }),
-                .target = target,
-                .optimize = optimize,
-                .imports = &.{
-                    .{ .name = "zterm", .module = lib },
-                },
             }),
+            .target = target,
+            .optimize = optimize,
         });
+        // import dependencies
+        demo.root_module.addImport("zterm", lib);
         // mapping of user selected example to compile step
         if (@intFromEnum(example) == e.value or example == .all) b.installArtifact(demo);
     }
 
     // zig build test
     const lib_unit_tests = b.addTest(.{
-        .root_module = b.createModule(.{
+        .root_source_file = b.path("src/root.zig"),
-            .root_source_file = b.path("src/root.zig"),
+        .target = target,
-            .target = target,
+        .optimize = optimize,
-            .optimize = optimize,
-            .imports = &.{
-                .{ .name = "build_options", .module = options_module },
-            },
-        }),
     });
+    lib_unit_tests.root_module.addImport("code_point", zg.module("code_point"));
+    lib_unit_tests.root_module.addImport("DisplayWidth", zg.module("DisplayWidth"));
+    lib_unit_tests.root_module.addImport("build_options", options_module);
 
     const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests);
 

build.zig.zon

@@ -35,7 +35,12 @@
     // `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
     // Once all dependencies are fetched, `zig build` no longer requires
     // internet connectivity.
-    .dependencies = .{},
+    .dependencies = .{
+        .zg = .{
+            .url = "git+https://codeberg.org/atman/zg#9427a9e53aaa29ee071f4dcb35b809a699d75aa9",
+            .hash = "zg-0.14.1-oGqU3IQ_tALZIiBN026_NTaPJqU-Upm8P_C7QED2Rzm8",
+        },
+    },
     .paths = .{
         "LICENSE",
         "build.zig",

examples/continuous.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -41,7 +41,7 @@ const Spinner = struct {
         };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -57,20 +57,18 @@ const Spinner = struct {
 };
 
 const InputField = struct {
-    allocator: std.mem.Allocator,
     input: std.ArrayList(u21),
     queue: *App.Queue,
 
     pub fn init(allocator: std.mem.Allocator, queue: *App.Queue) @This() {
         return .{
-            .allocator = allocator,
+            .input = .init(allocator),
-            .input = std.ArrayList(u21).initCapacity(allocator, 8) catch unreachable,
             .queue = queue,
         };
     }
 
-    pub fn deinit(this: *@This()) void {
+    pub fn deinit(this: @This()) void {
-        this.input.deinit(this.allocator);
+        this.input.deinit();
     }
 
     pub fn element(this: *@This()) App.Element {
@@ -83,14 +81,14 @@ const InputField = struct {
         };
     }
 
-    fn handle(ctx: *anyopaque, _: *App.Model, event: App.Event) !void {
+    fn handle(ctx: *anyopaque, event: App.Event) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         switch (event) {
             .key => |key| {
-                if (key.isUnicode()) try this.input.append(this.allocator, key.cp);
+                if (key.isAscii()) try this.input.append(key.cp);
 
                 if (key.eql(.{ .cp = zterm.input.Enter }) or key.eql(.{ .cp = zterm.input.KpEnter }))
-                    this.queue.push(.{ .accept = try this.input.toOwnedSlice(this.allocator) });
+                    this.queue.push(.{ .accept = try this.input.toOwnedSlice() });
 
                 if (key.eql(.{ .cp = zterm.input.Backspace }))
                     _ = this.input.pop();
@@ -102,7 +100,7 @@ const InputField = struct {
         }
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -133,7 +131,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -153,7 +151,7 @@ pub fn main() !void {
     defer container.deinit();
 
     try container.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgrey },
+        .rectangle = .{ .fill = .light_grey },
         .size = .{
             .grow = .horizontal,
             .dim = .{ .y = 10 },
@@ -161,11 +159,11 @@ pub fn main() !void {
     }, input_field.element()));
 
     const nested_container: App.Container = try .init(allocator, .{
-        .rectangle = .{ .fill = .lightgrey },
+        .rectangle = .{ .fill = .light_grey },
     }, spinner.element());
     try container.append(nested_container);
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     var framerate: u64 = 60;
@@ -178,7 +176,7 @@ pub fn main() !void {
         if (now_ms >= next_frame_ms) {
             next_frame_ms = now_ms + tick_ms;
         } else {
-            std.Thread.sleep((next_frame_ms - now_ms) * time.ns_per_ms);
+            time.sleep((next_frame_ms - now_ms) * time.ns_per_ms);
             next_frame_ms += tick_ms;
         }
 
@@ -214,7 +212,7 @@ pub fn main() !void {
                 else => {},
             }
 
-            container.handle(&app.model, event) catch |err| app.postEvent(.{
+            container.handle(event) catch |err| app.postEvent(.{
                 .err = .{
                     .err = err,
                     .msg = "Container Event handling failed",
@@ -228,9 +226,9 @@ pub fn main() !void {
             }
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -242,6 +240,6 @@ const std = @import("std");
 const time = std.time;
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {
+const App = zterm.App(union(enum) {
     accept: []u21,
 });

examples/demo.zig

@@ -1,11 +1,11 @@
 const QuitText = struct {
-    const text = "Press ctrl+c to quit. Press ctrl+n to launch `vim`.";
+    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, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    pub fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -27,12 +27,13 @@ const QuitText = struct {
 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.DebugAllocator(.{}) = .init;
     defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -56,14 +57,15 @@ pub fn main() !void {
         },
     }, .{});
     try box.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgreen },
+        .rectangle = .{ .fill = .light_green },
     }, .{}));
     try box.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgreen },
+        .rectangle = .{ .fill = .light_green },
     }, .{}));
     try box.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgreen },
+        .rectangle = .{ .fill = .light_green },
     }, .{}));
+    defer box.deinit();
 
     var scrollable: App.Scrollable = .init(box, .disabled);
 
@@ -90,7 +92,7 @@ pub fn main() !void {
             .direction = .vertical,
         },
         .border = .{
-            .color = .lightblue,
+            .color = .light_blue,
             .sides = .all,
         },
     }, .{});
@@ -133,7 +135,7 @@ pub fn main() !void {
     }, .{}));
     defer container.deinit(); // also de-initializes the children
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -149,8 +151,8 @@ pub fn main() !void {
                 if (key.eql(.{ .cp = 'n', .mod = .{ .ctrl = true } })) {
                     try app.interrupt();
                     renderer.size = .{}; // reset size, such that next resize will cause a full re-draw!
-                    defer app.start(.full) catch @panic("could not start app event loop");
+                    defer app.start() catch @panic("could not start app event loop");
-                    var child = std.process.Child.init(&.{"vim"}, allocator);
+                    var child = std.process.Child.init(&.{"hx"}, allocator);
                     _ = child.spawnAndWait() catch |err| app.postEvent(.{
                         .err = .{
                             .err = err,
@@ -166,7 +168,7 @@ pub fn main() !void {
         }
 
         // NOTE returned errors should be propagated back to the application
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -179,9 +181,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -193,4 +195,4 @@ const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
 const input = zterm.input;
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/direct.zig

@@ -1,192 +0,0 @@
-const QuitText = struct {
-    const text = "Press ctrl+c to quit.";
-
-    pub fn element(this: *@This()) App.Element {
-        return .{
-            .ptr = this,
-            .vtable = &.{
-                .minSize = minSize,
-                .content = content,
-            },
-        };
-    }
-
-    fn minSize(_: *anyopaque, _: *const App.Model, size: zterm.Point) zterm.Point {
-        return .{ .x = size.x, .y = 10 }; // this includes the border
-    }
-
-    pub fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
-        _ = ctx;
-        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
-
-        const y = 0;
-        const x = 2;
-        const anchor = (y * size.x) + x;
-
-        for (text, 0..) |cp, idx| {
-            cells[anchor + idx].style.fg = .white;
-            cells[anchor + idx].style.emphasis = &.{ .bold, .underline };
-            cells[anchor + idx].cp = cp;
-
-            // NOTE do not write over the contents of this `Container`'s `Size`
-            if (anchor + idx == cells.len - 1) break;
-        }
-    }
-};
-
-const Prompt = struct {
-    len: u16 = 3,
-    pub fn element(this: *@This()) App.Element {
-        return .{
-            .ptr = this,
-            .vtable = &.{
-                // .minSize = minSize,
-                .content = content,
-            },
-        };
-    }
-
-    // NOTE size hint is not required as the `.size = .{ .dim = .{..} }` property is set accordingly which denotes the minimal size
-    // fn minSize(ctx: *anyopaque, _: *const App.Model, _: zterm.Point) zterm.Point {
-    //     const this: *@This() = @ptrCast(@alignCast(ctx));
-    //     return .{ .x = this.len, .y = 1 };
-    // }
-
-    pub fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
-        const this: *@This() = @ptrCast(@alignCast(ctx));
-        assert(cells.len > 2); // expect at least two cells
-        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
-
-        for (0..this.len) |idx| {
-            cells[idx].style.bg = .blue;
-            cells[idx].style.fg = .black;
-            cells[idx].style.emphasis = &.{.bold};
-        }
-        cells[1].cp = '>';
-        // leave one clear whitespace after the prompt
-        cells[this.len].style.bg = .default;
-        cells[this.len].style.cursor = true; // marks the actual end of the rendering!
-    }
-};
-
-pub fn main() !void {
-    errdefer |err| log.err("Application Error: {any}", .{err});
-
-    var allocator: std.heap.DebugAllocator(.{}) = .init;
-    defer if (allocator.deinit() == .leak) log.err("memory leak", .{});
-
-    const gpa = allocator.allocator();
-
-    var app: App = .init(gpa, .{}, .{});
-    var renderer = zterm.Renderer.Direct.init(gpa);
-    defer renderer.deinit();
-
-    var container: App.Container = try .init(gpa, .{
-        .layout = .{
-            .direction = .vertical,
-            .gap = 1, // show empty line between elements to allow navigation through paragraph jumping
-        },
-        .size = .{
-            .grow = .horizontal_only,
-        },
-    }, .{});
-    defer container.deinit();
-
-    var quit_text: QuitText = .{};
-    var intermediate: App.Container = try .init(gpa, .{
-        .border = .{
-            .sides = .{ .left = true },
-            .color = .grey,
-        },
-        .layout = .{
-            .direction = .horizontal,
-            .padding = .{ .left = 1, .top = 1 },
-        },
-    }, quit_text.element());
-    try intermediate.append(try .init(gpa, .{
-        .rectangle = .{ .fill = .blue },
-    }, .{}));
-
-    try intermediate.append(try .init(gpa, .{
-        .rectangle = .{ .fill = .green },
-    }, .{}));
-
-    var padding_container: App.Container = try .init(gpa, .{
-        .layout = .{
-            .padding = .horizontal(1),
-        },
-    }, .{});
-    try padding_container.append(intermediate);
-    try container.append(padding_container);
-
-    var prompt: Prompt = .{};
-    try container.append(try .init(gpa, .{
-        .rectangle = .{ .fill = .grey },
-        .size = .{
-            .dim = .{ .y = 1 },
-        },
-    }, prompt.element()));
-
-    try app.start(.direct); // needs to become configurable, as what should be enabled / disabled (i.e. show cursor, hide cursor, use alternate screen, etc.)
-    defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
-
-    // event loop
-    event: while (true) {
-        // batch events since last iteration
-        const len = blk: {
-            app.queue.poll();
-            app.queue.lock();
-            defer app.queue.unlock();
-            break :blk app.queue.len();
-        };
-
-        // handle events
-        for (0..len) |_| {
-            const event = app.queue.pop();
-            log.debug("received event: {s}", .{@tagName(event)});
-
-            // pre event handling
-            switch (event) {
-                // NOTE draw the character with the ctrl indication and a newline to make sure the rendering stays consistent
-                .cancel => try renderer.writeCtrlDWithNewline(),
-                .line => |line| {
-                    defer gpa.free(line);
-                    log.debug("{s}", .{line});
-                },
-                // 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(&app.model, event) catch |err| app.postEvent(.{
-                .err = .{
-                    .err = err,
-                    .msg = "Container Event handling failed",
-                },
-            });
-
-            // post event handling
-            switch (event) {
-                .quit => break :event,
-                else => {},
-            }
-        }
-        // if there are more events to process continue handling them otherwise I can render the next frame
-        if (app.queue.len() > 0) continue :event;
-
-        container.resize(&app.model, try renderer.resize());
-        container.reposition(&app.model, .{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
-    }
-}
-
-pub const panic = App.panic_handler;
-const log = std.log.scoped(.default);
-
-const std = @import("std");
-const assert = std.debug.assert;
-const zterm = @import("zterm");
-const input = zterm.input;
-const App = zterm.App(struct {}, union(enum) {});

examples/elements/alignment.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -32,7 +32,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -55,7 +55,7 @@ pub fn main() !void {
     var alignment: App.Alignment = .init(quit_container, .center);
     try container.append(try .init(allocator, .{}, alignment.element()));
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -70,7 +70,7 @@ pub fn main() !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -83,9 +83,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -96,4 +96,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/elements/button.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -40,7 +40,7 @@ const Clickable = struct {
         };
     }
 
-    fn handle(ctx: *anyopaque, _: *App.Model, event: App.Event) !void {
+    fn handle(ctx: *anyopaque, event: App.Event) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         switch (event) {
             .mouse => |mouse| if (mouse.button == .left and mouse.kind == .release) {
@@ -55,7 +55,7 @@ const Clickable = struct {
         }
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -82,7 +82,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -99,10 +99,10 @@ pub fn main() !void {
     }, quit_text.element());
     defer container.deinit();
 
-    try container.append(try App.Container.init(allocator, .{ .rectangle = .{ .fill = .lightgrey } }, element));
+    try container.append(try App.Container.init(allocator, .{ .rectangle = .{ .fill = .light_grey } }, element));
     try container.append(try App.Container.init(allocator, .{ .rectangle = .{ .fill = .black } }, button.element()));
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -119,7 +119,7 @@ pub fn main() !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -132,9 +132,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -145,10 +145,7 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(
+const App = zterm.App(union(enum) {
-    struct {},
+    click: [:0]const u8,
-    union(enum) {
+    accept,
-        click: [:0]const u8,
+});
-        accept,
-    },
-);

examples/elements/input.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -37,7 +37,7 @@ const MouseDraw = struct {
         };
     }
 
-    fn handle(ctx: *anyopaque, _: *App.Model, event: App.Event) !void {
+    fn handle(ctx: *anyopaque, event: App.Event) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         switch (event) {
             .mouse => |mouse| this.position = .{ .x = mouse.x, .y = mouse.y },
@@ -45,7 +45,7 @@ const MouseDraw = struct {
         }
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
         const this: *@This() = @ptrCast(@alignCast(ctx));
 
@@ -65,11 +65,13 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
-    var input_field: App.Input(.accept) = .init(allocator, &app.queue, .init(.black, .blue));
+    var input_field: App.Input(.accept) = .init(allocator, &app.queue, .init(.black));
+    defer input_field.deinit();
+
     var mouse_draw: MouseDraw = .{};
     var second_mouse_draw: MouseDraw = .{};
     var quit_text: QuitText = .{};
@@ -84,7 +86,7 @@ pub fn main() !void {
     defer container.deinit();
 
     try container.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgrey },
+        .rectangle = .{ .fill = .light_grey },
         .size = .{
             .grow = .horizontal,
             .dim = .{ .y = 1 },
@@ -96,7 +98,7 @@ pub fn main() !void {
             .sides = .all,
             .color = .black,
         },
-        .rectangle = .{ .fill = .lightgrey },
+        .rectangle = .{ .fill = .light_grey },
         .layout = .{
             .separator = .{
                 .enabled = true,
@@ -105,14 +107,14 @@ pub fn main() !void {
         },
     }, .{});
     try nested_container.append(try .init(allocator, .{
-        .rectangle = .{ .fill = .lightgrey },
+        .rectangle = .{ .fill = .light_grey },
     }, mouse_draw.element()));
     try nested_container.append(try .init(allocator, .{
-        .rectangle = .{ .fill = .lightgrey },
+        .rectangle = .{ .fill = .light_grey },
     }, second_mouse_draw.element()));
     try container.append(nested_container);
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -131,7 +133,7 @@ pub fn main() !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -144,9 +146,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -159,9 +161,6 @@ const assert = std.debug.assert;
 const zterm = @import("zterm");
 const Color = zterm.Color;
 
-const App = zterm.App(
+const App = zterm.App(union(enum) {
-    struct {},
+    accept: []u8,
-    union(enum) {
+});
-        accept: []u8,
-    },
-);

examples/elements/popup.zig

@@ -0,0 +1,247 @@
+const QuitText = struct {
+    const text = "Press ctrl+c to quit.";
+
+    pub fn element(this: *@This()) App.Element {
+        return .{ .ptr = this, .vtable = &.{ .content = content } };
+    }
+
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
+        _ = ctx;
+        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
+
+        const row = 2;
+        const col = size.x / 2 -| (text.len / 2);
+        const anchor = (row * size.x) + 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;
+        }
+    }
+};
+
+const MouseDraw = struct {
+    position: ?zterm.Point = null,
+
+    pub fn element(this: *@This()) App.Element {
+        return .{
+            .ptr = this,
+            .vtable = &.{
+                .handle = handle,
+                .content = content,
+            },
+        };
+    }
+
+    fn handle(ctx: *anyopaque, event: App.Event) !void {
+        const this: *@This() = @ptrCast(@alignCast(ctx));
+        switch (event) {
+            .mouse => |mouse| this.position = .{ .x = mouse.x, .y = mouse.y },
+            else => this.position = null,
+        }
+    }
+
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
+        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
+        const this: *@This() = @ptrCast(@alignCast(ctx));
+
+        if (this.position) |pos| {
+            const idx = @as(usize, size.x) * @as(usize, pos.y) + @as(usize, pos.x);
+            cells[idx].cp = 'x';
+            cells[idx].style.fg = .red;
+        }
+    }
+};
+
+const Popup = struct {
+    container: ?*App.Container = null,
+
+    pub fn element(this: *@This()) App.Element {
+        return .{
+            .ptr = this,
+            .vtable = &.{
+                .resize = resize,
+                .reposition = reposition,
+                .handle = handle,
+                .content = content,
+            },
+        };
+    }
+
+    fn resize(ctx: *anyopaque, size: zterm.Point) void {
+        const this: *@This() = @ptrCast(@alignCast(ctx));
+        if (this.container) |container| container.resize(size);
+    }
+
+    fn reposition(ctx: *anyopaque, _: zterm.Point) void {
+        const this: *@This() = @ptrCast(@alignCast(ctx));
+        if (this.container) |container| container.reposition(.{});
+    }
+
+    fn handle(ctx: *anyopaque, event: App.Event) !void {
+        const this: *@This() = @ptrCast(@alignCast(ctx));
+        switch (event) {
+            // TODO should the `Element` handle the pop_down element triggering (i.e. by defining a usual key for this?)
+            .pop_up => |optional| if (optional) |container| {
+                this.container = @ptrCast(@alignCast(container));
+            } else {
+                this.container = null;
+            },
+            else => if (this.container) |container| try container.handle(event),
+        }
+    }
+
+    fn render_container(container: App.Container, cells: []zterm.Cell, container_size: zterm.Point) !void {
+        const size = container.size;
+        const origin = container.origin;
+        const contents = try container.content();
+
+        const anchor = (@as(usize, origin.y) * @as(usize, container_size.x)) + @as(usize, origin.x);
+
+        var idx: usize = 0;
+        blk: for (0..size.y) |row| {
+            for (0..size.x) |col| {
+                cells[anchor + (row * container_size.x) + col] = contents[idx];
+                idx += 1;
+
+                if (contents.len == idx) break :blk;
+            }
+        }
+        // free immediately
+        container.allocator.free(contents);
+
+        for (container.elements.items) |child| try render_container(child, cells, size);
+    }
+
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
+        const this: *@This() = @ptrCast(@alignCast(ctx));
+        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
+
+        if (this.container) |container| {
+            assert(cells.len == @as(usize, container.size.x) * @as(usize, container.size.y));
+            const popup_cells = try container.content();
+
+            for (container.elements.items) |child| try render_container(child, popup_cells, size);
+
+            assert(cells.len == popup_cells.len);
+            @memcpy(cells, popup_cells);
+
+            container.allocator.free(popup_cells);
+        }
+    }
+};
+
+pub fn main() !void {
+    errdefer |err| log.err("Application Error: {any}", .{err});
+
+    var gpa: std.heap.DebugAllocator(.{}) = .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 popup: Popup = .{};
+    var quit_text: QuitText = .{};
+
+    // TODO
+    // - rendering of first Container contents will be overwritten by contents of the appended Container's (see the missing blue rectangle)
+    // - when rendering "nothing" it causes the below Container to be overwritten to "nothing" too!
+    // - not sure how this should be done?
+    //   - provide the pop-up with a  area where to draw? (i.e. somewhere to draw the provided `Container`)
+    //   - This however will not suffice as the contents will be overwritten!
+
+    var container = try App.Container.init(allocator, .{
+        .rectangle = .{
+            .fill = .blue,
+        },
+    }, .{});
+    defer container.deinit();
+
+    var popup_root_container = try App.Container.init(allocator, .{
+        .layout = .{
+            .padding = .{
+                .top = -17,
+                .left = -40,
+                .right = 5,
+                .bottom = 5,
+            },
+        },
+    }, .{});
+    try popup_root_container.append(try App.Container.init(allocator, .{}, popup.element()));
+
+    try container.append(try .init(allocator, .{}, quit_text.element()));
+    try container.append(popup_root_container); // FIXME it should not be appended (as it would become part of the layout)
+
+    var mouse: MouseDraw = .{};
+    var popup_container: App.Container = try .init(allocator, .{
+        .rectangle = .{ .fill = .green },
+        .layout = .{
+            .padding = .{
+                .top = -4,
+                .bottom = 1,
+                .left = 3,
+                .right = 3,
+            },
+        },
+    }, .{});
+    // showcase that inner `Container`s handle `Element`s accordingly
+    try popup_container.append(try .init(allocator, .{
+        .rectangle = .{ .fill = .grey },
+    }, mouse.element()));
+    defer popup_container.deinit();
+
+    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)});
+
+        // pre event handling
+        switch (event) {
+            .key => |key| {
+                if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit();
+                if (key.eql(.{ .cp = zterm.input.Space })) app.postEvent(.{ .pop_up = &popup_container });
+                if (key.eql(.{ .cp = zterm.input.Escape })) app.postEvent(.{ .pop_up = null });
+            },
+            .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
+            else => {},
+        }
+
+        container.handle(event) catch |err| app.postEvent(.{
+            .err = .{
+                .err = err,
+                .msg = "Container Event handling failed",
+            },
+        });
+
+        // post event handling
+        switch (event) {
+            .quit => break,
+            else => {},
+        }
+
+        container.resize(try renderer.resize());
+        container.reposition(.{});
+        try renderer.render(@TypeOf(container), &container);
+        try renderer.flush();
+    }
+}
+
+pub const panic = App.panic_handler;
+const log = std.log.scoped(.default);
+
+const std = @import("std");
+const assert = std.debug.assert;
+const zterm = @import("zterm");
+const App = zterm.App(union(enum) {
+    pop_up: ?*anyopaque,
+});

examples/elements/progress.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -32,60 +32,26 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
     var progress_percent: u8 = 0;
+    var progress: App.Progress(.progress) = .init(&app.queue, .{
+        .percent = .{ .enabled = true },
+        .fg = .green,
+        .bg = .grey,
+    });
     var quit_text: QuitText = .{};
 
     var container = try App.Container.init(allocator, .{
-        .layout = .{ .padding = .all(5), .direction = .vertical },
+        .layout = .{ .padding = .all(5) },
     }, quit_text.element());
     defer container.deinit();
 
-    {
+    try container.append(try App.Container.init(allocator, .{}, progress.element()));
-        var progress: App.Progress(.progress) = .init(&app.queue, .{
+
-            .percent = .{
+    try app.start();
-                .enabled = true,
-                .alignment = .left,
-            },
-            .fg = .blue,
-            .bg = .grey,
-        });
-        try container.append(try App.Container.init(allocator, .{}, progress.element()));
-    }
-    {
-        var progress: App.Progress(.progress) = .init(&app.queue, .{
-            .percent = .{
-                .enabled = true,
-                .alignment = .middle, // default
-            },
-            .fg = .red,
-            .bg = .grey,
-        });
-        try container.append(try App.Container.init(allocator, .{}, progress.element()));
-    }
-    {
-        var progress: App.Progress(.progress) = .init(&app.queue, .{
-            .percent = .{
-                .enabled = true,
-                .alignment = .right,
-            },
-            .fg = .green,
-            .bg = .grey,
-        });
-        try container.append(try App.Container.init(allocator, .{}, progress.element()));
-    }
-    {
-        var progress: App.Progress(.progress) = .init(&app.queue, .{
-            .percent = .{ .enabled = false },
-            .fg = .default,
-            .bg = .grey,
-        });
-        try container.append(try App.Container.init(allocator, .{}, progress.element()));
-    }
-    try app.start(.full);
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     var framerate: u64 = 60;
@@ -101,7 +67,7 @@ pub fn main() !void {
         if (now_ms >= next_frame_ms) {
             next_frame_ms = now_ms + tick_ms;
         } else {
-            std.Thread.sleep((next_frame_ms - now_ms) * time.ns_per_ms);
+            time.sleep((next_frame_ms - now_ms) * time.ns_per_ms);
             next_frame_ms += tick_ms;
         }
 
@@ -138,7 +104,7 @@ pub fn main() !void {
                 else => {},
             }
 
-            container.handle(&app.model, event) catch |err| app.postEvent(.{
+            container.handle(event) catch |err| app.postEvent(.{
                 .err = .{
                     .err = err,
                     .msg = "Container Event handling failed",
@@ -152,9 +118,9 @@ pub fn main() !void {
             }
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -166,9 +132,6 @@ const std = @import("std");
 const time = std.time;
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(
+const App = zterm.App(union(enum) {
-    struct {},
+    progress: u8,
-    union(enum) {
+});
-        progress: u8,
-    },
-);

examples/elements/radio-button.zig

@@ -1,98 +0,0 @@
-const QuitText = struct {
-    const text = "Press ctrl+c to quit.";
-
-    pub fn element(this: *@This()) App.Element {
-        return .{ .ptr = this, .vtable = &.{ .content = content } };
-    }
-
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
-        _ = ctx;
-        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
-
-        const row = 2;
-        const col = size.x / 2 -| (text.len / 2);
-        const anchor = (row * size.x) + 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});
-
-    var gpa: std.heap.DebugAllocator(.{}) = .init;
-    defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
-
-    const allocator = gpa.allocator();
-
-    var app: App = .init(allocator, .{}, .{});
-    var renderer = zterm.Renderer.Buffered.init(allocator);
-    defer renderer.deinit();
-
-    var radiobutton: App.RadioButton = .init(false, .{
-        .label = "Test Radio Button",
-        .style = .squared,
-    });
-    var button: App.Button(.accept) = .init(&app.queue, .init(.default, "Button"));
-    var quit_text: QuitText = .{};
-
-    var container = try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .grey },
-        .layout = .{ .padding = .all(5) },
-    }, quit_text.element());
-    defer container.deinit();
-    try container.append(try .init(allocator, .{}, radiobutton.element()));
-    try container.append(try App.Container.init(allocator, .{ .rectangle = .{ .fill = .black } }, button.element()));
-
-    try app.start(.full);
-    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)});
-
-        // pre event handling
-        switch (event) {
-            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit(),
-            .accept => log.info("Clicked built-in button using the mouse", .{}),
-            .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
-            else => {},
-        }
-
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
-            .err = .{
-                .err = err,
-                .msg = "Container Event handling failed",
-            },
-        });
-
-        // post event handling
-        switch (event) {
-            .quit => break,
-            else => {},
-        }
-
-        container.resize(&app.model, try renderer.resize());
-        container.reposition(&app.model, .{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
-    }
-}
-
-pub const panic = App.panic_handler;
-const log = std.log.scoped(.default);
-
-const std = @import("std");
-const assert = std.debug.assert;
-const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {
-    accept,
-});

examples/elements/scrollable.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -34,7 +34,7 @@ const HelloWorldText = packed struct {
         };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -56,6 +56,7 @@ const HelloWorldText = packed struct {
 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.DebugAllocator(.{}) = .init;
     defer {
         const deinit_status = gpa.deinit();
@@ -65,7 +66,7 @@ pub fn main() !void {
     }
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -86,23 +87,24 @@ pub fn main() !void {
         },
     }, .{});
     try top_box.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgreen },
+        .rectangle = .{ .fill = .light_green },
         .size = .{
             .dim = .{ .y = 30 },
         },
     }, .{}));
     try top_box.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgreen },
+        .rectangle = .{ .fill = .light_green },
         .size = .{
             .dim = .{ .y = 5 },
         },
     }, element));
     try top_box.append(try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .lightgreen },
+        .rectangle = .{ .fill = .light_green },
         .size = .{
             .dim = .{ .y = 2 },
         },
     }, .{}));
+    defer top_box.deinit();
 
     var bottom_box = try App.Container.init(allocator, .{
         .border = .{
@@ -130,6 +132,7 @@ pub fn main() !void {
     try bottom_box.append(try App.Container.init(allocator, .{
         .rectangle = .{ .fill = .grey },
     }, .{}));
+    defer bottom_box.deinit();
 
     var container = try App.Container.init(allocator, .{
         .layout = .{
@@ -145,13 +148,13 @@ pub fn main() !void {
     defer container.deinit();
 
     // place empty container containing the element of the scrollable Container.
-    var scrollable_top: App.Scrollable = .init(top_box, .enabled(.default, false));
+    var scrollable_top: App.Scrollable = .init(top_box, .enabled(.grey));
     try container.append(try App.Container.init(allocator, .{}, scrollable_top.element()));
 
-    var scrollable_bottom: App.Scrollable = .init(bottom_box, .enabled(.white, true));
+    var scrollable_bottom: App.Scrollable = .init(bottom_box, .enabled(.white));
     try container.append(try App.Container.init(allocator, .{}, scrollable_bottom.element()));
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -166,7 +169,7 @@ pub fn main() !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -179,9 +182,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -193,4 +196,4 @@ const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
 const input = zterm.input;
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/elements/selection.zig

@@ -1,97 +0,0 @@
-const QuitText = struct {
-    const text = "Press ctrl+c to quit.";
-
-    pub fn element(this: *@This()) App.Element {
-        return .{ .ptr = this, .vtable = &.{ .content = content } };
-    }
-
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
-        _ = ctx;
-        assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
-
-        const row = 2;
-        const col = size.x / 2 -| (text.len / 2);
-        const anchor = (row * size.x) + 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});
-
-    var gpa: std.heap.DebugAllocator(.{}) = .init;
-    defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
-
-    const allocator = gpa.allocator();
-
-    var app: App = .init(allocator, .{}, .{});
-    var renderer = zterm.Renderer.Buffered.init(allocator);
-    defer renderer.deinit();
-
-    var selection: App.Selection(enum {
-        one,
-        two,
-        three,
-    }) = .init(.{
-        .label = "Selection",
-    });
-    var quit_text: QuitText = .{};
-
-    var container = try App.Container.init(allocator, .{
-        .rectangle = .{ .fill = .grey },
-        .layout = .{ .padding = .all(5) },
-    }, quit_text.element());
-    defer container.deinit();
-    try container.append(try .init(allocator, .{}, selection.element()));
-
-    try app.start(.full);
-    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)});
-
-        // pre event handling
-        switch (event) {
-            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit(),
-            .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
-            else => {},
-        }
-
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
-            .err = .{
-                .err = err,
-                .msg = "Container Event handling failed",
-            },
-        });
-
-        // post event handling
-        switch (event) {
-            .quit => break,
-            else => {},
-        }
-
-        container.resize(&app.model, try renderer.resize());
-        container.reposition(&app.model, .{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
-    }
-}
-
-pub const panic = App.panic_handler;
-const log = std.log.scoped(.default);
-
-const std = @import("std");
-const assert = std.debug.assert;
-const zterm = @import("zterm");
-const Error = zterm.Error;
-const App = zterm.App(struct {}, union(enum) {});

examples/errors.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -31,7 +31,7 @@ const InfoText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -57,7 +57,7 @@ const ErrorNotification = struct {
         return .{ .ptr = this, .vtable = &.{ .handle = handle, .content = content } };
     }
 
-    fn handle(ctx: *anyopaque, _: *App.Model, event: App.Event) !void {
+    fn handle(ctx: *anyopaque, event: App.Event) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         switch (event) {
             .key => |key| if (!key.isAscii()) return zterm.Error.TooSmall,
@@ -66,7 +66,7 @@ const ErrorNotification = struct {
         }
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -97,7 +97,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -116,7 +116,7 @@ pub fn main() !void {
     try container.append(try App.Container.init(allocator, .{}, info_text.element()));
     try container.append(try App.Container.init(allocator, .{}, error_notification.element()));
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     while (true) {
@@ -130,7 +130,7 @@ pub fn main() !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -143,9 +143,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -156,4 +156,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/layouts/grid.zig

@@ -8,7 +8,7 @@ const QuitText = struct {
         };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -35,7 +35,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -69,7 +69,7 @@ pub fn main() !void {
     }
     defer container.deinit(); // also de-initializes the children
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -86,7 +86,7 @@ pub fn main() !void {
         }
 
         // NOTE returned errors should be propagated back to the application
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -99,9 +99,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -112,4 +112,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/layouts/horizontal.zig

@@ -8,7 +8,7 @@ const QuitText = struct {
         };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -35,7 +35,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -61,7 +61,7 @@ pub fn main() !void {
     }, .{}));
     defer container.deinit(); // also de-initializes the children
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -78,7 +78,7 @@ pub fn main() !void {
         }
 
         // NOTE returned errors should be propagated back to the application
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -91,9 +91,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -104,4 +104,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/layouts/mixed.zig

@@ -8,7 +8,7 @@ const QuitText = struct {
         };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -35,7 +35,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -77,7 +77,7 @@ pub fn main() !void {
     }
     defer container.deinit(); // also de-initializes the children
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -94,7 +94,7 @@ pub fn main() !void {
         }
 
         // NOTE returned errors should be propagated back to the application
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -107,9 +107,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -120,4 +120,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/layouts/vertical.zig

@@ -8,7 +8,7 @@ const QuitText = struct {
         };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -35,7 +35,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -60,7 +60,7 @@ pub fn main() !void {
     }, .{}));
     defer container.deinit(); // also de-initializes the children
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
@@ -77,7 +77,7 @@ pub fn main() !void {
         }
 
         // NOTE returned errors should be propagated back to the application
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -90,9 +90,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -103,4 +103,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/styles/palette.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -32,7 +32,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -50,6 +50,7 @@ pub fn main() !void {
     var box = try App.Container.init(allocator, .{
         .layout = .{ .direction = .horizontal },
     }, .{});
+    defer box.deinit();
 
     inline for (std.meta.fields(zterm.Color)) |field| {
         if (field.value == 0) continue; // zterm.Color.default == 0 -> skip
@@ -58,7 +59,7 @@ pub fn main() !void {
     var scrollable: App.Scrollable = .init(box, .disabled);
     try container.append(try App.Container.init(allocator, .{}, scrollable.element()));
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
     while (true) {
@@ -72,7 +73,7 @@ pub fn main() !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(event) catch |err| app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -85,9 +86,9 @@ pub fn main() !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(try renderer.resize());
-        container.reposition(&app.model, .{});
+        container.reposition(.{});
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -98,4 +99,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-const App = zterm.App(struct {}, union(enum) {});
+const App = zterm.App(union(enum) {});

examples/styles/text.zig

@@ -5,7 +5,7 @@ const QuitText = struct {
         return .{ .ptr = this, .vtable = &.{ .content = content } };
     }
 
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
 
@@ -24,109 +24,14 @@ const QuitText = struct {
     }
 };
 
-const TableText = struct {
-    pub fn element(this: *@This()) App.Element {
-        return .{
-            .ptr = this,
-            .vtable = &.{
-                .content = content,
-            },
-        };
-    }
-
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
-        _ = ctx;
-        _ = size;
-        var idx: usize = 0;
-        {
-            const text = "Normal ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Bold   ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Dim    ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Italic ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Underl ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Blink  ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Invert ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Hidden ";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-        {
-            const text = "Strikethrough";
-            for (text) |cp| {
-                cells[idx].cp = cp;
-                idx += 1;
-            }
-        }
-    }
-};
-
 const TextStyles = struct {
     const text = "Example";
 
     pub fn element(this: *@This()) App.Element {
-        return .{
+        return .{ .ptr = this, .vtable = &.{ .content = content } };
-            .ptr = this,
-            .vtable = &.{
-                .minSize = minSize,
-                .content = content,
-            },
-        };
     }
 
-    fn minSize(ctx: *anyopaque, _: *const App.Model, size: zterm.Point) zterm.Point {
+    fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void {
-        _ = ctx;
-        _ = size;
-        return .{
-            .x = std.meta.fields(zterm.Style.Emphasis).len * TextStyles.text.len,
-            .y = (std.meta.fields(zterm.Color).len - 1) * (std.meta.fields(zterm.Color).len - 2),
-        };
-    }
-
-    fn content(ctx: *anyopaque, _: *const App.Model, cells: []zterm.Cell, size: zterm.Point) !void {
         @setEvalBranchQuota(10000);
         _ = ctx;
         assert(cells.len == @as(usize, size.x) * @as(usize, size.y));
@@ -178,7 +83,7 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
-    var app: App = .init(allocator, .{}, .{});
+    var app: App = .init;
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 
@@ -189,67 +94,56 @@ pub fn main() !void {
 
     var container = try App.Container.init(allocator, .{
         .layout = .{
-            // .gap = 2,
+            .gap = 2,
             .padding = .{ .top = 5, .bottom = 3, .left = 3, .right = 3 },
-            .direction = .vertical,
         },
     }, element);
     defer container.deinit();
 
-    var table_head: TableText = .{};
+    var box = try App.Container.init(allocator, .{
-    try container.append(try .init(allocator, .{
-        .size = .{
-            .dim = .{ .y = 1 },
-            .grow = .horizontal,
-        },
-    }, table_head.element()));
-
-    var scrollable: App.Scrollable = .init(try .init(allocator, .{
         .layout = .{ .direction = .vertical },
-    }, text_styles.element()), .enabled(.white, true));
+        .size = .{
+            .dim = .{
+                .x = std.meta.fields(zterm.Style.Emphasis).len * TextStyles.text.len,
+                .y = (std.meta.fields(zterm.Color).len - 1) * (std.meta.fields(zterm.Color).len - 2),
+            },
+        },
+    }, text_styles.element());
+    defer box.deinit();
+
+    var scrollable: App.Scrollable = .init(box, .disabled);
     try container.append(try App.Container.init(allocator, .{}, scrollable.element()));
 
-    try app.start(.full);
+    try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
-    // event loop
+    while (true) {
-    loop: while (true) {
+        const event = app.nextEvent();
-        // batch events since last iteration
+        log.debug("received event: {s}", .{@tagName(event)});
-        const len = blk: {
-            app.queue.poll();
-            app.queue.lock();
-            defer app.queue.unlock();
-            break :blk app.queue.len();
-        };
 
-        // handle events
+        // pre event handling
-        for (0..len) |_| {
+        switch (event) {
-            const event = app.queue.pop();
+            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit(),
-            log.debug("handling event: {s}", .{@tagName(event)});
+            .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
-            // pre event handling
+            else => {},
-            switch (event) {
-                .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit(),
-                .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
-                else => {},
-            }
-
-            container.handle(&app.model, event) catch |err| app.postEvent(.{
-                .err = .{
-                    .err = err,
-                    .msg = "Container Event handling failed",
-                },
-            });
-
-            // post event handling
-            switch (event) {
-                .quit => break :loop,
-                else => {},
-            }
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.handle(event) catch |err| app.postEvent(.{
-        container.reposition(&app.model, .{});
+            .err = .{
-        try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
+                .err = err,
+                .msg = "Container Event handling failed",
+            },
+        });
+
+        // post event handling
+        switch (event) {
+            .quit => break,
+            else => {},
+        }
+
+        container.resize(try renderer.resize());
+        container.reposition(.{});
+        try renderer.render(@TypeOf(container), &container);
         try renderer.flush();
     }
 }
@@ -260,5 +154,4 @@ const log = std.log.scoped(.default);
 const std = @import("std");
 const assert = std.debug.assert;
 const zterm = @import("zterm");
-
+const App = zterm.App(union(enum) {});
-const App = zterm.App(struct {}, union(enum) {});

src/app.zig

@@ -12,118 +12,75 @@
 /// ```zig
 ///   const zterm = @import("zterm");
 ///   const App = zterm.App(
-///       struct {}, // empty model
+///       union(enum) {},
-///       union(enum) {}, // no additional user event's
 ///   );
 ///   // later on create an `App` instance and start the event loop
-///   var app: App = .init(io, .{}); // provide instance of the `std.Io` and `App` model that shall be used
+///   var app: App = .init;
-///   try app.start(.full);
+///   try app.start();
-///   defer app.stop() catch unreachable; // does not clean-up the resources used in the model
+///   defer app.stop() catch unreachable;
 /// ```
-pub fn App(comptime M: type, comptime E: type) type {
+pub fn App(comptime E: type) type {
-    if (!isStruct(M)) @compileError("Provided model `M` for `App(comptime M: type, comptime E: type)` is not of type `struct`");
+    if (!isTaggedUnion(E)) {
-    if (!isTaggedUnion(E)) @compileError("Provided user event `E` for `App(comptime M: type, comptime E: type)` is not of type `union(enum)`.");
+        @compileError("Provided user event `E` for `App(comptime E: type)` is not of type `union(enum)`.");
+    }
     return struct {
-        gpa: Allocator,
-        io: std.Io,
-        model: Model,
         queue: Queue,
         thread: ?Thread = null,
         quit_event: Thread.ResetEvent,
         termios: ?posix.termios = null,
-        handler_registered: bool = false,
+        winch_registered: bool = false,
-        config: TerminalConfiguration,
-
-        pub const TerminalConfiguration = struct {
-            altScreen: bool,
-            saveScreen: bool,
-            rawMode: bool,
-            hideCursor: bool,
-
-            pub const full: @This() = .{
-                .altScreen = true,
-                .saveScreen = true,
-                .rawMode = true,
-                .hideCursor = true,
-            };
-
-            pub const direct: @This() = .{
-                .altScreen = false,
-                .saveScreen = false,
-                .rawMode = false,
-                .hideCursor = false,
-            };
-        };
 
         // global variable for the registered handler for WINCH
         var handler_ctx: *anyopaque = undefined;
         /// registered WINCH handler to report resize events
-        fn handleWinch(_: i32) callconv(.c) void {
+        fn handleWinch(_: c_int) callconv(.C) void {
-            const this: *@This() = @ptrCast(@alignCast(handler_ctx));
-            // NOTE this does not have to be done if in-band resize events are supported
-            // -> the signal might not work correctly when hosting the application over ssh!
-            this.postEvent(.resize);
-        }
-        /// registered CONT handler to force a complete redraw
-        fn handleCont(_: i32) callconv(.c) void {
             const this: *@This() = @ptrCast(@alignCast(handler_ctx));
             // NOTE this does not have to be done if in-band resize events are supported
             // -> the signal might not work correctly when hosting the application over ssh!
             this.postEvent(.resize);
         }
 
-        pub fn init(gpa: Allocator, io: std.Io, model: Model) @This() {
+        pub const init: @This() = .{
-            return .{
+            .queue = .{},
-                .gpa = gpa,
+            .quit_event = .{},
-                .io = io,
+        };
-                .model = model,
-                .queue = .{},
-                .quit_event = .{},
-                .config = undefined,
-            };
-        }
 
-        pub fn start(this: *@This(), config: TerminalConfiguration) !void {
+        pub fn start(this: *@This()) !void {
-            this.config = config;
             if (this.thread) |_| return;
 
             // post init event (as the very first element to be in the queue - event loop)
             this.postEvent(.init);
 
-            if (!this.handler_registered) {
+            if (!this.winch_registered) {
                 handler_ctx = this;
-                posix.sigaction(posix.SIG.WINCH, &.{
+                var act = posix.Sigaction{
                     .handler = .{ .handler = handleWinch },
                     .mask = posix.sigemptyset(),
                     .flags = 0,
-                }, null);
+                };
-                posix.sigaction(posix.SIG.CONT, &.{
+                posix.sigaction(posix.SIG.WINCH, &act, null);
-                    .handler = .{ .handler = handleCont },
+                this.winch_registered = true;
-                    .mask = posix.sigemptyset(),
-                    .flags = 0,
-                }, null);
-                this.handler_registered = true;
             }
 
             this.quit_event.reset();
             this.thread = try Thread.spawn(.{}, @This().run, .{this});
 
             var termios: posix.termios = undefined;
-            if (this.config.rawMode) try terminal.enableRawMode(&termios);
+            try terminal.enableRawMode(&termios);
             if (this.termios) |_| {} else this.termios = termios;
 
-            if (this.config.altScreen) try terminal.enterAltScreen();
+            try terminal.saveScreen();
-            if (this.config.saveScreen) try terminal.saveScreen();
+            try terminal.enterAltScreen();
-            if (this.config.hideCursor) try terminal.hideCursor();
+            try terminal.hideCursor();
-            if (this.config.altScreen and this.config.rawMode) try terminal.enableMouseSupport();
+            try terminal.enableMouseSupport();
         }
 
         pub fn interrupt(this: *@This()) !void {
             this.quit_event.set();
-            if (this.config.altScreen and this.config.rawMode) try terminal.disableMouseSupport();
+            try terminal.disableMouseSupport();
-            if (this.config.saveScreen) try terminal.restoreScreen();
+            try terminal.exitAltScreen();
-            if (this.config.altScreen) try terminal.exitAltScreen();
+            try terminal.restoreScreen();
-            if (this.thread) |*thread| {
+            if (this.thread) |thread| {
                 thread.join();
                 this.thread = null;
             }
@@ -131,16 +88,18 @@ pub fn App(comptime M: type, comptime E: type) type {
 
         pub fn stop(this: *@This()) !void {
             try this.interrupt();
-            if (this.config.hideCursor) try terminal.showCursor();
+            if (this.termios) |*termios| {
-            if (this.config.saveScreen) try terminal.resetCursor();
+                try terminal.disableMouseSupport();
-            if (this.termios) |termios| {
+                try terminal.showCursor();
-                if (this.config.rawMode) try terminal.disableRawMode(&termios);
+                try terminal.exitAltScreen();
-                this.termios = null;
+                try terminal.disableRawMode(termios);
+                try terminal.restoreScreen();
             }
+            this.termios = null;
         }
 
         /// Quit the application loop.
-        /// This will cancel the internal input thread and post a **.quit** `Event`.
+        /// This will stop the internal input thread and post a **.quit** `Event`.
         pub fn quit(this: *@This()) void {
             this.quit_event.set();
             this.postEvent(.quit);
@@ -158,52 +117,13 @@ pub fn App(comptime M: type, comptime E: type) type {
 
         fn run(this: *@This()) !void {
             // thread to read user inputs
-            var buf: [512]u8 = undefined;
+            var buf: [256]u8 = undefined;
-            // NOTE set the `NONBLOCK` option for the stdin file, such that reading is not blocking!
-            if (this.config.rawMode) {
-                // TODO is there a better way to do this through the `std.Io` interface?
-                var fl_flags = posix.fcntl(posix.STDIN_FILENO, posix.F.GETFL, 0) catch |err| switch (err) {
-                    error.FileBusy => unreachable,
-                    error.Locked => unreachable,
-                    error.PermissionDenied => unreachable,
-                    error.DeadLock => unreachable,
-                    error.LockedRegionLimitExceeded => unreachable,
-                    else => |e| return e,
-                };
-                fl_flags |= 1 << @bitOffsetOf(posix.system.O, "NONBLOCK");
-                _ = posix.fcntl(posix.STDIN_FILENO, posix.F.SETFL, fl_flags) catch |err| switch (err) {
-                    error.FileBusy => unreachable,
-                    error.Locked => unreachable,
-                    error.PermissionDenied => unreachable,
-                    error.DeadLock => unreachable,
-                    error.LockedRegionLimitExceeded => unreachable,
-                    else => |e| return e,
-                };
-            }
-
-            var remaining_bytes: usize = 0;
-            var lines: std.ArrayList(u8) = .empty;
-            defer lines.deinit(this.gpa);
-
             while (true) {
+                // FIX I still think that there is a race condition (I'm just waiting 'long' enough)
                 this.quit_event.timedWait(20 * std.time.ns_per_ms) catch {
-                    // non-blocking read
+                    // FIX in case the queue is full -> the next user input should panic and quit the application? because something seems to clock up the event queue
-                    const read_bytes = terminal.read(buf[remaining_bytes..]) catch |err| switch (err) {
+                    const read_bytes = try terminal.read(buf[0..]);
-                        error.WouldBlock => {
+                    // TODO `break` should not terminate the reading of the user inputs, but instead only the received faulty input!
-                            // wait a bit
-                            std.Thread.sleep(20);
-                            continue;
-                        },
-                        else => return err,
-                    } + remaining_bytes;
-                    remaining_bytes = 0;
-
-                    if (read_bytes == 0) {
-                        // received <EOF>
-                        this.postEvent(.cancel);
-                        continue;
-                    }
-
                     // escape key presses
                     if (buf[0] == 0x1b and read_bytes > 1) {
                         switch (buf[1]) {
@@ -230,9 +150,9 @@ pub fn App(comptime M: type, comptime E: type) type {
                                 if (read_bytes < 3) continue;
 
                                 // We start iterating at index 2 to get past the '['
-                                const sequence: []u8 = blk: for (buf[2..], 2..) |b, i| {
+                                const sequence = for (buf[2..], 2..) |b, i| {
                                     switch (b) {
-                                        0x40...0xFF => break :blk buf[0 .. i + 1],
+                                        0x40...0xFF => break buf[0 .. i + 1],
                                         else => continue,
                                     }
                                 } else continue;
@@ -363,19 +283,18 @@ pub fn App(comptime M: type, comptime E: type) type {
                                         // const alt = button_mask & mouse_bits.alt > 0;
                                         // const ctrl = button_mask & mouse_bits.ctrl > 0;
 
-                                        this.postEvent(.{
+                                        const mouse: Mouse = .{
-                                            .mouse = .{
+                                            .button = button,
-                                                .button = button,
+                                            .x = px -| 1,
-                                                .x = px -| 1,
+                                            .y = py -| 1,
-                                                .y = py -| 1,
+                                            .kind = blk: {
-                                                .kind = blk: {
+                                                if (motion and button != Mouse.Button.none) break :blk .drag;
-                                                    if (motion and button != Mouse.Button.none) break :blk .drag;
+                                                if (motion and button == Mouse.Button.none) break :blk .motion;
-                                                    if (motion and button == Mouse.Button.none) break :blk .motion;
+                                                if (sequence[sequence.len - 1] == 'm') break :blk .release;
-                                                    if (sequence[sequence.len - 1] == 'm') break :blk .release;
+                                                break :blk .press;
-                                                    break :blk .press;
-                                                },
                                             },
-                                        });
+                                        };
+                                        this.postEvent(.{ .mouse = mouse });
                                     },
                                     'c' => {
                                         // Primary DA (CSI ? Pm c)
@@ -443,49 +362,26 @@ pub fn App(comptime M: type, comptime E: type) type {
                             },
                         }
                     } else {
-                        if (this.config.rawMode) {
+                        const b = buf[0];
-                            const b = buf[0];
+                        const key: Key = switch (b) {
-                            const key: Key = switch (b) {
+                            0x00 => .{ .cp = '@', .mod = .{ .ctrl = true } },
-                                0x00 => .{ .cp = '@', .mod = .{ .ctrl = true } },
+                            0x08 => .{ .cp = input.Backspace },
-                                0x08 => .{ .cp = input.Backspace },
+                            0x09 => .{ .cp = input.Tab },
-                                0x09 => .{ .cp = input.Tab },
+                            0x0a => .{ .cp = 'j', .mod = .{ .ctrl = true } },
-                                0x0a => .{ .cp = 'j', .mod = .{ .ctrl = true } },
+                            0x0d => .{ .cp = input.Enter },
-                                0x0d => .{ .cp = input.Enter },
+                            0x01...0x07, 0x0b...0x0c, 0x0e...0x1a => .{ .cp = b + 0x60, .mod = .{ .ctrl = true } },
-                                0x01...0x07, 0x0b...0x0c, 0x0e...0x1a => .{ .cp = b + 0x60, .mod = .{ .ctrl = true } },
+                            0x1b => escape: {
-                                0x1b => escape: {
+                                assert(read_bytes == 1);
-                                    assert(read_bytes == 1);
+                                break :escape .{ .cp = input.Escape };
-                                    break :escape .{ .cp = input.Escape };
+                            },
-                                },
+                            0x7f => .{ .cp = input.Backspace },
-                                0x7f => .{ .cp = input.Backspace },
+                            else => {
-                                else => {
+                                var iter = code_point.Iterator{ .bytes = buf[0..read_bytes] };
-                                    var len = read_bytes;
+                                while (iter.next()) |cp| this.postEvent(.{ .key = .{ .cp = cp.code } });
-                                    while (!std.unicode.utf8ValidateSlice(buf[0..len])) len -= 1;
+                                continue;
-                                    remaining_bytes = read_bytes - len;
+                            },
-                                    var iter: std.unicode.Utf8Iterator = .{ .bytes = buf[0..len], .i = 0 };
+                        };
-                                    while (iter.nextCodepoint()) |cp| this.postEvent(.{ .key = .{ .cp = cp } });
+                        this.postEvent(.{ .key = key });
-                                    if (remaining_bytes > 0) {
-                                        @memmove(buf[0..remaining_bytes], buf[len .. len + remaining_bytes]);
-                                    }
-                                    continue; // this switch block does not return a `Key` we continue with loop
-                                },
-                            };
-                            this.postEvent(.{ .key = key });
-                        } else {
-                            var len = read_bytes;
-                            while (!std.unicode.utf8ValidateSlice(buf[0..len])) len -= 1;
-                            remaining_bytes = read_bytes - len;
-                            try lines.appendSlice(this.gpa, buf[0..len]);
-                            if (remaining_bytes > 0) {
-                                @memmove(buf[0..remaining_bytes], buf[len .. len + remaining_bytes]);
-                            } else {
-                                if (read_bytes != 512 and buf[len - 1] == '\n') this.postEvent(.{ .line = try lines.toOwnedSlice(this.gpa) });
-                                // NOTE line did not end with `\n` but with EOF, meaning the user canceled
-                                if (read_bytes != 512 and buf[len - 1] != '\n') {
-                                    lines.clearRetainingCapacity();
-                                    this.postEvent(.cancel);
-                                }
-                            }
-                        }
                     }
                     continue;
                 };
@@ -495,10 +391,9 @@ pub fn App(comptime M: type, comptime E: type) type {
 
         pub fn panic_handler(msg: []const u8, _: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
             terminal.disableMouseSupport() catch {};
+            terminal.exitAltScreen() catch {};
             terminal.showCursor() catch {};
-            terminal.resetCursor() catch {};
+            var termios: posix.termios = .{
-            terminal.restoreScreen() catch {};
-            terminal.disableRawMode(&.{
                 .iflag = .{},
                 .lflag = .{},
                 .cflag = .{},
@@ -507,25 +402,22 @@ pub fn App(comptime M: type, comptime E: type) type {
                 .line = 0,
                 .ispeed = undefined,
                 .ospeed = undefined,
-            }) catch {};
+            };
-            terminal.exitAltScreen() catch {};
+            terminal.disableRawMode(&termios) catch {};
+            terminal.restoreScreen() catch {};
             std.debug.defaultPanic(msg, ret_addr);
         }
 
         const element = @import("element.zig");
-        pub const Model = M;
         pub const Event = mergeTaggedUnions(event.SystemEvent, E);
-        pub const Container = @import("container.zig").Container(Model, Event);
+        pub const Container = @import("container.zig").Container(Event);
-        pub const Element = element.Element(Model, Event);
+        pub const Element = element.Element(Event);
-        pub const Alignment = element.Alignment(Model, Event);
+        pub const Alignment = element.Alignment(Event);
-        pub const Button = element.Button(Model, Event, Queue);
+        pub const Button = element.Button(Event, Queue);
-        pub const TextField = element.TextField(Model, Event);
+        pub const Input = element.Input(Event, Queue);
-        pub const Input = element.Input(Model, Event, Queue);
+        pub const Progress = element.Progress(Event, Queue);
-        pub const Progress = element.Progress(Model, Event, Queue);
+        pub const Scrollable = element.Scrollable(Event);
-        pub const RadioButton = element.RadioButton(Model, Event);
+        pub const Queue = queue.Queue(Event, 256);
-        pub const Scrollable = element.Scrollable(Model, Event);
-        pub const Selection = element.Selection(Model, Event);
-        pub const Queue = queue.Queue(Event, 512);
     };
 }
 
@@ -536,15 +428,14 @@ const mem = std.mem;
 const fmt = std.fmt;
 const posix = std.posix;
 const Thread = std.Thread;
-const Allocator = mem.Allocator;
 const assert = std.debug.assert;
+const code_point = @import("code_point");
 const event = @import("event.zig");
 const input = @import("input.zig");
 const terminal = @import("terminal.zig");
 const queue = @import("queue.zig");
 const mergeTaggedUnions = event.mergeTaggedUnions;
 const isTaggedUnion = event.isTaggedUnion;
-const isStruct = event.isStruct;
 const Mouse = input.Mouse;
 const Key = input.Key;
 const Point = @import("point.zig").Point;

src/cell.zig

@@ -1,5 +1,6 @@
 //! Cell type containing content and formatting for each character in the terminal screen.
 
+// TODO embrace `zg` dependency more due to utf-8 encoding
 cp: u21 = ' ',
 style: Style = .{ .emphasis = &.{} },
 
@@ -12,7 +13,7 @@ pub fn reset(this: *Cell) void {
     this.cp = ' ';
 }
 
-pub fn value(this: Cell, writer: *std.Io.Writer) !void {
+pub fn value(this: Cell, writer: anytype) !void {
     try this.style.value(writer, this.cp);
 }
 
@@ -25,18 +26,20 @@ test "ascii styled text" {
         .{ .cp = 'Y', .style = .{ .fg = .green, .bg = .grey, .emphasis = &.{} } },
         .{ .cp = 'v', .style = .{ .emphasis = &.{ .bold, .underline } } },
         .{ .cp = 'e', .style = .{ .emphasis = &.{.italic} } },
-        .{ .cp = 's', .style = .{ .fg = .lightgreen, .bg = .black, .emphasis = &.{.underline} } },
+        .{ .cp = 's', .style = .{ .fg = .light_green, .bg = .black, .emphasis = &.{.underline} } },
     };
 
-    var writer = std.Io.Writer.Allocating.init(std.testing.allocator);
+    var string = std.ArrayList(u8).init(std.testing.allocator);
-    defer writer.deinit();
+    defer string.deinit();
+
+    const writer = string.writer();
     for (cells) |cell| {
-        try cell.value(&writer.writer);
+        try cell.value(writer);
     }
     try std.testing.expectEqualSlices(
         u8,
         "\x1b[38;5;10;48;5;8;59mY\x1b[0m\x1b[39;49;59;1;4mv\x1b[0m\x1b[39;49;59;3me\x1b[0m\x1b[38;5;2;48;5;16;59;4ms\x1b[0m",
-        writer.writer.buffer[0..writer.writer.end],
+        string.items,
     );
 }
 
@@ -45,17 +48,19 @@ test "utf-8 styled text" {
         .{ .cp = '╭', .style = .{ .fg = .green, .bg = .grey, .emphasis = &.{} } },
         .{ .cp = '─', .style = .{ .emphasis = &.{} } },
         .{ .cp = '┄', .style = .{ .emphasis = &.{} } },
-        .{ .cp = '┘', .style = .{ .fg = .lightgreen, .bg = .black, .emphasis = &.{.underline} } },
+        .{ .cp = '┘', .style = .{ .fg = .light_green, .bg = .black, .emphasis = &.{.underline} } },
     };
 
-    var writer = std.Io.Writer.Allocating.init(std.testing.allocator);
+    var string = std.ArrayList(u8).init(std.testing.allocator);
-    defer writer.deinit();
+    defer string.deinit();
+
+    const writer = string.writer();
     for (cells) |cell| {
-        try cell.value(&writer.writer);
+        try cell.value(writer);
     }
     try std.testing.expectEqualSlices(
         u8,
         "\x1b[38;5;10;48;5;8;59m╭\x1b[0m\x1b[39;49;59m─\x1b[0m\x1b[39;49;59m┄\x1b[0m\x1b[38;5;2;48;5;16;59;4m┘\x1b[0m",
-        writer.writer.buffer[0..writer.writer.end],
+        string.items,
     );
 }

src/color.zig

@@ -1,13 +1,13 @@
 pub const Color = enum(u8) {
     default = 0,
     black = 16,
-    lightred = 1,
+    light_red = 1,
-    lightgreen,
+    light_green,
-    lightyellow,
+    light_yellow,
-    lightblue,
+    light_blue,
-    lightmagenta,
+    light_magenta,
-    lightcyan,
+    light_cyan,
-    lightgrey,
+    light_grey,
     grey,
     red,
     green,
@@ -18,21 +18,24 @@ pub const Color = enum(u8) {
     white,
     // TODO add further colors as described in https://gist.github.com/ConnerWill/d4b6c776b509add763e17f9f113fd25b # Color / Graphics Mode - 256 Colors
 
-    pub inline fn write(this: Color, writer: *std.Io.Writer, comptime coloring: enum { fg, bg, ul }) !void {
+    // TODO might be useful to use the std.ascii stuff!
+
+    pub inline fn write(this: Color, writer: anytype, comptime coloring: enum { fg, bg, ul }) !void {
         if (this == .default) {
             switch (coloring) {
-                .fg => try writer.printAscii("39", .{}),
+                .fg => try format(writer, "39", .{}),
-                .bg => try writer.printAscii("49", .{}),
+                .bg => try format(writer, "49", .{}),
-                .ul => try writer.printAscii("59", .{}),
+                .ul => try format(writer, "59", .{}),
             }
         } else {
             switch (coloring) {
-                .fg => try writer.print("38;5;{d}", .{@intFromEnum(this)}),
+                .fg => try format(writer, "38;5;{d}", .{@intFromEnum(this)}),
-                .bg => try writer.print("48;5;{d}", .{@intFromEnum(this)}),
+                .bg => try format(writer, "48;5;{d}", .{@intFromEnum(this)}),
-                .ul => try writer.print("58;5;{d}", .{@intFromEnum(this)}),
+                .ul => try format(writer, "58;5;{d}", .{@intFromEnum(this)}),
             }
         }
     }
 };
 
 const std = @import("std");
+const format = std.fmt.format;

src/container.zig

@@ -1,6 +1,3 @@
-// FIX known issues:
-// - hold fewer instances of the `Allocator`
-
 /// Border configuration struct
 pub const Border = packed struct {
     /// Color to use for the border
@@ -80,9 +77,8 @@ pub const Border = packed struct {
     test "all sides" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .green,
                 .sides = .all,
@@ -93,15 +89,14 @@ pub const Border = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/border.all.zon"));
+        }, &container, @import("test/container/border.all.zon"));
     }
 
     test "vertical sides" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .green,
                 .sides = .vertical,
@@ -112,15 +107,14 @@ pub const Border = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/border.vertical.zon"));
+        }, &container, @import("test/container/border.vertical.zon"));
     }
 
     test "horizontal sides" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .green,
                 .sides = .horizontal,
@@ -131,7 +125,7 @@ pub const Border = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/border.horizontal.zon"));
+        }, &container, @import("test/container/border.horizontal.zon"));
     }
 };
 
@@ -163,9 +157,8 @@ pub const Rectangle = packed struct {
     test "fill color overwrite parent fill" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .rectangle = .{ .fill = .green },
         }, .{});
         try container.append(try .init(std.testing.allocator, .{
@@ -177,15 +170,14 @@ pub const Rectangle = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/rectangle_with_parent_fill_without_padding.zon"));
+        }, &container, @import("test/container/rectangle_with_parent_fill_without_padding.zon"));
     }
 
     test "fill color padding to show parent fill" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .layout = .{
                 .padding = .all(2),
             },
@@ -200,15 +192,14 @@ pub const Rectangle = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/rectangle_with_parent_padding.zon"));
+        }, &container, @import("test/container/rectangle_with_parent_padding.zon"));
     }
 
     test "fill color padding to show parent fill (negative padding)" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .layout = .{
                 .padding = .{
                     .top = -18,
@@ -228,15 +219,14 @@ pub const Rectangle = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/rectangle_with_parent_padding.zon"));
+        }, &container, @import("test/container/rectangle_with_parent_padding.zon"));
     }
 
     test "fill color spacer with padding" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .rectangle = .{
                 .fill = .black,
             },
@@ -257,15 +247,14 @@ pub const Rectangle = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/rectangle_with_padding.zon"));
+        }, &container, @import("test/container/rectangle_with_padding.zon"));
     }
 
     test "fill color with gap" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .rectangle = .{
                 .fill = .black,
             },
@@ -289,15 +278,14 @@ pub const Rectangle = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/rectangle_with_gap.zon"));
+        }, &container, @import("test/container/rectangle_with_gap.zon"));
     }
 
     test "fill color with separator" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .rectangle = .{
                 .fill = .black,
             },
@@ -322,7 +310,7 @@ pub const Rectangle = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/rectangle_with_separator.zon"));
+        }, &container, @import("test/container/rectangle_with_separator.zon"));
     }
 };
 
@@ -412,9 +400,8 @@ pub const Layout = packed struct {
     test "separator without gaps" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .layout = .{
                 .separator = .{
                     .enabled = true,
@@ -428,15 +415,14 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_no_gaps.zon"));
+        }, &container, @import("test/container/separator_no_gaps.zon"));
     }
 
     test "separator without gaps with padding" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .layout = .{
                 .padding = .all(1),
                 .separator = .{
@@ -451,15 +437,14 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_no_gaps_with_padding.zon"));
+        }, &container, @import("test/container/separator_no_gaps_with_padding.zon"));
     }
 
     test "separator(2x) without gaps" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .layout = .{
                 .direction = .vertical,
                 .separator = .{
@@ -476,15 +461,14 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_2x_no_gaps.zon"));
+        }, &container, @import("test/container/separator_2x_no_gaps.zon"));
     }
 
     test "separator(2x) with border(all)" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .red,
                 .sides = .all,
@@ -504,15 +488,14 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_2x_no_gaps_with_border.zon"));
+        }, &container, @import("test/container/separator_2x_no_gaps_with_border.zon"));
     }
 
     test "separator(2x) with border(all) and padding(all(1))" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .red,
                 .sides = .all,
@@ -533,15 +516,14 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_2x_no_gaps_with_padding.zon"));
+        }, &container, @import("test/container/separator_2x_no_gaps_with_padding.zon"));
     }
 
     test "separator(2x) with border(all) and gap" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .red,
                 .sides = .all,
@@ -562,15 +544,14 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_2x_with_gaps_with_border.zon"));
+        }, &container, @import("test/container/separator_2x_with_gaps_with_border.zon"));
     }
 
     test "separator(2x) with border(all) and gap and padding" {
         const event = @import("event.zig");
         const testing = @import("testing.zig");
-        const Model = struct {};
 
-        var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+        var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
             .border = .{
                 .color = .red,
                 .sides = .all,
@@ -592,27 +573,25 @@ pub const Layout = packed struct {
         try testing.expectContainerScreen(.{
             .y = 20,
             .x = 30,
-        }, @TypeOf(container), &container, Model, @import("test/container/separator_2x_with_gaps_with_border_with_padding.zon"));
+        }, &container, @import("test/container/separator_2x_with_gaps_with_border_with_padding.zon"));
     }
 };
 
 /// Sizing options which should be used by the `Container`
 pub const Size = packed struct {
     dim: Point = .{},
-    grow: enum(u3) {
+    grow: enum(u2) {
         both,
         fixed,
-        vertical_only,
-        horizontal_only,
         vertical,
         horizontal,
     } = .both,
 };
 
-pub fn Container(Model: type, Event: type) type {
+pub fn Container(comptime Event: type) type {
     if (!isTaggedUnion(Event)) @compileError("Provided user event `Event` for `Container(comptime Event: type)`");
 
-    const Element = @import("element.zig").Element(Model, Event);
+    const Element = @import("element.zig").Element(Event);
     return struct {
         allocator: Allocator,
         origin: Point,
@@ -643,24 +622,23 @@ pub fn Container(Model: type, Event: type) type {
                 .size = .{},
                 .properties = properties,
                 .element = element,
-                .elements = try std.ArrayList(@This()).initCapacity(allocator, 2),
+                .elements = std.ArrayList(@This()).init(allocator),
             };
         }
 
-        pub fn deinit(this: *@This()) void {
+        pub fn deinit(this: *const @This()) void {
             for (this.elements.items) |*element| element.deinit();
-            this.elements.deinit(this.allocator);
+            this.elements.deinit();
-            this.element.deinit();
         }
 
         pub fn append(this: *@This(), element: @This()) !void {
-            try this.elements.append(this.allocator, element);
+            try this.elements.append(element);
         }
 
-        pub fn reposition(this: *@This(), model: *const Model, origin: Point) void {
+        pub fn reposition(this: *@This(), origin: Point) void {
             const layout = this.properties.layout;
             this.origin = origin;
-            this.element.reposition(model, origin);
+            this.element.reposition(origin);
 
             var offset = origin.add(.{
                 .x = Layout.getAbsolutePadding(layout.padding.left, this.size.x),
@@ -672,7 +650,7 @@ pub fn Container(Model: type, Event: type) type {
             if (sides.top) offset.y += 1;
 
             for (this.elements.items) |*child| {
-                child.reposition(model, offset);
+                child.reposition(offset);
 
                 switch (layout.direction) {
                     .horizontal => offset.x += child.size.x + layout.gap,
@@ -687,7 +665,7 @@ pub fn Container(Model: type, Event: type) type {
         }
 
         /// Resize all fit sized `Containers` to the necessary size required by its child elements.
-        fn fit_resize(this: *@This(), model: *const Model) Point {
+        fn fit_resize(this: *@This()) Point {
             // NOTE this is supposed to be a simple and easy to understand algorithm, there are currently no optimizations done
             const layout = this.properties.layout;
             var size: Point = switch (layout.direction) {
@@ -712,7 +690,7 @@ pub fn Container(Model: type, Event: type) type {
             };
 
             for (this.elements.items) |*child| {
-                const child_size = child.fit_resize(model);
+                const child_size = child.fit_resize();
                 switch (layout.direction) {
                     .horizontal => {
                         size.x += child_size.x;
@@ -725,29 +703,24 @@ pub fn Container(Model: type, Event: type) type {
                 }
             }
 
-            size = this.minSize(model, size);
             // assign currently calculated size
             this.size = switch (this.properties.size.grow) {
-                .both => .max(size, this.properties.size.dim),
+                .both => Point.max(size, this.properties.size.dim),
-                .fixed => blk: {
+                .fixed => this.properties.size.dim,
-                    assert(this.properties.size.dim.x > 0 or size.x > 0);
+                .horizontal => .{
-                    assert(this.properties.size.dim.y > 0 or size.y > 0);
+                    .x = @max(size.x, this.properties.size.dim.x),
-                    break :blk .max(size, this.properties.size.dim);
+                    .y = this.properties.size.dim.y,
                 },
-                .horizontal, .horizontal_only => blk: {
+                .vertical => .{
-                    assert(this.properties.size.dim.y > 0 or size.y > 0);
+                    .x = this.properties.size.dim.x,
-                    break :blk .max(size, this.properties.size.dim);
+                    .y = @max(size.y, this.properties.size.dim.y),
-                },
-                .vertical, .vertical_only => blk: {
-                    assert(this.properties.size.dim.x > 0 or size.x > 0);
-                    break :blk .max(size, this.properties.size.dim);
                 },
             };
             return this.size;
         }
 
         /// growable implicitly requires the root `Container` to have a set a size property to the size of the available terminal screen
-        fn grow_resize(this: *@This(), model: *const Model, max_size: Point) void {
+        fn grow_resize(this: *@This(), max_size: Point) void {
             const layout = this.properties.layout;
             var remainder = switch (layout.direction) {
                 .horizontal => max_size.x -| (Layout.getAbsolutePadding(layout.padding.left, this.size.x) + Layout.getAbsolutePadding(layout.padding.right, this.size.x)),
@@ -764,31 +737,23 @@ pub fn Container(Model: type, Event: type) type {
 
             const sides = this.properties.border.sides;
             switch (layout.direction) {
-                .vertical => {
-                    if (sides.top) {
-                        remainder -|= 1;
-                    }
-                    if (sides.bottom) {
-                        remainder -|= 1;
-                    }
-                    if (sides.left) {
-                        available -|= 1;
-                    }
-                    if (sides.right) {
-                        available -|= 1;
-                    }
-                },
                 .horizontal => {
                     if (sides.top) {
                         available -|= 1;
+                        remainder -|= 1;
                     }
                     if (sides.bottom) {
                         available -|= 1;
+                        remainder -|= 1;
                     }
+                },
+                .vertical => {
                     if (sides.left) {
+                        available -|= 1;
                         remainder -|= 1;
                     }
                     if (sides.right) {
+                        available -|= 1;
                         remainder -|= 1;
                     }
                 },
@@ -809,21 +774,21 @@ pub fn Container(Model: type, Event: type) type {
                         if (growable_children == 0) first_growable_child = child;
                         growable_children += 1;
                     },
-                    .horizontal, .horizontal_only => if (layout.direction == .horizontal) {
+                    .horizontal => if (layout.direction == .horizontal) {
                         if (growable_children == 0) first_growable_child = child;
                         growable_children += 1;
                     },
-                    .vertical, .vertical_only => if (layout.direction == .vertical) {
+                    .vertical => if (layout.direction == .vertical) {
                         if (growable_children == 0) first_growable_child = child;
                         growable_children += 1;
                     },
                 }
                 // non layout direction side growth
                 switch (layout.direction) {
-                    .horizontal => if (child.properties.size.grow == .vertical or child.properties.size.grow == .vertical_only or child.properties.size.grow == .both) {
+                    .horizontal => if (child.properties.size.grow == .vertical or child.properties.size.grow == .both) {
                         child.size.y = available;
                     },
-                    .vertical => if (child.properties.size.grow == .horizontal or child.properties.size.grow == .horizontal_only or child.properties.size.grow == .both) {
+                    .vertical => if (child.properties.size.grow == .horizontal or child.properties.size.grow == .both) {
                         child.size.x = available;
                     },
                 }
@@ -841,8 +806,8 @@ pub fn Container(Model: type, Event: type) type {
                     if (child.properties.size.grow == .fixed) continue;
 
                     switch (layout.direction) {
-                        .horizontal => if (child.properties.size.grow == .vertical or child.properties.size.grow == .vertical_only) continue,
+                        .horizontal => if (child.properties.size.grow == .vertical) continue,
-                        .vertical => if (child.properties.size.grow == .horizontal or child.properties.size.grow == .horizontal_only) continue,
+                        .vertical => if (child.properties.size.grow == .horizontal) continue,
                     }
 
                     const size = switch (layout.direction) {
@@ -870,23 +835,23 @@ pub fn Container(Model: type, Event: type) type {
                     };
                     if (child.properties.size.grow != .fixed and child_size == smallest_size) {
                         switch (layout.direction) {
-                            .horizontal => if (child.properties.size.grow != .vertical and child.properties.size.grow != .vertical_only) {
+                            .horizontal => if (child.properties.size.grow != .vertical) {
                                 child.size.x += size_to_correct;
                                 remainder -|= size_to_correct;
                             },
-                            .vertical => if (child.properties.size.grow != .horizontal and child.properties.size.grow != .horizontal_only) {
+                            .vertical => if (child.properties.size.grow != .horizontal) {
                                 child.size.y += size_to_correct;
                                 remainder -|= size_to_correct;
                             },
                         }
                         if (overflow > 0) {
                             switch (layout.direction) {
-                                .horizontal => if (child.properties.size.grow != .vertical and child.properties.size.grow != .vertical_only) {
+                                .horizontal => if (child.properties.size.grow != .vertical) {
                                     child.size.x += 1;
                                     overflow -|= 1;
                                     remainder -|= 1;
                                 },
-                                .vertical => if (child.properties.size.grow != .horizontal and child.properties.size.grow != .horizontal_only) {
+                                .vertical => if (child.properties.size.grow != .horizontal) {
                                     child.size.y += 1;
                                     overflow -|= 1;
                                     remainder -|= 1;
@@ -897,57 +862,31 @@ pub fn Container(Model: type, Event: type) type {
                 }
             }
 
-            this.element.resize(model, this.size);
+            this.element.resize(this.size);
-            for (this.elements.items) |*child| child.grow_resize(model, child.size);
+            for (this.elements.items) |*child| child.grow_resize(child.size);
         }
 
-        pub fn resize(this: *@This(), model: *const Model, size: Point) void {
+        pub fn resize(this: *@This(), size: Point) void {
             // NOTE assume that this function is only called for the root `Container`
             this.size = size;
-            const fit_size = this.fit_resize(model);
+            const fit_size = this.fit_resize();
-            this.size = switch (this.properties.size.grow) {
+            // if (fit_size.y > size.y or fit_size.x > size.x) @panic("error: cannot render in available space");
-                .both => .max(size, fit_size),
+            switch (this.properties.size.grow) {
-                .fixed => fit_size,
+                .both => this.size = Point.max(size, fit_size),
-                .horizontal_only => .{
+                .fixed => {},
-                    .x = size.x,
+                .horizontal => this.size = .{
-                    .y = fit_size.y,
-                },
-                .vertical_only => .{
-                    .x = fit_size.x,
-                    .y = size.y,
-                },
-                .horizontal => .{
                     .x = @max(size.x, fit_size.x),
                     .y = size.y,
                 },
-                .vertical => .{
+                .vertical => this.size = .{
                     .x = size.x,
                     .y = @max(size.y, fit_size.y),
                 },
-            };
-            this.grow_resize(model, this.size);
-        }
-
-        pub fn minSize(this: *const @This(), model: *const Model, size: Point) Point {
-            var min_size: Point = .{};
-            for (this.elements.items) |*child| {
-                const child_size = child.minSize(model, child.properties.size.dim);
-                min_size = switch (this.properties.layout.direction) {
-                    .horizontal => .{
-                        .x = child_size.x + min_size.x,
-                        .y = @max(child_size.y, min_size.y),
-                    },
-                    .vertical => .{
-                        .x = @max(child_size.x, min_size.x),
-                        .y = child_size.y + min_size.y,
-                    },
-                };
             }
-            const element_size = this.element.minSize(model, size);
+            this.grow_resize(this.size);
-            return .max(element_size, min_size);
         }
 
-        pub fn handle(this: *const @This(), model: *Model, event: Event) !void {
+        pub fn handle(this: *const @This(), event: Event) !void {
             switch (event) {
                 .mouse => |mouse| if (mouse.in(this.origin, this.size)) {
                     // the element receives the mouse event with relative position
@@ -955,19 +894,17 @@ pub fn Container(Model: type, Event: type) type {
                     var relative_mouse: input.Mouse = mouse;
                     relative_mouse.x -= this.origin.x;
                     relative_mouse.y -= this.origin.y;
-                    try this.element.handle(model, .{ .mouse = relative_mouse });
+                    try this.element.handle(.{ .mouse = relative_mouse });
+                    for (this.elements.items) |*element| try element.handle(event);
                 },
-                .bell => {
+                else => {
-                    // ring the terminal bell and do not propagate the event any further
+                    try this.element.handle(event);
-                    _ = try terminal.ringBell();
+                    for (this.elements.items) |*element| try element.handle(event);
-                    return;
                 },
-                else => try this.element.handle(model, event),
             }
-            for (this.elements.items) |*element| try element.handle(model, event);
         }
 
-        pub fn content(this: *const @This(), model: *const Model) ![]Cell {
+        pub fn content(this: *const @This()) ![]Cell {
             if (this.size.x == 0 or this.size.y == 0) return Error.TooSmall;
 
             const cells = try this.allocator.alloc(Cell, @as(usize, this.size.x) * @as(usize, this.size.y));
@@ -978,7 +915,7 @@ pub fn Container(Model: type, Event: type) type {
             this.properties.border.content(cells, this.size);
             this.properties.rectangle.content(cells, this.size);
 
-            try this.element.content(model, cells, this.size);
+            try this.element.content(cells, this.size);
 
             // DEBUG render corresponding corners (except top left) of this `Container` *red*
             if (comptime build_options.debug) {
@@ -1008,7 +945,6 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const build_options = @import("build_options");
 const input = @import("input.zig");
-const terminal = @import("terminal.zig");
 const isTaggedUnion = @import("event.zig").isTaggedUnion;
 const Cell = @import("cell.zig");
 const Color = @import("color.zig").Color;
@@ -1023,9 +959,8 @@ test {
 test "Container Fixed and Grow Size Vertical" {
     const event = @import("event.zig");
     const testing = @import("testing.zig");
-    const Model = struct {};
 
-    var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
+    var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
         .layout = .{ .direction = .vertical },
     }, .{});
     try container.append(try .init(std.testing.allocator, .{
@@ -1043,15 +978,14 @@ test "Container Fixed and Grow Size Vertical" {
     try testing.expectContainerScreen(.{
         .y = 20,
         .x = 30,
-    }, @TypeOf(container), &container, Model, @import("test/container/fixed_grow_vertical.zon"));
+    }, &container, @import("test/container/fixed_grow_vertical.zon"));
 }
 
 test "Container Fixed and Grow Size Horizontal" {
     const event = @import("event.zig");
     const testing = @import("testing.zig");
-    const Model = struct {};
 
-    var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{}, .{});
+    var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{}, .{});
     try container.append(try .init(std.testing.allocator, .{
         .size = .{
             .dim = .{ .x = 5 },
@@ -1067,5 +1001,5 @@ test "Container Fixed and Grow Size Horizontal" {
     try testing.expectContainerScreen(.{
         .y = 20,
         .x = 30,
-    }, @TypeOf(container), &container, Model, @import("test/container/fixed_grow_horizontal.zon"));
+    }, &container, @import("test/container/fixed_grow_horizontal.zon"));
 }

src/ctlseqs.zig

@@ -50,7 +50,6 @@ pub const home = "\x1b[H";
 pub const cup = "\x1b[{d};{d}H";
 pub const hide_cursor = "\x1b[?25l";
 pub const show_cursor = "\x1b[?25h";
-pub const reset_cursor_shape = "\x1b[0 q";
 pub const cursor_shape = "\x1b[{d} q";
 pub const ri = "\x1bM";
 pub const ind = "\n";
@@ -140,6 +139,5 @@ pub const osc10_reset = "\x1b]110\x1b\\"; // reset fg to terminal default
 pub const osc11_query = "\x1b]11;?\x1b\\"; // bg
 pub const osc11_set = "\x1b]11;rgb:{x:0>2}{x:0>2}/{x:0>2}{x:0>2}/{x:0>2}{x:0>2}\x1b\\"; // set default terminal bg
 pub const osc11_reset = "\x1b]111\x1b\\"; // reset bg to terminal default
-pub const osc12_set = "\x1b]12;{s}\x1b\\"; // set the cursor color through the name of the 8 base colors!
 pub const osc12_query = "\x1b]12;?\x1b\\"; // cursor color
 pub const osc12_reset = "\x1b]112\x1b\\"; // reset cursor to terminal default

src/event.zig

@@ -8,19 +8,8 @@ pub const SystemEvent = union(enum) {
     init,
     /// Quit event to signify the end of the event loop (rendering should stop afterwards)
     quit,
-    /// Cancel event to signify that the user provided an EOF
-    ///
-    /// Usually this event is only triggered by the system in *non raw mode*
-    /// renderings otherwise the corresponding `.key` event would be fired instead.
-    cancel,
     /// Resize event to signify that the application should re-draw to resize
-    ///
-    /// Usually no `Container` nor `Element` should act on that event, as it
-    /// only serves for event based loops to force a re-draw with a new `Event`.
     resize,
-    /// Ring the terminal bell to notify the user. This `Event` is handled by
-    /// every `Container` and will not be passed through the container tree.
-    bell,
     /// Error event to notify other containers about a recoverable error
     err: struct {
         /// actual error
@@ -28,28 +17,19 @@ pub const SystemEvent = union(enum) {
         /// associated error message
         msg: []const u8,
     },
-    /// Input line event received in *non raw mode* (instead of individual `key` events)
-    ///
-    /// This event contains the entire line until the ending newline character
-    /// (which is included in the payload of this event).
-    line: []const u8,
     /// Input key event received from the user
     key: Key,
     /// Mouse input event
     mouse: Mouse,
-    /// Focus event indicating that the application has gained the focus of the user
+    /// Focus event for mouse interaction
+    /// TODO this should instead be a union with a `Size` to derive which container / element the focus meant for
     focus: bool,
 };
 
-/// Merge the two provided `union(enum)` `A` and `B` to a tagged union containing all fields of both tagged unions in `comptime`.
-/// Declarations are not supported for `comptime` created types, see https://github.com/ziglang/zig/issues/6709 for details.
 pub fn mergeTaggedUnions(comptime A: type, comptime B: type) type {
-    // TODO maybe it makes sense to have a nested tagged union type (i.e. system: union(enum) and event: union(enum))
+    if (!isTaggedUnion(A) or !isTaggedUnion(B)) {
-    // - allows re-definition of system / built-in events
+        @compileError("Both types for merging tagged unions need to be of type `union(enum)`.");
-    // - clearly shows which events are system / built-in ones and which are user defined events
+    }
-    // - the memory footprint for the nesting is not really harmful
-    if (!isTaggedUnion(A) or !isTaggedUnion(B)) @compileError("Both types for merging tagged unions need to be of type `union(enum)`.");
-
     const a_fields = @typeInfo(A).@"union".fields;
     const a_fields_tag = @typeInfo(A).@"union".tag_type.?;
     const a_enum_fields = @typeInfo(a_fields_tag).@"enum".fields;
@@ -74,27 +54,11 @@ pub fn mergeTaggedUnions(comptime A: type, comptime B: type) type {
         i += 1;
     }
 
-    // NOTE declarations are not supported for `comptime` types: https://github.com/ziglang/zig/issues/6709
+    const log2_i = @bitSizeOf(@TypeOf(i)) - @clz(i);
-    // -> will lead to a compilation error when constructing the tagged union
-    //    at the end of this function in case at least one of the provided tagged
-    //    unions to merge contains declarations (which in this case can only be the
-    //    user provided one)
-    const a_enum_decls = @typeInfo(A).@"union".decls;
-    const b_enum_decls = @typeInfo(B).@"union".decls;
-    var decls: [a_enum_decls.len + b_enum_decls.len]std.builtin.Type.Declaration = undefined;
-    var j: usize = 0;
-    for (a_enum_decls) |decl| {
-        decls[j] = decl;
-        j += 1;
-    }
-    for (b_enum_decls) |decl| {
-        decls[j] = decl;
-        j += 1;
-    }
 
     const EventType = @Type(.{ .int = .{
         .signedness = .unsigned,
-        .bits = @bitSizeOf(@TypeOf(i)) - @clz(i),
+        .bits = log2_i,
     } });
 
     const Event = @Type(.{ .@"enum" = .{
@@ -112,25 +76,19 @@ pub fn mergeTaggedUnions(comptime A: type, comptime B: type) type {
     } });
 }
 
-/// Determine whether the provided type `T` is a tagged union: `union(enum)`.
+// Determine at `comptime` whether the provided type `E` is an `union(enum)`.
-pub fn isTaggedUnion(comptime T: type) bool {
+pub fn isTaggedUnion(comptime E: type) bool {
-    switch (@typeInfo(T)) {
+    switch (@typeInfo(E)) {
-        .@"union" => |u| if (u.tag_type) |_| {} else {
+        .@"union" => |u| {
-            return false;
+            if (u.tag_type) |_| {} else {
+                return false;
+            }
         },
         else => return false,
     }
     return true;
 }
 
-/// Determine whether the provided type `T` is a `struct`.
-pub fn isStruct(comptime T: type) bool {
-    return switch (@typeInfo(T)) {
-        .@"struct" => true,
-        else => false,
-    };
-}
-
 const std = @import("std");
 const input = @import("input.zig");
 const terminal = @import("terminal.zig");

src/input.zig

@@ -65,30 +65,7 @@ pub const Key = packed struct {
         return meta.eql(this, other);
     }
 
-    /// Determine if the `Key` is an unicode character that can be printed to
+    // TODO might be useful to use the std.ascii stuff!
-    /// the screen. This means that the code point of the `Key` is an ascii
-    /// character between 32 - 255 (with the exception of 127 = Delete) and no
-    /// modifiers (alt and/or ctrl) are used.
-    ///
-    /// # Example
-    ///
-    /// Get user input's from the .key event from the application event loop:
-    ///
-    /// ```zig
-    /// switch (event) {
-    ///   .key => |key| if (key.isUnicode()) try this.input.append(key.cp),
-    ///   else => {},
-    /// }
-    /// ```
-    pub fn isUnicode(this: @This()) bool {
-        return this.mod.alt == false and this.mod.ctrl == false and // no modifier keys
-            (this.cp >= 32 and this.cp <= 126 or // ascii printable characters (except for input.Delete)
-                this.cp >= 128 and this.cp <= 255) or // extended ascii codes
-            ((this.cp >= 0x0080 and this.cp <= 0x07FF) or
-                (this.cp >= 0x0800 and this.cp <= 0xFFFF) or
-                (this.cp >= 0x100000 and this.cp <= 0x10FFFF)) and // allowed unicode character ranges (2 - 4 byte characters)
-                (this.cp < 57348 or this.cp > 57454); // no other predefined meanings (i.e. arrow keys, etc.)
-    }
 
     /// Determine if the `Key` is an ascii character that can be printed to
     /// the screen. This means that the code point of the `Key` is an ascii

src/queue.zig

@@ -1,7 +1,7 @@
 // taken from https://github.com/rockorager/libvaxis/blob/main/src/queue.zig (MIT-License)
 // with slight modifications
 
-/// Queue implementation. Thread safe. Fixed size. _Blocking_ `push` and `pop`. _Polling_ through `tryPop` and `tryPush`.
+/// Queue implementation. Thread safe. Fixed size. Blocking push and pop. Polling through tryPop and tryPush.
 pub fn Queue(comptime T: type, comptime size: usize) type {
     return struct {
         buf: [size]T = undefined,
@@ -215,7 +215,7 @@ fn sleepyPop(q: *Queue(u8, 2)) !void {
     // still full and the push in the other thread is still blocked
     // waiting for space.
     try Thread.yield();
-    std.Thread.sleep(std.time.ns_per_s);
+    std.time.sleep(std.time.ns_per_s);
     // Finally, let that other thread go.
     try testing.expectEqual(1, q.pop());
 
@@ -225,7 +225,7 @@ fn sleepyPop(q: *Queue(u8, 2)) !void {
         try Thread.yield();
     // But we want to ensure that there's a second push waiting, so
     // here's another sleep.
-    std.Thread.sleep(std.time.ns_per_s / 2);
+    std.time.sleep(std.time.ns_per_s / 2);
 
     // Another spurious wake...
     q.not_full.signal();
@@ -233,7 +233,7 @@ fn sleepyPop(q: *Queue(u8, 2)) !void {
     // And another chance for the other thread to see that it's
     // spurious and go back to sleep.
     try Thread.yield();
-    std.Thread.sleep(std.time.ns_per_s / 2);
+    std.time.sleep(std.time.ns_per_s / 2);
 
     // Pop that thing and we're done.
     try testing.expectEqual(2, q.pop());
@@ -270,14 +270,14 @@ test "Fill, block, fill, block" {
 fn sleepyPush(q: *Queue(u8, 1)) !void {
     // Try to ensure the other thread has already started trying to pop.
     try Thread.yield();
-    std.Thread.sleep(std.time.ns_per_s / 2);
+    std.time.sleep(std.time.ns_per_s / 2);
 
     // Spurious wake
     q.not_full.signal();
     q.not_empty.signal();
 
     try Thread.yield();
-    std.Thread.sleep(std.time.ns_per_s / 2);
+    std.time.sleep(std.time.ns_per_s / 2);
 
     // Stick something in the queue so it can be popped.
     q.push(1);
@@ -286,7 +286,7 @@ fn sleepyPush(q: *Queue(u8, 1)) !void {
         try Thread.yield();
     // Give the other thread time to block again.
     try Thread.yield();
-    std.Thread.sleep(std.time.ns_per_s / 2);
+    std.time.sleep(std.time.ns_per_s / 2);
 
     // Spurious wake
     q.not_full.signal();
@@ -317,7 +317,7 @@ test "2 readers" {
     const t1 = try Thread.spawn(cfg, readerThread, .{&queue});
     const t2 = try Thread.spawn(cfg, readerThread, .{&queue});
     try Thread.yield();
-    std.Thread.sleep(std.time.ns_per_s / 2);
+    std.time.sleep(std.time.ns_per_s / 2);
     queue.push(1);
     queue.push(1);
     t1.join();

src/render.zig

@@ -58,10 +58,10 @@ pub const Buffered = struct {
     }
 
     /// Render provided cells at size (anchor and dimension) into the *virtual screen*.
-    pub fn render(this: *@This(), comptime Container: type, container: *Container, comptime Model: type, model: *const Model) !void {
+    pub fn render(this: *@This(), comptime T: type, container: *T) !void {
         const size: Point = container.size;
         const origin: Point = container.origin;
-        const cells: []const Cell = try container.content(model);
+        const cells: []const Cell = try container.content();
 
         if (cells.len == 0) return;
 
@@ -80,7 +80,7 @@ pub const Buffered = struct {
         // free immediately
         container.allocator.free(cells);
 
-        for (container.elements.items) |*element| try this.render(Container, element, Model, model);
+        for (container.elements.items) |*element| try this.render(T, element);
     }
 
     /// Write *virtual screen* to alternate screen (should be called once and last during each render loop iteration in the main loop).
@@ -88,10 +88,9 @@ pub const Buffered = struct {
         try terminal.hideCursor();
         // TODO measure timings of rendered frames?
         var cursor_position: ?Point = null;
-        var writer = terminal.writer();
+        const writer = terminal.writer();
         const s = this.screen;
         const vs = this.virtual_screen;
-
         for (0..this.size.y) |row| {
             for (0..this.size.x) |col| {
                 const idx = (row * this.size.x) + col;
@@ -105,14 +104,13 @@ pub const Buffered = struct {
                         .x = @truncate(col),
                         .y = @truncate(row),
                     };
-                    try cvs.style.set_cursor_style(&writer);
                 }
 
                 if (cs.eql(cvs)) continue;
 
                 // render differences found in virtual screen
                 try terminal.setCursorPosition(.{ .y = @truncate(row), .x = @truncate(col) });
-                try cvs.value(&writer);
+                try cvs.value(writer);
                 // update screen to be the virtual screen for the next frame
                 s[idx] = vs[idx];
             }
@@ -124,95 +122,6 @@ pub const Buffered = struct {
     }
 };
 
-pub const Direct = struct {
-    gpa: Allocator,
-    size: Point,
-    resized: bool,
-    screen: []Cell,
-
-    pub fn init(gpa: Allocator) @This() {
-        return .{
-            .gpa = gpa,
-            .size = .{},
-            .resized = true,
-            .screen = undefined,
-        };
-    }
-
-    pub fn deinit(this: *@This()) void {
-        this.gpa.free(this.screen);
-    }
-
-    pub fn resize(this: *@This()) !Point {
-        this.size = .{};
-        if (!this.resized) {
-            this.gpa.free(this.screen);
-            this.screen = undefined;
-        }
-        this.resized = true;
-        return terminal.getTerminalSize();
-    }
-
-    pub fn clear(this: *@This()) !void {
-        _ = this;
-        try terminal.clearScreen();
-    }
-
-    pub fn writeCtrlDWithNewline(this: *@This()) !void {
-        _ = this;
-        _ = try terminal.write("^D\n");
-    }
-
-    pub fn writeNewline(this: *@This()) !void {
-        _ = this;
-        _ = try terminal.write("\n");
-    }
-
-    /// Render provided cells at size (anchor and dimension) into the *screen*.
-    pub fn render(this: *@This(), comptime Container: type, container: *Container, comptime Model: type, model: *const Model) !void {
-        const size: Point = container.size;
-        const origin: Point = container.origin;
-
-        if (this.resized) {
-            this.size = size;
-            const n = @as(usize, this.size.x) * @as(usize, this.size.y);
-            this.screen = try this.gpa.alloc(Cell, n);
-            @memset(this.screen, .{});
-            this.resized = false;
-        }
-
-        const cells: []const Cell = try container.content(model);
-
-        var idx: usize = 0;
-        var vs = this.screen;
-        const anchor: usize = (@as(usize, origin.y) * @as(usize, this.size.x)) + @as(usize, origin.x);
-
-        blk: for (0..size.y) |row| {
-            for (0..size.x) |col| {
-                vs[anchor + (row * this.size.x) + col] = cells[idx];
-                idx += 1;
-
-                if (cells.len == idx) break :blk;
-            }
-        }
-        // free immediately
-        container.allocator.free(cells);
-        for (container.elements.items) |*element| try this.render(Container, element, Model, model);
-    }
-
-    pub fn flush(this: *@This()) !void {
-        var writer = terminal.writer();
-        for (0..this.size.y) |row| {
-            for (0..this.size.x) |col| {
-                const idx = (row * this.size.x) + col;
-                const cvs = this.screen[idx];
-                try cvs.value(&writer);
-                if (cvs.style.cursor) return; // that's where the cursor should be left!
-            }
-        }
-    }
-};
-
 const std = @import("std");
 const meta = std.meta;
 const assert = std.debug.assert;

src/style.zig

@@ -12,8 +12,6 @@ fg: Color = .default,
 bg: Color = .default,
 ul: Color = .default,
 cursor: bool = false,
-cursor_color: Color = .default,
-cursor_shape: CursorShape = .default,
 ul_style: Underline = .off,
 emphasis: []const Emphasis,
 
@@ -38,51 +36,33 @@ pub const Emphasis = enum(u8) {
     strikethrough,
 };
 
-pub const CursorShape = enum(u4) {
-    default = 0,
-    block_blinking = 1,
-    block_steady,
-    underline_blinking,
-    underline_steady,
-    bar_blinking,
-    bar_steady,
-};
-
 pub fn eql(this: Style, other: Style) bool {
-    // TODO should there be a compare for every field?
     return meta.eql(this, other);
 }
 
-pub fn set_cursor_style(this: Style, writer: *std.Io.Writer) !void {
+// TODO might be useful to use the std.ascii stuff!
-    if (!this.cursor) return;
-    switch (this.cursor_color) {
-        .default => try writer.print(ctlseqs.osc12_reset, .{}),
-        else => try writer.print(ctlseqs.osc12_set, .{@tagName(this.cursor_color)}),
-    }
-    try writer.print(ctlseqs.cursor_shape, .{@intFromEnum(this.cursor_shape)});
-}
 
-pub fn value(this: Style, writer: *std.Io.Writer, cp: u21) !void {
+pub fn value(this: Style, writer: anytype, cp: u21) !void {
     var buffer: [4]u8 = undefined;
     const bytes = try unicode.utf8Encode(cp, &buffer);
     assert(bytes > 0);
     // build ansi sequence for 256 colors ...
     // foreground
-    try writer.printAscii("\x1b[", .{});
+    try format(writer, "\x1b[", .{});
     try this.fg.write(writer, .fg);
     // background
-    try writer.printAsciiChar(';', .{});
+    try format(writer, ";", .{});
     try this.bg.write(writer, .bg);
     // underline
     // FIX assert that if the underline property is set that the ul style and the attribute for underlining is available
-    try writer.printAsciiChar(';', .{});
+    try format(writer, ";", .{});
     try this.ul.write(writer, .ul);
     // append styles (aka attributes like bold, italic, strikethrough, etc.)
-    for (this.emphasis) |attribute| try writer.print(";{d}", .{@intFromEnum(attribute)});
+    for (this.emphasis) |attribute| try format(writer, ";{d}", .{@intFromEnum(attribute)});
-    try writer.printAsciiChar('m', .{});
+    try format(writer, "m", .{});
     // content
-    try writer.printAscii(buffer[0..bytes], .{});
+    try format(writer, "{s}", .{buffer[0..bytes]});
-    try writer.printAscii("\x1b[0m", .{});
+    try format(writer, "\x1b[0m", .{});
 }
 
 // TODO implement helper functions for terminal capabilities:
@@ -93,6 +73,6 @@ const std = @import("std");
 const unicode = std.unicode;
 const meta = std.meta;
 const assert = std.debug.assert;
+const format = std.fmt.format;
 const Color = @import("color.zig").Color;
-const ctlseqs = @import("ctlseqs.zig");
 const Style = @This();

src/terminal.zig

@@ -42,11 +42,6 @@ pub fn showCursor() !void {
     _ = try posix.write(posix.STDIN_FILENO, ctlseqs.show_cursor);
 }
 
-pub fn resetCursor() !void {
-    _ = try posix.write(posix.STDIN_FILENO, ctlseqs.reset_cursor_shape);
-    _ = try posix.write(posix.STDIN_FILENO, ctlseqs.osc12_reset);
-}
-
 pub fn setCursorPositionHome() !void {
     _ = try posix.write(posix.STDIN_FILENO, ctlseqs.home);
 }
@@ -59,10 +54,6 @@ pub fn disableMouseSupport() !void {
     _ = try posix.write(posix.STDIN_FILENO, ctlseqs.mouse_reset);
 }
 
-pub fn ringBell() !void {
-    _ = try posix.write(posix.STDIN_FILENO, &.{7});
-}
-
 pub fn read(buf: []u8) !usize {
     return try posix.read(posix.STDIN_FILENO, buf);
 }
@@ -71,25 +62,19 @@ pub fn write(buf: []const u8) !usize {
     return try posix.write(posix.STDIN_FILENO, buf);
 }
 
-fn drainFn(w: *std.Io.Writer, data: []const []const u8, splat: usize) error{WriteFailed}!usize {
+fn contextWrite(context: @This(), data: []const u8) anyerror!usize {
-    _ = w;
+    _ = context;
-    if (data.len == 0 or splat == 0) return 0;
+    return try posix.write(posix.STDOUT_FILENO, data);
-    var len: usize = 0;
-
-    for (data) |bytes| len += posix.write(posix.STDOUT_FILENO, bytes) catch return error.WriteFailed;
-
-    return len;
 }
 
-// TODO I now need to add that much, for just the one function above?
+const Writer = std.io.Writer(
-pub fn writer() std.Io.Writer {
+    @This(),
-    return .{
+    anyerror,
-        .vtable = &.{
+    contextWrite,
-            .drain = drainFn,
+);
-            .flush = std.Io.Writer.noopFlush,
+
-        },
+pub fn writer() Writer {
-        .buffer = &.{},
+    return .{ .context = .{} };
-    };
 }
 
 pub fn setCursorPosition(pos: Point) !void {
@@ -98,7 +83,7 @@ pub fn setCursorPosition(pos: Point) !void {
     _ = try posix.write(posix.STDIN_FILENO, value);
 }
 
-pub fn getCursorPosition() !Size {
+pub fn getCursorPosition() !Size.Position {
     // Needs Raw mode (no wait for \n) to work properly cause
     // control sequence will not be written without it.
     _ = try posix.write(posix.STDIN_FILENO, "\x1b[6n");
@@ -206,7 +191,7 @@ pub fn enableRawMode(bak: *posix.termios) !void {
 }
 
 /// Reverts `enableRawMode` to restore initial functionality.
-pub fn disableRawMode(bak: *const posix.termios) !void {
+pub fn disableRawMode(bak: *posix.termios) !void {
     try posix.tcsetattr(
         posix.STDIN_FILENO,
         .FLUSH,
@@ -247,7 +232,7 @@ const log = std.log.scoped(.terminal);
 const std = @import("std");
 const mem = std.mem;
 const posix = std.posix;
-const assert = std.debug.assert;
+const code_point = @import("code_point");
 const ctlseqs = @import("ctlseqs.zig");
 const input = @import("input.zig");
 const Key = input.Key;

src/testing.zig

@@ -34,10 +34,10 @@ pub const Renderer = struct {
         @memset(this.screen, .{});
     }
 
-    pub fn render(this: *@This(), comptime T: type, container: *const T, comptime Model: type, model: *const Model) !void {
+    pub fn render(this: *@This(), comptime T: type, container: *const T) !void {
         const size: Point = container.size;
         const origin: Point = container.origin;
-        const cells: []const Cell = try container.content(model);
+        const cells: []const Cell = try container.content();
 
         if (cells.len == 0) return;
 
@@ -58,7 +58,7 @@ pub const Renderer = struct {
         // free immediately
         container.allocator.free(cells);
 
-        for (container.elements.items) |*element| try this.render(T, element, Model, model);
+        for (container.elements.items) |*element| try this.render(T, element);
     }
 
     pub fn save(this: @This(), writer: anytype) !void {
@@ -74,8 +74,6 @@ pub const Renderer = struct {
 /// Create a .zon file containing the expected `Cell` slice using the `zterm.testing.Renderer.save` method:
 ///
 /// ```zig
-/// const Model = struct {};
-/// var model: Model = .{};
 /// const file = try std.fs.cwd().createFile("test/container/border/all.zon", .{ .truncate = true });
 /// defer file.close();
 ///
@@ -83,8 +81,8 @@ pub const Renderer = struct {
 /// var renderer: testing.Renderer = .init(allocator, size);
 /// defer renderer.deinit();
 ///
-/// try container.handle(&model, .{ .size = size });
+/// try container.handle(.{ .size = size });
-/// try renderer.render(@TypeOf(container), &container, Model, &.{});
+/// try renderer.render(Container(event.SystemEvent), &container);
 /// try renderer.save(file.writer());
 /// ```
 ///
@@ -93,8 +91,7 @@ pub const Renderer = struct {
 /// Then later load that .zon file at compile time and run your test against this `Cell` slice.
 ///
 /// ```zig
-/// const Model = struct {};
+/// var container: Container(event.SystemEvent) = try .init(std.testing.allocator, .{
-/// var container: Container(Model, event.SystemEvent) = try .init(std.testing.allocator, .{
 ///     .border = .{
 ///         .color = .green,
 ///         .sides = .all,
@@ -105,57 +102,20 @@ pub const Renderer = struct {
 /// try testing.expectContainerScreen(.{
 ///     .rows = 20,
 ///     .cols = 30,
-/// }, @TypeOf(container), &container, Model, @import("test/container/border.all.zon"));
+/// }, &container, @import("test/container/border.all.zon"));
 /// ```
-pub fn expectContainerScreen(size: Point, comptime T: type, container: *T, comptime Model: type, expected: []const Cell) !void {
+pub fn expectContainerScreen(size: Point, container: *Container(event.SystemEvent), expected: []const Cell) !void {
     const allocator = testing.allocator;
     var renderer: Renderer = .init(allocator, size);
     defer renderer.deinit();
 
-    const model: Model = .{};
+    container.resize(size);
-
+    container.reposition(.{});
-    container.resize(&model, size);
+    try renderer.render(Container(event.SystemEvent), container);
-    container.reposition(&model, .{});
-    try renderer.render(T, container, Model, &model);
 
     try expectEqualCells(.{}, renderer.size, expected, renderer.screen);
 }
 
-/// Taken from: https://codeberg.org/atman/zg/src/branch/master/src/DisplayWidth.zig
-/// Owned by https://codeberg.org/atman licensed under MIT all credits for this function go to him
-fn center(allocator: Allocator, str: []const u8, total_width: usize, pad: []const u8) ![]u8 {
-    if (str.len > total_width) return error.StrTooLong;
-    if (str.len == total_width) return try allocator.dupe(u8, str);
-
-    if (pad.len > total_width or str.len + pad.len > total_width) return error.PadTooLong;
-
-    const margin_width = @divFloor((total_width - str.len), 2);
-    if (pad.len > margin_width) return error.PadTooLong;
-
-    const extra_pad: usize = if (total_width % 2 != str.len % 2) 1 else 0;
-    const pads = @divFloor(margin_width, pad.len) * 2 + extra_pad;
-
-    var result = try allocator.alloc(u8, pads * pad.len + str.len);
-    var bytes_index: usize = 0;
-    var pads_index: usize = 0;
-
-    while (pads_index < pads / 2) : (pads_index += 1) {
-        @memcpy(result[bytes_index..][0..pad.len], pad);
-        bytes_index += pad.len;
-    }
-
-    @memcpy(result[bytes_index..][0..str.len], str);
-    bytes_index += str.len;
-
-    pads_index = 0;
-    while (pads_index < pads / 2 + extra_pad) : (pads_index += 1) {
-        @memcpy(result[bytes_index..][0..pad.len], pad);
-        bytes_index += pad.len;
-    }
-
-    return result;
-}
-
 /// This function is intended to be used only in tests. Test if the two
 /// provided cell arrays are identical. Usually the `Cell` slices are
 /// the contents of a given screen from the `zterm.testing.Renderer`. See
@@ -167,21 +127,28 @@ pub fn expectEqualCells(origin: Point, size: Point, expected: []const Cell, actu
     try testing.expectEqual(expected.len, @as(usize, size.y) * @as(usize, size.x));
 
     var expected_cps = try std.ArrayList(Cell).initCapacity(allocator, size.x);
-    defer expected_cps.deinit(allocator);
+    defer expected_cps.deinit();
 
     var actual_cps = try std.ArrayList(Cell).initCapacity(allocator, size.x);
-    defer actual_cps.deinit(allocator);
+    defer actual_cps.deinit();
 
-    var allocating_writer = std.Io.Writer.Allocating.init(allocator);
+    var output = try std.ArrayList(u8).initCapacity(allocator, expected_cps.capacity * actual_cps.capacity + 5 * size.y);
-    defer allocating_writer.deinit();
+    defer output.deinit();
 
-    var writer = &allocating_writer.writer;
+    var buffer = std.io.bufferedWriter(output.writer());
+    defer buffer.flush() catch {};
+
+    const writer = buffer.writer();
     var differ = false;
 
-    const expected_centered = try center(allocator, "Expected Screen", size.x, " ");
+    const dwd = try DisplayWidth.DisplayWidthData.init(allocator);
+    defer dwd.deinit();
+    const dw: DisplayWidth = .{ .data = &dwd };
+
+    const expected_centered = try dw.center(allocator, "Expected Screen", size.x, " ");
     defer allocator.free(expected_centered);
 
-    const actual_centered = try center(allocator, "Actual Screen", size.x, " ");
+    const actual_centered = try dw.center(allocator, "Actual Screen", size.x, " ");
     defer allocator.free(actual_centered);
 
     try writer.print("Screens are not equivalent.\n{s} ┆ {s}\n", .{ expected_centered, actual_centered });
@@ -197,8 +164,8 @@ pub fn expectEqualCells(origin: Point, size: Point, expected: []const Cell, actu
 
             if (!expected_cell.eql(actual_cell)) differ = true;
 
-            try expected_cps.append(allocator, expected_cell);
+            try expected_cps.append(expected_cell);
-            try actual_cps.append(allocator, actual_cell);
+            try actual_cps.append(actual_cell);
         }
 
         // write screens both formatted to buffer
@@ -211,16 +178,13 @@ pub fn expectEqualCells(origin: Point, size: Point, expected: []const Cell, actu
     if (!differ) return;
 
     // test failed
-    var buf: [1024]u8 = undefined;
+    try buffer.flush();
 
-    std.debug.lockStdErr();
+    debug.lockStdErr();
-    defer std.debug.unlockStdErr();
+    defer debug.unlockStdErr();
-
-    var buffer = std.fs.File.stderr().writer(&buf);
-    var error_writer = &buffer.interface;
-    try error_writer.writeAll(writer.buffer[0..writer.end]);
-    try error_writer.flush();
 
+    const std_writer = std.io.getStdErr().writer();
+    try std_writer.writeAll(output.items);
     return error.TestExpectEqualCells;
 }
 
@@ -231,4 +195,5 @@ const Allocator = std.mem.Allocator;
 const event = @import("event.zig");
 const Container = @import("container.zig").Container;
 const Cell = @import("cell.zig");
+const DisplayWidth = @import("DisplayWidth");
 const Point = @import("point.zig").Point;