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

mod: bump zig master version
Some checks failed
Zig Project Action / Lint, Spell-check and test zig project (push) Failing after 1m9s
Details

Browse Source
This commit is contained in:
Yves Biener
2026-01-06 22:58:10 +01:00
parent c49c2a5c6d
commit b1a0d60ae3
20 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/continuous.zig
View File

@@ -133,7 +133,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

4
examples/demo.zig
View File

@@ -31,7 +31,7 @@ pub fn main() !void {
defer if (gpa.deinit() == .leak) log.err("memory leak", .{});
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});
@@ -153,7 +153,7 @@ pub fn main() !void {
renderer.size = .{}; // reset size, such that next resize will cause a full re-draw!
defer app.start() catch @panic("could not start app event loop");
var child = std.process.Child.init(&.{"hx"}, allocator);
_ = child.spawnAndWait() catch |err| app.postEvent(.{
_ = child.spawnAndWait(threaded_io.io()) catch |err| app.postEvent(.{
.err = .{
.err = err,
.msg = "Spawning $EDITOR failed",

2
examples/elements/alignment.zig
View File

@@ -32,7 +32,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/elements/button.zig
View File

@@ -82,7 +82,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/elements/input.zig
View File

@@ -65,7 +65,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/elements/progress.zig
View File

@@ -32,7 +32,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/elements/radio-button.zig
View File

@@ -32,7 +32,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/elements/scrollable.zig
View File

@@ -65,7 +65,7 @@ pub fn main() !void {
}
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/elements/selection.zig
View File

@@ -32,7 +32,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/errors.zig
View File

@@ -97,7 +97,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/layouts/grid.zig
View File

@@ -35,7 +35,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/layouts/horizontal.zig
View File

@@ -35,7 +35,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/layouts/mixed.zig
View File

@@ -35,7 +35,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/layouts/vertical.zig
View File

@@ -35,7 +35,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/styles/palette.zig
View File

@@ -32,7 +32,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
examples/styles/text.zig
View File

@@ -178,7 +178,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
var threaded_io: std.Io.Threaded = .init(allocator);
var threaded_io: std.Io.Threaded = .init(allocator, .{});
defer threaded_io.deinit();
var app: App = .init(threaded_io.ioBasic(), .{});

2
src/app.zig
View File

@@ -146,7 +146,7 @@ pub fn App(comptime M: type, comptime E: type) type {
};
}
while (true) {
if (this.io.cancelRequested()) break;
this.io.checkCancel() catch break;
// non-blocking read
const read_bytes = terminal.read(&buf) catch |err| switch (err) {

1
src/element.zig
View File

@@ -5,6 +5,7 @@
// -> currently you need to swap out the entire `Container` accordingly before rendering
// -> this might be necessary for size depending layout options, etc.
// -> maybe this can be implemented / supported similarly as to how the scrollable `Element`'s are implemented
// - `Form` using a struct that contains the fields that shall be generated for the user to submit (similar to `Input` it shall be build on-top of smaller pieces that are designed to be used in `Element` implementations)
// FIX known issues:
// - hold fewer instances of the `Allocator`

60
src/event.zig
View File

@@ -46,21 +46,44 @@ pub fn mergeTaggedUnions(comptime A: type, comptime B: type) type {
const b_fields = @typeInfo(B).@"union".fields;
const b_fields_tag = @typeInfo(B).@"union".tag_type.?;
const b_enum_fields = @typeInfo(b_fields_tag).@"enum".fields;
var fields: [a_fields.len + b_fields.len]std.builtin.Type.UnionField = undefined;
var enum_fields: [a_fields.len + b_fields.len]std.builtin.Type.EnumField = undefined;
var field_names: [a_fields.len + b_fields.len][:0]const u8 = undefined;
var field_types: [a_fields.len + b_fields.len]type = undefined;
var field_attributes: [a_fields.len + b_fields.len]std.builtin.Type.UnionField.Attributes = undefined;
var enum_names: [a_fields.len + b_fields.len][:0]const u8 = undefined;
const UEnumSize = blk: {
const total_size = a_fields.len + b_fields.len;
break :blk switch (total_size) {
1...2 => u1,
3...4 => u2,
5...8 => u4,
9...16 => u4,
17...32 => u5,
33...64 => u6,
65...128 => u7,
129...256 => u8,
else => u16, // should suffice
};
};
var enum_values: [a_fields.len + b_fields.len]UEnumSize = undefined;
var i: usize = 0;
for (a_fields, a_enum_fields) |field, enum_field| {
fields[i] = field;
field_names[i] = field.name;
field_types[i] = field.type;
field_attributes[i] = .{ .@"align" = field.alignment };
var enum_f = enum_field;
enum_f.value = i;
enum_fields[i] = enum_f;
enum_names[i] = enum_f.name;
enum_values[i] = enum_f.value;
i += 1;
}
for (b_fields, b_enum_fields) |field, enum_field| {
fields[i] = field;
field_names[i] = field.name;
field_types[i] = field.type;
field_attributes[i] = .{ .@"align" = field.alignment };
var enum_f = enum_field;
enum_f.value = i;
enum_fields[i] = enum_f;
enum_names[i] = enum_f.name;
enum_values[i] = enum_f.value;
i += 1;
}
@@ -71,35 +94,22 @@ pub fn mergeTaggedUnions(comptime A: type, comptime B: type) type {
// 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 decl_names: [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;
decl_names[j] = decl.name;
j += 1;
}
for (b_enum_decls) |decl| {
decls[j] = decl;
decl_names[j] = decl.name;
j += 1;
}
const EventType = @Type(.{ .int = .{
.signedness = .unsigned,
.bits = @bitSizeOf(@TypeOf(i)) - @clz(i),
} });
const EventType = @Int(.unsigned, @bitSizeOf(@TypeOf(i)) - @clz(i));
const Event = @Type(.{ .@"enum" = .{
.tag_type = EventType,
.fields = enum_fields[0..],
.decls = &.{},
.is_exhaustive = true,
} });
const Event = @Enum(EventType, .exhaustive, enum_names[0..], enum_values[0..]);
return @Type(.{ .@"union" = .{
.layout = .auto,
.tag_type = Event,
.fields = fields[0..],
.decls = &.{},
} });
return @Union(.auto, Event, field_names[0..], field_types[0..], field_attributes[0..]);
}
/// Determine whether the provided type `T` is a tagged union: `union(enum)`.

13
src/testing.zig
View File

@@ -211,14 +211,13 @@ pub fn expectEqualCells(origin: Point, size: Point, expected: []const Cell, actu
if (!differ) return;
// test failed
debug.lockStdErr();
defer debug.unlockStdErr();
var stdout_buffer: [1024]u8 = undefined;
var stdout = std.fs.File.stdout().writer(&stdout_buffer);
const stdout_writer = &stdout.interface;
try stdout_writer.writeAll(writer.buffer[0..writer.end]);
try stdout_writer.flush();
const io = debug.lockStderr(&stdout_buffer);
defer debug.unlockStderr();
const error_writer = &io.file_writer.interface;
try error_writer.writeAll(writer.buffer[0..writer.end]);
try error_writer.flush();
return error.TestExpectEqualCells;
}