From 3a77df7ce267c238b0b56e06851e0f3783b6bc33 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 27 Oct 2023 08:23:43 -0700
Subject: [PATCH] terminal: in mode 2027, do not attach any width=0 char unless
 grapheme

---
 src/terminal/Terminal.zig | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 05e0f0d59..1c79fc615 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -766,6 +766,11 @@ pub fn print(self: *Terminal, c: u21) !void {
 
     // Attach zero-width characters to our cell as grapheme data.
     if (width == 0) {
+        // If we have grapheme clustering enabled, we don't blindly attach
+        // any zero width character to our cells and we instead just ignore
+        // it.
+        if (self.modes.get(.grapheme_cluster)) return;
+
         // If we're at cell zero, then this is malformed data and we don't
         // print anything or even store this. Zero-width characters are ALWAYS
         // attached to some other non-zero-width character at the time of
@@ -2170,6 +2175,31 @@ test "Terminal: print over wide spacer tail" {
     }
 }
 
+test "Terminal: zero width chars with grapheme clustering can be put in their own cell" {
+    var t = try init(testing.allocator, 5, 5);
+    defer t.deinit(testing.allocator);
+
+    // Enable grapheme clustering
+    t.modes.set(.grapheme_cluster, true);
+
+    try t.print('x');
+    try t.print(0x7F); // zero-width control character
+
+    {
+        var str = try t.plainString(testing.allocator);
+        defer testing.allocator.free(str);
+        try testing.expectEqualStrings("x", str);
+    }
+
+    const row = t.screen.getRow(.{ .screen = 0 });
+    {
+        const cell = row.getCell(0);
+        try testing.expectEqual(@as(u32, 'x'), cell.char);
+        try testing.expect(!cell.attrs.wide);
+        try testing.expect(!cell.attrs.grapheme);
+    }
+}
+
 test "Terminal: VS15 to make narrow character" {
     var t = try init(testing.allocator, 5, 5);
     defer t.deinit(testing.allocator);