Merge remote-tracking branch 'upstream/main' into jacob/uucode

1 files changed, 5 insertions, 2 deletions

diff --git a/src/simd/codepoint_width.zig b/src/simd/codepoint_width.zig
index f5806948a..c39cfb4f3 100644
--- a/src/simd/codepoint_width.zig
+++ b/src/simd/codepoint_width.zig
@@ -1,11 +1,14 @@
 const std = @import("std");
+const options = @import("build_options");
 
 // vt.cpp
 extern "c" fn ghostty_simd_codepoint_width(u32) i8;
 
 pub fn codepointWidth(cp: u32) i8 {
-    //return @import("uucode").get(.wcwidth, @intCast(cp));
-    return ghostty_simd_codepoint_width(cp);
+    if (comptime options.simd) return ghostty_simd_codepoint_width(cp);
+    const uucode = @import("uucode");
+    if (cp > uucode.config.max_code_point) return 1;
+    return @import("uucode").get(.width, @intCast(cp));
 }
 
 test "codepointWidth basic" {