Fast-forward main to latest gdamore/tcell main

.github/workflows/linux.yml

@@ -1,10 +1,17 @@
 name: linux
-on: [push]
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
 jobs:
   build:
     name: build
     runs-on: [ubuntu-latest]
     strategy:
+      fail-fast: false
       matrix:
         go: ["stable", "oldstable"]
     steps:
@@ -30,6 +37,6 @@ jobs:
         run: script -q -e -c "go test -coverpkg=github.com/gdamore/tcell/v3/... -covermode=count -coverprofile=coverage.txt ./..."
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/macos.yml

@@ -1,10 +1,17 @@
 name: macos
-on: [push]
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
 jobs:
   build:
     name: build
     runs-on: [macos-latest]
     strategy:
+      fail-fast: false
       matrix:
         go: ["stable", "oldstable"]
     steps:
@@ -30,6 +37,6 @@ jobs:
         run: script -q /dev/null go test -coverpkg="github.com/gdamore/tcell/v3/..." -covermode=count -coverprofile="coverage.txt" ./...
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/webasm.yml

@@ -1,10 +1,17 @@
 name: webasm
-on: [push]
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
 jobs:
   build:
     name: build
     runs-on: [ubuntu-latest]
     strategy:
+      fail-fast: false
       matrix:
         go: ["stable", "oldstable"]
     steps:

.github/workflows/windows.yml

@@ -1,10 +1,15 @@
 name: windows
-on: [push]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 jobs:
   build:
     name: build
     runs-on: [windows-latest]
     strategy:
+      fail-fast: false
       matrix:
         go: ["stable", "oldstable"]
     steps:
@@ -27,6 +32,6 @@ jobs:
         run: go test -coverpkg="github.com/gdamore/tcell/v3/..." -covermode=count -coverprofile="coverage.txt" ./...
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.superset/config.json

@@ -0,0 +1,7 @@
+{
+  "setup": [
+    "go mod download"
+  ],
+  "teardown": [],
+  "run": []
+}

AGENTS.md

@@ -0,0 +1 @@
+Use the `gopls` MCP server by default when working on Go code in this repository, unless I explicitly ask you not to.

_demos/mouse.go

@@ -134,6 +134,8 @@ func main() {
 	lchar := '*'
 	bstr := ""
 	lks := ""
+	lkey := ""
+	kcnt := 0
 	pstr := ""
 	ecnt := 0
 	pasting := false
@@ -180,6 +182,12 @@ func main() {
 			s.Sync()
 			s.Put(w-1, h-1, "R", st)
 		case *tcell.EventKey:
+			if ev.Name() == lkey {
+				kcnt++
+			} else {
+				lkey = ev.Name()
+				kcnt = 1
+			}
 			s.Put(w-2, h-2, ev.Str(), st)
 			if pasting {
 				s.Put(w-1, h-1, "P", st)
@@ -224,6 +232,11 @@ func main() {
 					s.Clear()
 				}
 			}
+			if ks := fmt.Sprintf("K%d", kcnt); w >= len(ks) {
+				s.PutStrStyled(w-len(ks), h-1, ks, st)
+			} else {
+				s.PutStrStyled(0, h-1, ks, st)
+			}
 			lks = ev.Name()
 		case *tcell.EventPaste:
 			pasting = ev.Start()

cell.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The TCell Authors
+// Copyright 2026 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,10 +14,6 @@
 
 package tcell
 
-import (
-	"github.com/rivo/uniseg"
-)
-
 type cell struct {
 	currStr   string
 	lastStr   string
@@ -46,28 +42,34 @@ func (c *cell) setDirty(dirty bool) {
 //
 // CellBuffer is not thread safe.
 type CellBuffer struct {
-	w     int
-	h     int
-	cells []cell
+	w               int
+	h               int
+	cells           []cell
+	sanitizeContent bool
 }
 
 // Put a single styled grapheme using the given string and style
 // at the same location.  Note that only the first grapheme in the string
 // will be displayed, using only the 1 or 2 (depending on width) cells
 // located at x, y. It returns the rest of the string, and the width used.
 func (cb *CellBuffer) Put(x int, y int, str string, style Style) (string, int) {
+	if cb.sanitizeContent {
+		str = stripOSCControlsIfNeeded(str)
+	}
+	return cb.put(x, y, str, style)
+}
+
+func (cb *CellBuffer) put(x int, y int, str string, style Style) (string, int) {
 	var width int = 0
 	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
 		var cl string
 		c := &cb.cells[(y*cb.w)+x]
-		state := -1
-		for width == 0 && str != "" {
-			var g string
-			g, str, width, state = uniseg.FirstGraphemeClusterInString(str, state)
-			cl += g
-			if g == "" {
-				break
-			}
+		g := textWidthOptions.StringGraphemes(str)
+		for width == 0 && g.Next() {
+			cluster := g.Value()
+			cl += cluster
+			width = g.Width()
+			str = str[len(cluster):]
 		}
 
 		// Wide characters: we want to mark the "wide" cells

cell_bench_test.go

@@ -0,0 +1,56 @@
+// Copyright 2026 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tcell
+
+import (
+	"testing"
+)
+
+func BenchmarkCellBufferPutCurrent(b *testing.B) {
+	benchCellBufferPut(b, "current", false, func(cb *CellBuffer, x, y int, str string, style Style) (string, int) {
+		return cb.Put(x, y, str, style)
+	})
+}
+
+func BenchmarkCellBufferPutSanitizedCurrent(b *testing.B) {
+	benchCellBufferPut(b, "sanitized", true, func(cb *CellBuffer, x, y int, str string, style Style) (string, int) {
+		return cb.Put(x, y, str, style)
+	})
+}
+
+func benchCellBufferPut(b *testing.B, name string, sanitize bool, put func(*CellBuffer, int, int, string, Style) (string, int)) {
+	cases := []struct {
+		name string
+		str  string
+	}{
+		{name: "ascii", str: "Hello, terminal"},
+		{name: "combining", str: "e\u0301"},
+		{name: "wide", str: "宽"},
+		{name: "emoji", str: "👩‍🚀"},
+	}
+
+	for _, tc := range cases {
+		b.Run(name+"/"+tc.name, func(b *testing.B) {
+			cb := &CellBuffer{w: 8, h: 1, cells: make([]cell, 8), sanitizeContent: sanitize}
+			style := Style{}
+			b.ReportAllocs()
+			b.ResetTimer()
+			for i := 0; i < b.N; i++ {
+				cb.cells[0] = cell{}
+				_, _ = put(cb, 0, 0, tc.str, style)
+			}
+		})
+	}
+}