Merge branch 'rivo:master' into table-left-overflow

README.md

@@ -88,6 +88,9 @@ For a presentation highlighting this package, compile and run the program found
 - [Browse your AWS ECS Clusters in the Terminal](https://github.com/swartzrock/ecsview)
 - [The CLI Task Manager for Geeks](https://github.com/ajaxray/geek-life)
 - [Fast disk usage analyzer written in Go](https://github.com/dundee/gdu)
+- [Multiplayer Chess On Terminal](https://github.com/qnkhuat/gochess)
+- [Scriptable TUI music player](https://github.com/issadarkthing/gomu)
+- [MangaDesk : TUI Client for downloading manga to your computer](https://github.com/darylhjd/mangadesk)
 
 ## Documentation
 

ansi.go

@@ -128,19 +128,19 @@ func (a *ansi) Write(text []byte) (int, error) {
 					for index, field := range fields {
 						switch field {
 						case "1", "01":
-							if strings.IndexRune(a.attributes, 'b') < 0 {
+							if !strings.ContainsRune(a.attributes, 'b') {
 								a.attributes += "b"
 							}
 						case "2", "02":
-							if strings.IndexRune(a.attributes, 'd') < 0 {
+							if !strings.ContainsRune(a.attributes, 'd') {
 								a.attributes += "d"
 							}
 						case "4", "04":
-							if strings.IndexRune(a.attributes, 'u') < 0 {
+							if !strings.ContainsRune(a.attributes, 'u') {
 								a.attributes += "u"
 							}
 						case "5", "05":
-							if strings.IndexRune(a.attributes, 'l') < 0 {
+							if !strings.ContainsRune(a.attributes, 'l') {
 								a.attributes += "l"
 							}
 						case "22":

demos/inputfield/autocompleteasync/main.go

@@ -12,7 +12,7 @@ import (
 )
 
 type company struct {
-	Name string `json:name`
+	Name string `json:"name"`
 }
 
 func main() {

go.mod

@@ -3,8 +3,7 @@ module github.com/rivo/tview
 go 1.12
 
 require (
-	github.com/gdamore/tcell v1.4.0 // indirect
-	github.com/gdamore/tcell/v2 v2.2.0
+	github.com/gdamore/tcell/v2 v2.2.1
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-runewidth v0.0.10
 	github.com/rivo/uniseg v0.2.0

go.sum

@@ -1,34 +1,23 @@
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=
-github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0=
-github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7NxVyGo8M3KI5jbkiwNAdZFFzAdC68up4=
-github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
 github.com/gdamore/tcell/v2 v2.2.0 h1:vSyEgKwraXPSOkvCk7IwOSyX+Pv3V2cV9CikJMXg4U4=
 github.com/gdamore/tcell/v2 v2.2.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
-github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
+github.com/gdamore/tcell/v2 v2.2.1 h1:Gt8wk0jd5pIK2CyXNo/fqwxNWf726j1lQjEDdfbnqTc=
+github.com/gdamore/tcell/v2 v2.2.1/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg=
 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10=
-golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 h1:nVuTkr9L6Bq62qpUqKo/RnZCFfzDBL0bYo6w9OJUqZY=
-golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

list.go

@@ -572,9 +572,15 @@ func (l *List) InputHandler() func(event *tcell.EventKey, setFocus func(p Primit
 		case tcell.KeyPgDn:
 			_, _, _, height := l.GetInnerRect()
 			l.currentItem += height
+			if l.currentItem >= len(l.items) {
+				l.currentItem = len(l.items) - 1
+			}
 		case tcell.KeyPgUp:
 			_, _, _, height := l.GetInnerRect()
 			l.currentItem -= height
+			if l.currentItem < 0 {
+				l.currentItem = 0
+			}
 		case tcell.KeyEnter:
 			if l.currentItem >= 0 && l.currentItem < len(l.items) {
 				item := l.items[l.currentItem]

pages.go

@@ -12,9 +12,9 @@ type page struct {
 	Visible bool      // Whether or not this page is visible.
 }
 
-// Pages is a container for other primitives often used as the application's
-// root primitive. It allows to easily switch the visibility of the contained
-// primitives.
+// Pages is a container for other primitives laid out on top of each other,
+// overlapping or not. It is often used as the application's root primitive. It
+// allows to easily switch the visibility of the contained primitives.
 //
 // See https://github.com/rivo/tview/wiki/Pages for an example.
 type Pages struct {

textview.go

@@ -1019,14 +1019,22 @@ func (t *TextView) Draw(screen tcell.Screen) {
 		backgroundColor := index.BackgroundColor
 		attributes := index.Attributes
 		regionID := index.Region
-		if t.regions && regionID != "" && (len(t.regionInfos) == 0 || t.regionInfos[len(t.regionInfos)-1].ID != regionID) {
-			t.regionInfos = append(t.regionInfos, &textViewRegion{
-				ID:    regionID,
-				FromX: x,
-				FromY: y + line - t.lineOffset,
-				ToX:   -1,
-				ToY:   -1,
-			})
+		if t.regions {
+			if len(t.regionInfos) > 0 && t.regionInfos[len(t.regionInfos)-1].ID != regionID {
+				// End last region.
+				t.regionInfos[len(t.regionInfos)-1].ToX = x
+				t.regionInfos[len(t.regionInfos)-1].ToY = y + line - t.lineOffset
+			}
+			if regionID != "" && (len(t.regionInfos) == 0 || t.regionInfos[len(t.regionInfos)-1].ID != regionID) {
+				// Start a new region.
+				t.regionInfos = append(t.regionInfos, &textViewRegion{
+					ID:    regionID,
+					FromX: x,
+					FromY: y + line - t.lineOffset,
+					ToX:   -1,
+					ToY:   -1,
+				})
+			}
 		}
 
 		// Process tags.

treeview.go

@@ -774,6 +774,8 @@ func (t *TreeView) InputHandler() func(event *tcell.EventKey, setFocus func(p Pr
 		case tcell.KeyEnter:
 			selectNode()
 		}
+
+		t.process()
 	})
 }