summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/Post.zig14
-rw-r--r--src/gui/gui.zig20
2 files changed, 15 insertions, 19 deletions
diff --git a/src/gui/Post.zig b/src/gui/Post.zig
index fc256135..8d0e14d9 100644
--- a/src/gui/Post.zig
+++ b/src/gui/Post.zig
@@ -610,13 +610,13 @@ const GhosttyUniforms = extern struct {
};
test "the uniform block is ghostty's, offset for offset, and the prefix names it in that order" {
- const ours = @typeInfo(Uniforms).@"struct".fields;
- const theirs = @typeInfo(GhosttyUniforms).@"struct".fields;
- try std.testing.expectEqual(theirs.len, ours.len);
+ const ours = @typeInfo(Uniforms).@"struct";
+ const theirs = @typeInfo(GhosttyUniforms).@"struct";
+ try std.testing.expectEqual(theirs.field_names.len, ours.field_names.len);
try std.testing.expectEqual(@sizeOf(GhosttyUniforms), @sizeOf(Uniforms));
- inline for (ours, theirs) |a, b| {
- try std.testing.expectEqual(@offsetOf(GhosttyUniforms, b.name), @offsetOf(Uniforms, a.name));
- try std.testing.expectEqual(b.type, a.type);
+ inline for (ours.field_names, ours.field_types, theirs.field_names, theirs.field_types) |a, a_type, b, b_type| {
+ try std.testing.expectEqual(@offsetOf(GhosttyUniforms, b), @offsetOf(Uniforms, a));
+ try std.testing.expectEqual(b_type, a_type);
}
// By NAME: iSelectionForegroundColor sits where ghostty's Zig says
// selection_background, which is where its GLSL puts the foreground.
@@ -633,7 +633,7 @@ test "the uniform block is ghostty's, offset for offset, and the prefix names it
.{ "vec3", "iBackgroundColor" }, .{ "vec3", "iForegroundColor" }, .{ "vec3", "iCursorColor" },
.{ "vec3", "iCursorText" }, .{ "vec3", "iSelectionForegroundColor" }, .{ "vec3", "iSelectionBackgroundColor" },
};
- try std.testing.expectEqual(ours.len, glsl.len);
+ try std.testing.expectEqual(ours.field_names.len, glsl.len);
// Its three blocks (Globals, Palette, Colors) read as one, in order.
const start = std.mem.indexOf(u8, prefix, "uniform Globals {").?;
const end = std.mem.indexOf(u8, prefix, "uniform PardesPost {").?;
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 5a026664..b8687fd3 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -25,11 +25,7 @@ const ninep_io = @import("../9p_io.zig");
const detached_client = @import("../detached/client.zig");
const tracy = @import("../tracy.zig");
-pub const c = @cImport({
- @cDefine("SDL_DISABLE_OLD_NAMES", "1");
- @cInclude("SDL3/SDL.h");
- @cInclude("font.h");
-});
+pub const c = @import("gui_c"); // SDL3 and font.h, translated by build.zig
const host_io = @import("../host_io.zig");
extern "c" fn setenv(name: [*:0]const u8, value: [*:0]const u8, overwrite: c_int) c_int;
@@ -4806,7 +4802,7 @@ fn dumpThemes(ctx: ?*anyopaque, pane: u8) void {
}
fn putClipboard(gpa: std.mem.Allocator, text: []const u8) void {
- const z = gpa.dupeZ(u8, text) catch return;
+ const z = gpa.dupeSentinel(u8, text, 0) catch return;
defer gpa.free(z);
_ = c.SDL_SetClipboardText(z.ptr);
}
@@ -5131,7 +5127,7 @@ test "a wheel over codex in a terminal reaches its pty as the mouse reports it a
wheelAt(&g, &in, .{ .y = 1, .integer_y = 1 }, mc);
try std.testing.expectEqualStrings("\x1b[<64;6;4M", try Sent.take(core, &sent));
wheelAt(&g, &in, .{ .y = -3, .integer_y = -3 }, mc);
- try std.testing.expectEqualStrings("\x1b[<65;6;4M" ** 3, try Sent.take(core, &sent));
+ try std.testing.expectEqualStrings(std.mem.asBytes(&@as([3][10]u8, @splat("\x1b[<65;6;4M".*))), try Sent.take(core, &sent));
try std.testing.expectEqual(@as(i32, 0), g.scroll_notch);
try std.testing.expect(g.scroll_pane == null);
// A touchpad's fractions add up to a turn.
@@ -7157,7 +7153,7 @@ test "every pixel of a grip column is band, button or ring, and the button sits
const gpa = std.testing.allocator;
const core = try pardes.Pardes.init(gpa, .{ .cols = 60, .rows = 20 });
defer core.deinit();
- const pane = try core.setTestFile("text\n" ** 60);
+ const pane = try core.setTestFile(std.mem.asBytes(&@as([60][5]u8, @splat("text\n".*))));
pane.tag.own = try gpa.dupe(u8, "second\nthird");
core.newScratchBelow(0);
for ([_]struct { w: u32, h: u32, tag: u32 }{ .{ .w = 10, .h = 20, .tag = 12 }, .{ .w = 17, .h = 35, .tag = 30 }, .{ .w = 9, .h = 19, .tag = 15 }, .{ .w = 12, .h = 24, .tag = 24 } }) |m| for ([_]bool{ false, true }) |bottom| for ([_]usize{ 0, 1 }) |focus| for ([_]bool{ false, true }) |dirty| {
@@ -10156,7 +10152,7 @@ test "the selection glows round its block, on the body only, fading in over 100
const gpa = std.testing.allocator;
const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 });
defer core.deinit();
- _ = try core.setTestFile("some text on a line\n" ** 30);
+ _ = try core.setTestFile(std.mem.asBytes(&@as([30][20]u8, @splat("some text on a line\n".*))));
core.settings.selection_glow = true;
pardes.test_api.sync(core);
const s = try core.render(core.scratch.allocator());
@@ -10206,7 +10202,7 @@ test "a hovered word glows along its foot, never over the cursor, fading in over
const gpa = std.testing.allocator;
const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 });
defer core.deinit();
- _ = try core.setTestFile("some text on a line\n" ** 30);
+ _ = try core.setTestFile(std.mem.asBytes(&@as([30][20]u8, @splat("some text on a line\n".*))));
core.settings.hover_glow = true;
pardes.test_api.sync(core);
const s = try core.render(core.scratch.allocator());
@@ -10256,7 +10252,7 @@ test "occlusion shades each body's edges, inside it, never a tag, a grip or the
const gpa = std.testing.allocator;
const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 });
defer core.deinit();
- _ = try core.setTestFile("some text on a line\n" ** 30);
+ _ = try core.setTestFile(std.mem.asBytes(&@as([30][20]u8, @splat("some text on a line\n".*))));
core.settings.occlusion = true;
pardes.test_api.sync(core);
const s = try core.render(core.scratch.allocator());
@@ -10295,7 +10291,7 @@ test "a body tells its first line, and lapis's dots under it move a quarter as f
const gpa = std.testing.allocator;
const core = try pardes.Pardes.init(gpa, .{ .cols = 80, .rows = 24 });
defer core.deinit();
- const pane = try core.setTestFile("line\n" ** 80);
+ const pane = try core.setTestFile(std.mem.asBytes(&@as([80][5]u8, @splat("line\n".*))));
pane.scrollBy(8);
try std.testing.expect(core.executeBuiltinLine(0, "Theme lapis"));
core.settings.parallax = true;