mod: use unbuffered streaming writer for TUIs

examples/elements/alignment.zig

@@ -58,22 +58,22 @@ pub fn main(init: std.process.Init) !void {
     var alignment: App.Alignment = .init(quit_container, .center);
     try container.append(try .init(allocator, .{}, alignment.element()));
 
-    try app.start(.full);
-    defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
+    try app.start(.full, w);
+    defer app.stop(w) catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
     while (true) {
-        const event = app.nextEvent();
+        const event = try 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(),
+            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) try 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(.{
+        container.handle(io, &app.model, event) catch |err| try app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -86,10 +86,10 @@ pub fn main(init: std.process.Init) !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(&app.model, try renderer.resize(w));
         container.reposition(&app.model, .{});
         try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
+        try renderer.flush(w);
     }
 }
 

examples/elements/button.zig

@@ -80,6 +80,13 @@ pub fn main(init: std.process.Init) !void {
     const io = init.io;
 
     var app: App = .init(allocator, io, .{});
+    var stdout = std.Io.File.stdout();
+    // var stdout_buffer: [4096]u8 = undefined;
+    // var writer = stdout.writerStreaming(io, &stdout_buffer);
+    var writer = stdout.writerStreaming(io, &.{});
+    const w = &writer.interface;
+    defer w.flush() catch |err| log.err("Could not flush: {any}", .{err});
+
     var renderer = zterm.Renderer.Buffered.init(allocator);
     defer renderer.deinit();
 

examples/elements/input.zig

@@ -37,7 +37,7 @@ const MouseDraw = struct {
         };
     }
 
-    fn handle(ctx: *anyopaque, _: *App.Model, event: App.Event) !void {
+    fn handle(ctx: *anyopaque, _: std.Io, _: *App.Model, event: App.Event) !void {
         const this: *@This() = @ptrCast(@alignCast(ctx));
         switch (event) {
             .mouse => |mouse| this.position = .{ .x = mouse.x, .y = mouse.y },
@@ -115,17 +115,17 @@ pub fn main(init: std.process.Init) !void {
     }, second_mouse_draw.element()));
     try container.append(nested_container);
 
-    try app.start(.full);
-    defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
+    try app.start(.full, w);
+    defer app.stop(w) catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
     while (true) {
-        const event = app.nextEvent();
+        const event = try 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(),
+            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) try app.quit(),
             .accept => |input| {
                 defer allocator.free(input);
                 log.debug("Accepted input '{s}'", .{input});
@@ -134,7 +134,7 @@ pub fn main(init: std.process.Init) !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
+        container.handle(io, &app.model, event) catch |err| try app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -147,10 +147,10 @@ pub fn main(init: std.process.Init) !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(&app.model, try renderer.resize(w));
         container.reposition(&app.model, .{});
         try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
+        try renderer.flush(w);
     }
 }
 

examples/elements/progress.zig

@@ -88,8 +88,8 @@ pub fn main(init: std.process.Init) !void {
         });
         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});
+    try app.start(.full, w);
+    defer app.stop(w) catch |err| log.err("Failed to stop application: {any}", .{err});
 
     var framerate: u64 = 60;
     var tick_ms: u64 = @divFloor(time.ms_per_s, framerate);
@@ -100,11 +100,11 @@ pub fn main(init: std.process.Init) !void {
     // Continuous drawing
     // draw loop
     draw: while (true) {
-        const now_ms: u64 = @intCast(time.milliTimestamp());
+        const now_ms: u64 = @intCast(std.Io.Timestamp.now(io, .real).toMilliseconds());
         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);
+            try io.sleep(.{ .nanoseconds = (next_frame_ms - now_ms) * time.ns_per_ms }, .real);
             next_frame_ms += tick_ms;
         }
 
@@ -114,12 +114,12 @@ pub fn main(init: std.process.Init) !void {
             increase_progress = 10;
             progress_percent += 1;
             if (progress_percent > 100) progress_percent = 0;
-            app.postEvent(.{ .progress = progress_percent });
+            try app.postEvent(.{ .progress = progress_percent });
         }
 
         const len = blk: {
-            app.queue.lock();
-            defer app.queue.unlock();
+            try app.queue.lock(io);
+            defer app.queue.unlock(io);
             break :blk app.queue.len();
         };
 
@@ -130,7 +130,7 @@ pub fn main(init: std.process.Init) !void {
             // pre event handling
             switch (event) {
                 .key => |key| {
-                    if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit();
+                    if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) try app.quit();
                 },
                 .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
                 .focus => |b| {
@@ -141,7 +141,7 @@ pub fn main(init: std.process.Init) !void {
                 else => {},
             }
 
-            container.handle(&app.model, event) catch |err| app.postEvent(.{
+            container.handle(io, &app.model, event) catch |err| try app.postEvent(.{
                 .err = .{
                     .err = err,
                     .msg = "Container Event handling failed",
@@ -155,10 +155,10 @@ pub fn main(init: std.process.Init) !void {
             }
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(&app.model, try renderer.resize(w));
         container.reposition(&app.model, .{});
         try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
+        try renderer.flush(w);
     }
 }
 

examples/elements/radio-button.zig

@@ -54,23 +54,23 @@ pub fn main(init: std.process.Init) !void {
     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});
+    try app.start(.full, w);
+    defer app.stop(w) catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
     while (true) {
-        const event = app.nextEvent();
+        const event = try 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(),
+            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) try 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(.{
+        container.handle(io, &app.model, event) catch |err| try app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -83,10 +83,10 @@ pub fn main(init: std.process.Init) !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(&app.model, try renderer.resize(w));
         container.reposition(&app.model, .{});
         try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
+        try renderer.flush(w);
     }
 }
 

examples/elements/scrollable.zig

@@ -60,8 +60,9 @@ pub fn main(init: std.process.Init) !void {
 
     var app: App = .init(allocator, io, .{});
     var stdout = std.Io.File.stdout();
-    var stdout_buffer: [4096]u8 = undefined;
-    var writer = stdout.writerStreaming(io, &stdout_buffer);
+    // var stdout_buffer: [4096]u8 = undefined;
+    // var writer = stdout.writerStreaming(io, &stdout_buffer);
+    var writer = stdout.writerStreaming(io, &.{});
     const w = &writer.interface;
     defer w.flush() catch |err| log.err("Could not flush: {any}", .{err});
 
@@ -165,7 +166,7 @@ pub fn main(init: std.process.Init) !void {
             else => {},
         }
 
-        container.handle(&app.model, event) catch |err| try app.postEvent(.{
+        container.handle(io, &app.model, event) catch |err| try app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",

examples/elements/selection.zig

@@ -55,22 +55,22 @@ pub fn main(init: std.process.Init) !void {
     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});
+    try app.start(.full, w);
+    defer app.stop(w) catch |err| log.err("Failed to stop application: {any}", .{err});
 
     // event loop
     while (true) {
-        const event = app.nextEvent();
+        const event = try 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(),
+            .key => |key| if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) try 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(.{
+        container.handle(io, &app.model, event) catch |err| try app.postEvent(.{
             .err = .{
                 .err = err,
                 .msg = "Container Event handling failed",
@@ -83,10 +83,10 @@ pub fn main(init: std.process.Init) !void {
             else => {},
         }
 
-        container.resize(&app.model, try renderer.resize());
+        container.resize(&app.model, try renderer.resize(w));
         container.reposition(&app.model, .{});
         try renderer.render(@TypeOf(container), &container, App.Model, &app.model);
-        try renderer.flush();
+        try renderer.flush(w);
     }
 }