From fa06849dcc54c51bfbafe7bead55fb48f17d469b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 30 Jan 2026 15:11:12 -0800
Subject: [PATCH] renderer: overlay explicit error sets

---
 src/renderer/Overlay.zig | 21 ++++++++++++++++-----
 src/renderer/generic.zig |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/renderer/Overlay.zig b/src/renderer/Overlay.zig
index 130d33361..898e4cf93 100644
--- a/src/renderer/Overlay.zig
+++ b/src/renderer/Overlay.zig
@@ -15,18 +15,29 @@ surface: z2d.Surface,
 /// Cell size information so we can map grid coordinates to pixels.
 cell_size: CellSize,
 
+pub const InitError = Allocator.Error || error{
+    // The terminal dimensions are invalid to support an overlay.
+    // Either too small or too big.
+    InvalidDimensions,
+};
+
 /// Initialize a new, blank overlay.
-pub fn init(alloc: Allocator, sz: Size) !Overlay {
+pub fn init(alloc: Allocator, sz: Size) InitError!Overlay {
     // Our surface does NOT need to take into account padding because
     // we render the overlay using the image subsystem and shaders which
     // already take that into account.
     const term_size = sz.terminal();
-    var sfc: z2d.Surface = try .initPixel(
+    var sfc = z2d.Surface.initPixel(
         .{ .rgba = .{ .r = 0, .g = 0, .b = 0, .a = 0 } },
         alloc,
-        std.math.cast(i32, term_size.width).?,
-        std.math.cast(i32, term_size.height).?,
-    );
+        std.math.cast(i32, term_size.width) orelse
+            return error.InvalidDimensions,
+        std.math.cast(i32, term_size.height) orelse
+            return error.InvalidDimensions,
+    ) catch |err| switch (err) {
+        error.OutOfMemory => return error.OutOfMemory,
+        error.InvalidWidth, error.InvalidHeight => return error.InvalidDimensions,
+    };
     errdefer sfc.deinit(alloc);
 
     return .{
diff --git a/src/renderer/generic.zig b/src/renderer/generic.zig
index b817a8cf9..3585706c0 100644
--- a/src/renderer/generic.zig
+++ b/src/renderer/generic.zig
@@ -2207,7 +2207,7 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
             }
         }
 
-        fn rebuildOverlay(self: *Self, alloc: Allocator) !Overlay {
+        fn rebuildOverlay(self: *Self, alloc: Allocator) Overlay.InitError!Overlay {
             var overlay: Overlay = try .init(alloc, self.size);
             overlay.highlightHyperlinks(alloc, &self.terminal_state);
             return overlay;