From bedb9979a9b65dad9d72dcbdb3174508d3714f36 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 23 May 2018 00:44:08 +0300
Subject: Update some dependencies

---
 vendor/maunium.net/go/tview/util.go | 73 ++++++++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 14 deletions(-)

(limited to 'vendor/maunium.net/go/tview/util.go')

diff --git a/vendor/maunium.net/go/tview/util.go b/vendor/maunium.net/go/tview/util.go
index 2b3a544..41e52dd 100644
--- a/vendor/maunium.net/go/tview/util.go
+++ b/vendor/maunium.net/go/tview/util.go
@@ -297,7 +297,7 @@ func Print(screen tcell.Screen, text string, x, y, maxWidth, align int, color tc
 // printWithStyle works like Print() but it takes a style instead of just a
 // foreground color.
 func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int, style tcell.Style) (int, int) {
-	if maxWidth < 0 {
+	if maxWidth <= 0 || len(text) == 0 {
 		return 0, 0
 	}
 
@@ -315,6 +315,9 @@ func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int,
 			colorPos, escapePos, runePos, startPos       int
 			foregroundColor, backgroundColor, attributes string
 		)
+		if from >= len(runes) {
+			return ""
+		}
 		for pos := range text {
 			// Handle color tags.
 			if colorPos < len(colorIndices) && pos >= colorIndices[colorPos][0] && pos < colorIndices[colorPos][1] {
@@ -361,6 +364,9 @@ func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int,
 			width += w
 			start = index
 		}
+		for start < len(runes) && runewidth.RuneWidth(runes[start]) == 0 {
+			start++
+		}
 		return printWithStyle(screen, substring(start, len(runes)), x+maxWidth-width, y, width, AlignLeft, style)
 	} else if align == AlignCenter {
 		width := runewidth.StringWidth(strippedText)
@@ -376,12 +382,15 @@ func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int,
 			var choppedLeft, choppedRight, leftIndex, rightIndex int
 			rightIndex = len(runes) - 1
 			for rightIndex > leftIndex && width-choppedLeft-choppedRight > maxWidth {
-				leftWidth := runewidth.RuneWidth(runes[leftIndex])
-				rightWidth := runewidth.RuneWidth(runes[rightIndex])
 				if choppedLeft < choppedRight {
+					leftWidth := runewidth.RuneWidth(runes[leftIndex])
 					choppedLeft += leftWidth
 					leftIndex++
+					for leftIndex < len(runes) && leftIndex < rightIndex && runewidth.RuneWidth(runes[leftIndex]) == 0 {
+						leftIndex++
+					}
 				} else {
+					rightWidth := runewidth.RuneWidth(runes[rightIndex])
 					choppedRight += rightWidth
 					rightIndex--
 				}
@@ -397,9 +406,39 @@ func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int,
 		colorPos, escapePos                          int
 		foregroundColor, backgroundColor, attributes string
 	)
+	runeSequence := make([]rune, 0, 10)
+	runeSeqWidth := 0
+	flush := func() {
+		if len(runeSequence) == 0 {
+			return // Nothing to flush.
+		}
+
+		// Print the rune sequence.
+		finalX := x + drawnWidth
+		_, _, finalStyle, _ := screen.GetContent(finalX, y)
+		_, background, _ := finalStyle.Decompose()
+		finalStyle = overlayStyle(background, style, foregroundColor, backgroundColor, attributes)
+		var comb []rune
+		if len(runeSequence) > 1 {
+			// Allocate space for the combining characters only when necessary.
+			comb = make([]rune, len(runeSequence)-1)
+			copy(comb, runeSequence[1:])
+		}
+		for offset := 0; offset < runeSeqWidth; offset++ {
+			// To avoid undesired effects, we place the same character in all cells.
+			screen.SetContent(finalX+offset, y, runeSequence[0], comb, finalStyle)
+		}
+
+		// Advance and reset.
+		drawn += len(runeSequence)
+		drawnWidth += runeSeqWidth
+		runeSequence = runeSequence[:0]
+		runeSeqWidth = 0
+	}
 	for pos, ch := range text {
 		// Handle color tags.
 		if colorPos < len(colorIndices) && pos >= colorIndices[colorPos][0] && pos < colorIndices[colorPos][1] {
+			flush()
 			if pos == colorIndices[colorPos][1]-1 {
 				foregroundColor, backgroundColor, attributes = styleFromTag(foregroundColor, backgroundColor, attributes, colors[colorPos])
 				colorPos++
@@ -409,6 +448,7 @@ func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int,
 
 		// Handle escape tags.
 		if escapePos < len(escapeIndices) && pos >= escapeIndices[escapePos][0] && pos < escapeIndices[escapePos][1] {
+			flush()
 			if pos == escapeIndices[escapePos][1]-1 {
 				escapePos++
 			} else if pos == escapeIndices[escapePos][1]-2 {
@@ -419,21 +459,26 @@ func printWithStyle(screen tcell.Screen, text string, x, y, maxWidth, align int,
 		// Check if we have enough space for this rune.
 		chWidth := runewidth.RuneWidth(ch)
 		if drawnWidth+chWidth > maxWidth {
-			break
+			break // No. We're done then.
 		}
-		finalX := x + drawnWidth
 
-		// Print the rune.
-		_, _, finalStyle, _ := screen.GetContent(finalX, y)
-		_, background, _ := finalStyle.Decompose()
-		finalStyle = overlayStyle(background, style, foregroundColor, backgroundColor, attributes)
-		for offset := 0; offset < chWidth; offset++ {
-			// To avoid undesired effects, we place the same character in all cells.
-			screen.SetContent(finalX+offset, y, ch, nil, finalStyle)
+		// Put this rune in the queue.
+		if chWidth == 0 {
+			// If this is not a modifier, we treat it as a space character.
+			if len(runeSequence) == 0 {
+				ch = ' '
+				chWidth = 1
+			}
+		} else {
+			// We have a character. Flush all previous runes.
+			flush()
 		}
+		runeSequence = append(runeSequence, ch)
+		runeSeqWidth += chWidth
 
-		drawn++
-		drawnWidth += chWidth
+	}
+	if drawnWidth+runeSeqWidth <= maxWidth {
+		flush()
 	}
 
 	return drawn, drawnWidth
-- 
cgit v1.2.3