From 5be0ec3905301d6f8f4286a27ae7b3f5c22dd705 Mon Sep 17 00:00:00 2001
From: Timon Ringwald <timon.ringwald@mequen.de>
Date: Thu, 25 Aug 2022 22:47:11 +0200
Subject: [PATCH] unicode support added

---
 go.mod   |  2 ++
 go.sum   |  5 +++++
 utils.go | 11 +++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 1f63871..c1cc0f5 100644
--- a/go.mod
+++ b/go.mod
@@ -6,11 +6,13 @@ require (
 	git.milar.in/milarin/gmath v0.0.2
 	git.milar.in/milarin/slices v0.0.3
 	github.com/fatih/color v1.13.0
+	github.com/mattn/go-runewidth v0.0.13
 )
 
 require (
 	git.milar.in/milarin/channel v0.0.9 // indirect
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/rivo/uniseg v0.3.4 // indirect
 	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
 )
diff --git a/go.sum b/go.sum
index 1bbaafe..692b943 100644
--- a/go.sum
+++ b/go.sum
@@ -11,6 +11,11 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
+github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
diff --git a/utils.go b/utils.go
index e3e90e7..bfeee9e 100644
--- a/utils.go
+++ b/utils.go
@@ -3,6 +3,8 @@ package tprint
 import (
 	"strings"
 	"unicode"
+
+	"github.com/mattn/go-runewidth"
 )
 
 func maxLengthStr(a, b string) string {
@@ -25,9 +27,10 @@ func strLen(str string) int {
 	runes := []rune(str)
 
 	for i := 0; i < len(runes); i++ {
+		rn := runes[i]
 
 		// skip control sequences
-		if unicode.IsControl(runes[i]) {
+		if unicode.IsControl(rn) {
 			for j := i; j < len(runes)-1 && runes[j] != 'm'; j++ {
 				i = j
 			}
@@ -35,7 +38,11 @@ func strLen(str string) int {
 			continue
 		}
 
-		l++
+		if rn <= 0xFF || rn >= '─' && rn <= '╿' {
+			l++
+		} else {
+			l += runewidth.RuneWidth(rn)
+		}
 	}
 
 	return l