v2.1.2: ignore ANSI when measuring board height

1 files changed, 23 insertions, 1 deletions

diff --git a/src/client/ui.rs b/src/client/ui.rs
index 11cedc7..1a35db1 100644
--- a/src/client/ui.rs
+++ b/src/client/ui.rs
@@ -159,7 +159,29 @@ pub fn parse_bet_arg(raw: &str) -> Result<u64, String> {
 /// ASCII, Latin diacritics, combining marks, CJK, and the common emoji ranges
 /// without adding a dependency.
 pub fn display_width(text: &str) -> usize {
-    text.chars().map(char_width).sum()
+    let mut width = 0;
+    let mut chars = text.chars().peekable();
+
+    while let Some(character) = chars.next() {
+        if character == '\x1b' {
+            if chars.peek() == Some(&'[') {
+                chars.next();
+                // Skip CSI parameters until the final byte (@ through ~).
+                for character in chars.by_ref() {
+                    if ('@'..='~').contains(&character) {
+                        break;
+                    }
+                }
+            } else {
+                // Two-character escape sequence.
+                chars.next();
+            }
+            continue;
+        }
+        width += char_width(character);
+    }
+
+    width
 }
 
 fn char_width(c: char) -> usize {