Excise pixman, use z2d for sprite fonts, refactor box drawing, add new box characters

build.zig

@@ -1007,10 +1007,6 @@ fn addDeps(
         .optimize = optimize,
     });
     const opengl_dep = b.dependency("opengl", .{});
-    const pixman_dep = b.dependency("pixman", .{
-        .target = target,
-        .optimize = optimize,
-    });
     const sentry_dep = b.dependency("sentry", .{
         .target = target,
         .optimize = optimize,
@@ -1044,6 +1040,7 @@ fn addDeps(
         .target = target,
         .optimize = optimize,
     });
+    const z2d_dep = b.dependency("z2d", .{});
 
     // Wasm we do manually since it is such a different build.
     if (step.rootModuleTarget().cpu.arch == .wasm32) {
@@ -1125,12 +1122,16 @@ fn addDeps(
     step.root_module.addImport("spirv_cross", spirv_cross_dep.module("spirv_cross"));
     step.root_module.addImport("xev", libxev_dep.module("xev"));
     step.root_module.addImport("opengl", opengl_dep.module("opengl"));
-    step.root_module.addImport("pixman", pixman_dep.module("pixman"));
     step.root_module.addImport("sentry", sentry_dep.module("sentry"));
     step.root_module.addImport("ziglyph", ziglyph_dep.module("ziglyph"));
     step.root_module.addImport("vaxis", vaxis_dep.module("vaxis"));
     step.root_module.addImport("wuffs", wuffs_dep.module("wuffs"));
     step.root_module.addImport("zf", zf_dep.module("zf"));
+    step.root_module.addImport("z2d", b.addModule("z2d", .{
+        .root_source_file = z2d_dep.path("src/z2d.zig"),
+        .target = target,
+        .optimize = optimize,
+    }));
 
     // Mac Stuff
     if (step.rootModuleTarget().isDarwin()) {
@@ -1196,7 +1197,6 @@ fn addDeps(
         step.linkSystemLibrary2("freetype2", dynamic_link_opts);
         step.linkSystemLibrary2("libpng", dynamic_link_opts);
         step.linkSystemLibrary2("oniguruma", dynamic_link_opts);
-        step.linkSystemLibrary2("pixman-1", dynamic_link_opts);
         step.linkSystemLibrary2("zlib", dynamic_link_opts);
 
         if (config.font_backend.hasFontconfig()) {
@@ -1222,10 +1222,6 @@ fn addDeps(
         step.linkLibrary(freetype_dep.artifact("freetype"));
         try static_libs.append(freetype_dep.artifact("freetype").getEmittedBin());
 
-        // Pixman
-        step.linkLibrary(pixman_dep.artifact("pixman"));
-        try static_libs.append(pixman_dep.artifact("pixman").getEmittedBin());
-
         // Harfbuzz
         if (config.font_backend.hasHarfbuzz()) {
             step.linkLibrary(harfbuzz_dep.artifact("harfbuzz"));

build.zig.zon

@@ -36,7 +36,6 @@
         .macos = .{ .path = "./pkg/macos" },
         .oniguruma = .{ .path = "./pkg/oniguruma" },
         .opengl = .{ .path = "./pkg/opengl" },
-        .pixman = .{ .path = "./pkg/pixman" },
         .sentry = .{ .path = "./pkg/sentry" },
         .simdutf = .{ .path = "./pkg/simdutf" },
         .utfcpp = .{ .path = "./pkg/utfcpp" },
@@ -61,5 +60,9 @@
             .url = "git+https://github.com/natecraddock/zf.git?ref=main#bb27a917c3513785c6a91f0b1c10002a5029cacc",
             .hash = "1220a74107c7f153a2f809e41c7fa7e8dbf75c91043e39fad998247804e5edac2cc8",
         },
+        .z2d = .{
+            .url = "git+https://github.com/vancluever/z2d?ref=main#285a796eb9c25a2389f087d008f0e60faf0b8eda",
+            .hash = "12206445aa45bcf0170ace371905f705aec1d8d4f61e7dd77839c6621b8c407680a5",
+        },
     },
 }

nix/devShell.nix

@@ -41,7 +41,6 @@
   libXi,
   libXinerama,
   libXrandr,
-  pixman,
   zlib,
   alejandra,
   pandoc,
@@ -61,7 +60,6 @@
       harfbuzz
       libpng
       oniguruma
-      pixman
       zlib
 
       libX11
@@ -126,7 +124,6 @@ in
         harfbuzz
         libpng
         oniguruma
-        pixman
         zlib
 
         libX11

nix/package.nix

@@ -7,7 +7,6 @@
   freetype,
   harfbuzz,
   libpng,
-  pixman,
   zlib,
   libGL,
   libX11,
@@ -133,7 +132,6 @@ in
         freetype
         harfbuzz
         libpng
-        pixman
         zlib
 
         libX11