fix(renderer): skip redraws when empty or tall views haven't changed (#1897)
This commit is contained in:
parent
8675fd8a85
commit
4853fdaaa0
2 changed files with 78 additions and 1 deletions
|
|
@ -328,12 +328,20 @@ func (s *cursedRenderer) flush(closing bool) (bool, error) {
|
|||
}
|
||||
}
|
||||
|
||||
// An empty screen buffer has zero width as well as zero height.
|
||||
if frameArea.Dy() == 0 {
|
||||
frameArea.Max.X = 0
|
||||
}
|
||||
|
||||
// Restore tab stops if we have tab optimizations enabled.
|
||||
if s.starting && s.hardTabs {
|
||||
_, _ = s.scr.WriteString(ansi.SetTabEvery8Columns)
|
||||
}
|
||||
|
||||
if !s.starting && !closing && !s.pendingErase && s.lastView != nil && viewEquals(s.lastView, &view) && frameArea == s.cellbuf.Bounds() {
|
||||
// Oversized inline frames retain only the rows that fit on the screen.
|
||||
held := frameArea
|
||||
held.Max.Y = min(held.Max.Y, s.height)
|
||||
if !s.starting && !closing && !s.pendingErase && s.lastView != nil && viewEquals(s.lastView, &view) && held == s.cellbuf.Bounds() {
|
||||
// No changes, nothing to do.
|
||||
return false, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,6 +86,75 @@ func TestCursedRendererResumeRestoresUnicodeMode(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestCursedRendererSkipsUnchangedView(t *testing.T) {
|
||||
t.Parallel()
|
||||
var out bytes.Buffer
|
||||
r := newCursedRenderer(&out, []string{"TERM=xterm-256color"}, 4, 3)
|
||||
r.start()
|
||||
r.render(NewView("hello"))
|
||||
if _, err := r.flush(false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
out.Reset()
|
||||
if drawn, err := r.flush(false); err != nil || drawn || out.Len() != 0 {
|
||||
t.Fatalf("unchanged view: drawn=%v, err=%v, output=%q", drawn, err, out.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestCursedRendererDrawsChangedEmptyAndTallViews(t *testing.T) {
|
||||
t.Parallel()
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
before, after View
|
||||
}{
|
||||
{"empty inline becomes nonempty", View{}, NewView("new")},
|
||||
{"empty alt screen becomes nonempty", View{AltScreen: true}, View{Content: "new", AltScreen: true}},
|
||||
{"tall inline changes visible rows", NewView("a\nb\nc\nd\ne"), NewView("a\nb\nx\ny\nz")},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
var out bytes.Buffer
|
||||
r := newCursedRenderer(&out, []string{"TERM=xterm-256color"}, 4, 3)
|
||||
r.start()
|
||||
r.render(tt.before)
|
||||
if _, err := r.flush(false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
out.Reset()
|
||||
r.render(tt.after)
|
||||
if drawn, err := r.flush(false); err != nil || !drawn || out.Len() == 0 {
|
||||
t.Fatalf("changed view: drawn=%v, err=%v, output=%q", drawn, err, out.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCursedRendererSkipsUnchangedEmptyAndTallViews(t *testing.T) {
|
||||
t.Parallel()
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
view View
|
||||
}{
|
||||
{"empty inline", View{}},
|
||||
{"empty alt screen", View{AltScreen: true}},
|
||||
{"tall inline", NewView("a\nb\nc\nd\ne\nf\ng")},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
var out bytes.Buffer
|
||||
r := newCursedRenderer(&out, []string{"TERM=xterm-256color"}, 4, 3)
|
||||
r.start()
|
||||
r.render(tt.view)
|
||||
if _, err := r.flush(false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Measure only the second flush, after the initial frame is drawn.
|
||||
out.Reset()
|
||||
if drawn, err := r.flush(false); err != nil || drawn || out.Len() != 0 {
|
||||
t.Fatalf("unchanged view: drawn=%v, err=%v, output=%q", drawn, err, out.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
type mouseRaceModel struct {
|
||||
i int
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue