From f37875c6c4e42055735f1cda9fdbcb7ab11b80bc Mon Sep 17 00:00:00 2001
From: Sam Atman
Date: Fri, 13 Dec 2024 15:14:15 -0500
Subject: Add c0 and c1 control width options

This allows a build of DisplayWidth to give characters in those classes
a width, for cases where they'll be printed with a substitute in the
final display.  It also raises the size of possible characters from an
i3 to an i4, to accommodate printing C1s as e.g. <80> or \u{80}.
---
 src/DisplayWidth.zig | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/DisplayWidth.zig')

diff --git a/src/DisplayWidth.zig b/src/DisplayWidth.zig
index 621b8c1..04e6b0c 100644
--- a/src/DisplayWidth.zig
+++ b/src/DisplayWidth.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
+const options = @import("options");
 const ArrayList = std.ArrayList;
 const mem = std.mem;
 const simd = std.simd;
@@ -60,6 +61,7 @@ test "strWidth" {
     const data = try DisplayWidthData.init(testing.allocator);
     defer data.deinit();
     const self = Self{ .data = &data };
+    const c0 = options.c0_width orelse 0;
 
     try testing.expectEqual(@as(usize, 5), self.strWidth("Hello\r\n"));
     try testing.expectEqual(@as(usize, 1), self.strWidth("\u{0065}\u{0301}"));
@@ -74,19 +76,21 @@ test "strWidth" {
     try testing.expectEqual(@as(usize, 1), self.strWidth("\u{2764}")); // Default text presentation
     try testing.expectEqual(@as(usize, 1), self.strWidth("\u{2764}\u{FE0E}")); // Default text presentation with VS15 selector
     try testing.expectEqual(@as(usize, 2), self.strWidth("\u{2764}\u{FE0F}")); // Default text presentation with VS16 selector
-    try testing.expectEqual(@as(usize, 0), self.strWidth("A\x08")); // Backspace
-    try testing.expectEqual(@as(usize, 0), self.strWidth("\x7FA")); // DEL
-    try testing.expectEqual(@as(usize, 0), self.strWidth("\x7FA\x08\x08")); // never less than o
+    const expect_bs: usize = if (c0 == 0) 0 else 1 + c0;
+    try testing.expectEqual(expect_bs, self.strWidth("A\x08")); // Backspace
+    try testing.expectEqual(expect_bs, self.strWidth("\x7FA")); // DEL
+    const expect_long_del: usize = if (c0 == 0) 0 else 1 + (c0 * 3);
+    try testing.expectEqual(expect_long_del, self.strWidth("\x7FA\x08\x08")); // never less than 0
 
     // wcwidth Python lib tests. See: https://github.com/jquast/wcwidth/blob/master/tests/test_core.py
     const empty = "";
     try testing.expectEqual(@as(usize, 0), self.strWidth(empty));
     const with_null = "hello\x00world";
-    try testing.expectEqual(@as(usize, 10), self.strWidth(with_null));
+    try testing.expectEqual(@as(usize, 10 + c0), self.strWidth(with_null));
     const hello_jp = "コンニチハ, セカイ!";
     try testing.expectEqual(@as(usize, 19), self.strWidth(hello_jp));
     const control = "\x1b[0m";
-    try testing.expectEqual(@as(usize, 3), self.strWidth(control));
+    try testing.expectEqual(@as(usize, 3 + c0), self.strWidth(control));
     const balinese = "\u{1B13}\u{1B28}\u{1B2E}\u{1B44}";
     try testing.expectEqual(@as(usize, 3), self.strWidth(balinese));
 
-- 
cgit v1.2.3